Skip to content

optimised view as per change in section size #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dar5han7 wants to merge 2 commits into
base: bc_endplate
Choose a base branch
from
Open

optimised view as per change in section size #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0428dae
optimised view as per change in section size
Dar5han7 Jul 15, 2019
7c976e2
combined three file to one
Dar5han7 Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 33 additions & 27 deletions Connections/Moment/BCEndPlate/bc_endplate_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@
from ui_weld_details_1 import Ui_Weld_Details_1
from ui_weld_details_2 import Ui_Weld_Details_2
from reportGenerator import save_html
from drawing_2D import ExtendedEndPlate
# from drawing_2D import ExtendedEndPlate
from OCC.Graphic3d import Graphic3d_NOT_2D_ALUMINUM
from drawing2D_bothway import ExtendedEndPlate
from drawing2D_oneway import OnewayEndPlate
from drawing2D_flush import FlushEndPlate
from drawing2D_WWbothway import ExtendedEndPlate_WW
from drawing2D_WWoneway import OnewayEndPlate_WW
from drawing2D_WWflush import FlushEndPlate_WW
# from drawing2D_bothway import ExtendedEndPlate
# from drawing2D_oneway import OnewayEndPlate
# from drawing2D_flush import FlushEndPlate
from drawing2D_FW import Flange_to_Web
from drawing2D_WW import Web_to_Web
# from drawing2D_WWbothway import ExtendedEndPlate_WW
# from drawing2D_WWoneway import OnewayEndPlate_WW
# from drawing2D_WWflush import FlushEndPlate_WW

from PyQt5.QtWidgets import QDialog, QApplication, QMainWindow, QFontDialog, QFileDialog
from PyQt5.Qt import QColor, QBrush, Qt, QIntValidator, QDoubleValidator, QFile, QTextStream, pyqtSignal, QColorDialog, \
Expand Down Expand Up @@ -66,6 +68,10 @@
import copy






class MyTutorials(QDialog):
def __init__(self, parent=None):
QDialog.__init__(self, parent)
Expand Down Expand Up @@ -1597,29 +1603,29 @@ def call_2D_drawing(self, view):
self.beam_data = self.fetchBeamPara()

if self.alist['Member']['Connectivity'] == "Column web-Beam web":
# conn_type = 'col_web_connectivity'
if self.alist['Member']['EndPlate_type'] == "Extended both ways":
self.endplate_type = "both_way"
beam_beam = ExtendedEndPlate_WW(self.alist, self.result_obj, self.column_data, self.beam_data,
# # conn_type = 'col_web_connectivity'
# if self.alist['Member']['EndPlate_type'] == "Extended both ways":
# self.endplate_type = "both_way"
beam_beam = Web_to_Web(self.alist, self.result_obj, self.column_data, self.beam_data,
self.folder)
elif self.alist['Member']['EndPlate_type'] == "Extended one way":
self.endplate_type = "one_way"
beam_beam = OnewayEndPlate_WW(self.alist, self.result_obj, self.column_data, self.beam_data,
self.folder)
else:
self.endplate_type = "flush"
beam_beam = FlushEndPlate_WW(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)
# elif self.alist['Member']['EndPlate_type'] == "Extended one way":
# self.endplate_type = "one_way"
# beam_beam = OnewayEndPlate_WW(self.alist, self.result_obj, self.column_data, self.beam_data,
# self.folder)
# else:
# self.endplate_type = "flush"
# beam_beam = FlushEndPlate_WW(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)
else: # "Column flange-Beam web"
# conn_type = 'col_flange_connectivity'
if self.alist['Member']['EndPlate_type'] == "Extended one way":
self.endplate_type = "one_way"
beam_beam = OnewayEndPlate(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)
elif self.alist['Member']['EndPlate_type'] == "Flush end plate":
self.endplate_type = "flush"
beam_beam = FlushEndPlate(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)
else: # uiObj['Member']['EndPlate_type'] == "Extended both ways":
self.endplate_type = "both_way"
beam_beam = ExtendedEndPlate(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)
# if self.alist['Member']['EndPlate_type'] == "Extended one way":
# self.endplate_type = "one_way"
beam_beam = Flange_to_Web(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)
# elif self.alist['Member']['EndPlate_type'] == "Flush end plate":
# self.endplate_type = "flush"
# beam_beam = FlushEndPlate(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)
# else: # uiObj['Member']['EndPlate_type'] == "Extended both ways":
# self.endplate_type = "both_way"
# beam_beam = ExtendedEndPlate(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)

# beam_beam = ExtendedEndPlate(self.alist, self.result_obj, self.column_data, self.beam_data, self.folder)
status = self.resultObj['Bolt']['status']
Expand Down
Loading