From 7fc9e5a0f77f3cb1225e4d253dc4a640380eed2d Mon Sep 17 00:00:00 2001 From: deepa-chaudhari Date: Wed, 17 Jun 2015 00:20:33 +0530 Subject: osdag main page functionality --- .settings/org.eclipse.core.resources.prefs | 1 + Connections/Moment/__init__.py | 0 Connections/Shear/Finplate/.txt | 46 +++++++++++++++++++++-- Connections/Shear/Finplate/__init__.py | 0 Connections/Shear/Finplate/fin.log | 43 +++++++++++++++------ Connections/Shear/Finplate/finPlate.ui | 6 +++ Connections/Shear/Finplate/finPlateMain.py | 33 +++++++++++++--- Connections/Shear/Finplate/saveINPUT.txt | 2 +- Connections/Shear/Finplate/ui_finPlate.py | 4 +- Connections/Shear/__init__.py | 0 Connections/__init__.py | 0 osdagMainPage.py | 27 ++++++++++++-- osdagpage.ui | 12 +++--- saveINPUT.txt | 60 ++++++++++++++++++++++++++++++ ui_osdagpage.py | 58 ++++++++++++++--------------- 15 files changed, 231 insertions(+), 61 deletions(-) create mode 100644 Connections/Moment/__init__.py create mode 100644 Connections/Shear/Finplate/__init__.py create mode 100644 Connections/Shear/__init__.py create mode 100644 Connections/__init__.py create mode 100644 saveINPUT.txt diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index cede7ec..d549754 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -2,3 +2,4 @@ eclipse.preferences.version=1 encoding//Connections/Shear/Finplate/icons_rc.py=utf-8 encoding//Connections/Shear/Finplate/ui_finPlate.py=utf-8 encoding//Connections/Shear/Finplate/ui_finPlate2.py=utf-8 +encoding/ui_osdagpage.py=utf-8 diff --git a/Connections/Moment/__init__.py b/Connections/Moment/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Connections/Shear/Finplate/.txt b/Connections/Shear/Finplate/.txt index 85888f1..de4fba8 100644 --- a/Connections/Shear/Finplate/.txt +++ b/Connections/Shear/Finplate/.txt @@ -1,3 +1,43 @@ -Thu, 11 Jun 2015 21:09:27 INFO : Overall finplate connection design is safe -Thu, 11 Jun 2015 21:09:27 INFO : Overall finplate connection design is safe -Thu, 11 Jun 2015 21:09:40 INFO : Overall finplate connection design is safe \ No newline at end of file +Fri, 12 Jun 2015 13:51:17 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 13:51:17 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 13:54:07 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 13:54:07 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 13:56:12 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 13:56:26 ERROR : Plate width provided is less than the minimum required +Fri, 12 Jun 2015 13:56:26 WARNING : Minimum plate width required is 60.00 mm +Fri, 12 Jun 2015 13:56:26 ERROR : Design is not safe +Fri, 12 Jun 2015 13:56:51 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 13:56:51 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 13:57:24 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 14:00:30 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 14:00:30 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 14:01:04 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 14:01:04 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 14:01:23 ERROR : Plate height provided is less than the minimum required +Fri, 12 Jun 2015 14:01:23 WARNING : Plate height required should be more than 240.00 mm +Fri, 12 Jun 2015 14:01:23 ERROR : Plate width provided is less than the minimum required +Fri, 12 Jun 2015 14:01:23 WARNING : Minimum plate width required is 100.00 mm +Fri, 12 Jun 2015 14:01:23 ERROR : Design is not safe +Fri, 12 Jun 2015 14:02:15 ERROR : Height of plate is more than the clear depth of the beam +Fri, 12 Jun 2015 14:02:15 WARNING : Maximum plate height allowed is 328.00 mm +Fri, 12 Jun 2015 14:02:15 ERROR : Plate width provided is less than the minimum required +Fri, 12 Jun 2015 14:02:15 WARNING : Minimum plate width required is 100.00 mm +Fri, 12 Jun 2015 14:02:15 ERROR : Design is not safe +Fri, 12 Jun 2015 14:03:34 ERROR : Design is not safe +Fri, 12 Jun 2015 14:04:57 ERROR : Design is not safe +Fri, 12 Jun 2015 14:06:13 ERROR : Minimum required plate height is more than the clear depth of the beam +Fri, 12 Jun 2015 14:06:13 WARNING : Plate height required should be more than 410.00 mm +Fri, 12 Jun 2015 14:06:13 WARNING : Maximum plate height allowed is 328.00 mm +Fri, 12 Jun 2015 14:06:13 INFO : Increase the plate thickness +Fri, 12 Jun 2015 14:06:13 ERROR : Design is not safe +Fri, 12 Jun 2015 14:06:25 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 14:06:25 INFO : Overall finplate connection design is safe +Fri, 12 Jun 2015 14:09:10 ERROR : Bolt strength is insufficient to carry the shear force +Fri, 12 Jun 2015 14:09:10 WARNING : Increase bolt diameter and/or bolt grade +Fri, 12 Jun 2015 14:09:10 ERROR : Design is not safe +Fri, 12 Jun 2015 14:09:58 ERROR : Bolt strength is insufficient to carry the shear force +Fri, 12 Jun 2015 14:09:58 WARNING : Increase bolt diameter and/or bolt grade +Fri, 12 Jun 2015 14:09:58 ERROR : Design is not safe +Fri, 12 Jun 2015 14:10:55 ERROR : Bolt strength is insufficient to carry the shear force +Fri, 12 Jun 2015 14:10:55 WARNING : Increase bolt diameter and/or bolt grade +Fri, 12 Jun 2015 14:10:55 ERROR : Design is not safe \ No newline at end of file diff --git a/Connections/Shear/Finplate/__init__.py b/Connections/Shear/Finplate/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Connections/Shear/Finplate/fin.log b/Connections/Shear/Finplate/fin.log index a45941d..f4f475a 100644 --- a/Connections/Shear/Finplate/fin.log +++ b/Connections/Shear/Finplate/fin.log @@ -1,31 +1,52 @@ - + + +
+ Wed, 17 Jun 2015 00:15:22 + ERROR + : Plate height provided is less than the minimum required +
+ +
+ Wed, 17 Jun 2015 00:15:22 + WARNING + : Plate height required should be more than 240.00 mm +
+ +
+ Wed, 17 Jun 2015 00:15:22 + ERROR + : Design is not safe + +
- Fri, 12 Jun 2015 18:51:34 + Wed, 17 Jun 2015 00:15:22 INFO - : Overall finplate connection design is safe + :===========================================================
- Fri, 12 Jun 2015 18:51:34 + Wed, 17 Jun 2015 00:15:27 INFO - : Overall finplate connection design is safe + : Overall finplate connection design is safe +
- Fri, 12 Jun 2015 18:54:45 + Wed, 17 Jun 2015 00:15:27 INFO - : Overall finplate connection design is safe + :===========================================================
- Fri, 12 Jun 2015 18:56:23 + Wed, 17 Jun 2015 00:15:27 INFO - : Overall finplate connection design is safe + : Overall finplate connection design is safe +
- Fri, 12 Jun 2015 18:56:23 + Wed, 17 Jun 2015 00:15:27 INFO - : Overall finplate connection design is safe + :===========================================================
diff --git a/Connections/Shear/Finplate/finPlate.ui b/Connections/Shear/Finplate/finPlate.ui index 02ceab0..976084d 100644 --- a/Connections/Shear/Finplate/finPlate.ui +++ b/Connections/Shear/Finplate/finPlate.ui @@ -542,6 +542,12 @@ 16777215 + + Qt::ScrollBarAlwaysOn + + + true + diff --git a/Connections/Shear/Finplate/finPlateMain.py b/Connections/Shear/Finplate/finPlateMain.py index b28143b..5e69a95 100644 --- a/Connections/Shear/Finplate/finPlateMain.py +++ b/Connections/Shear/Finplate/finPlateMain.py @@ -4,7 +4,7 @@ comment @author: deepa ''' -from PyQt4.QtCore import QString +from PyQt4.QtCore import QString, pyqtSignal from PyQt4.QtGui import QMessageBox, QScrollArea from OCC.TopoDS import topods, TopoDS_Shape from OCC.BRepPrimAPI import BRepPrimAPI_MakeBox, BRepPrimAPI_MakeCylinder,\ @@ -53,6 +53,8 @@ from OCC.StlAPI import StlAPI_Writer class MainController(QtGui.QMainWindow): + closed = pyqtSignal() + def __init__(self): QtGui.QMainWindow.__init__(self) self.ui = Ui_MainWindow() @@ -594,7 +596,7 @@ class MainController(QtGui.QMainWindow): This method displaying Design messages(log messages)to textedit widget. ''' - afile = QtCore.QFile('fin.log') + afile = QtCore.QFile('./Connections/Shear/Finplate/fin.log') if not afile.open(QtCore.QIODevice.ReadOnly):#ReadOnly QtGui.QMessageBox.information(None, 'info', afile.errorString()) @@ -1076,6 +1078,7 @@ class MainController(QtGui.QMainWindow): "Are you sure to quit?", QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) if reply == QtGui.QMessageBox.Yes: + self.closed.emit() event.accept() else: event.ignore() @@ -1087,7 +1090,7 @@ def set_osdaglogger(): logger.setLevel(logging.DEBUG) # create the logging file handler - fh = logging.FileHandler("fin.log", mode="a") + fh = logging.FileHandler("./Connections/Shear/Finplate/fin.log", mode="a") #,datefmt='%a, %d %b %Y %H:%M:%S' #formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') @@ -1104,11 +1107,30 @@ def set_osdaglogger(): # add handler to logger object logger.addHandler(fh) +def launchFinPlateController(osdagMainWindow): + set_osdaglogger() + rawLogger = logging.getLogger("raw") + rawLogger.setLevel(logging.INFO) + fh = logging.FileHandler("./Connections/Shear/Finplate/fin.log", mode="w") + formatter = logging.Formatter('''%(message)s''') + fh.setFormatter(formatter) + rawLogger.addHandler(fh) + rawLogger.info('''''') + + #app = QtGui.QApplication(sys.argv) + window = MainController() + osdagMainWindow.hide() + + window.show() + window.closed.connect(osdagMainWindow.show) + + #sys.exit(app.exec_()) if __name__ == '__main__': - + #launchFinPlateController(None) + # linking css to log file to display colour logs. set_osdaglogger() rawLogger = logging.getLogger("raw") @@ -1118,8 +1140,7 @@ if __name__ == '__main__': fh.setFormatter(formatter) rawLogger.addHandler(fh) rawLogger.info('''''') - - + app = QtGui.QApplication(sys.argv) window = MainController() window.show() diff --git a/Connections/Shear/Finplate/saveINPUT.txt b/Connections/Shear/Finplate/saveINPUT.txt index 54ca750..478e639 100644 --- a/Connections/Shear/Finplate/saveINPUT.txt +++ b/Connections/Shear/Finplate/saveINPUT.txt @@ -56,5 +56,5 @@ S'HSFG' p26 sS'diameter(mm)' p27 -I12 +I20 ss. \ No newline at end of file diff --git a/Connections/Shear/Finplate/ui_finPlate.py b/Connections/Shear/Finplate/ui_finPlate.py index 5f85414..9770c66 100644 --- a/Connections/Shear/Finplate/ui_finPlate.py +++ b/Connections/Shear/Finplate/ui_finPlate.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'finPlate.ui' # -# Created: Fri Jun 12 17:55:33 2015 +# Created: Wed Jun 17 00:13:58 2015 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -213,6 +213,8 @@ class Ui_MainWindow(object): self.textEdit = QtGui.QTextEdit(self.splitter) self.textEdit.setMinimumSize(QtCore.QSize(0, 125)) self.textEdit.setMaximumSize(QtCore.QSize(16777215, 16777215)) + self.textEdit.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) + self.textEdit.setOverwriteMode(True) self.textEdit.setObjectName(_fromUtf8("textEdit")) self.verticalLayout_2.addWidget(self.splitter) MainWindow.setCentralWidget(self.centralwidget) diff --git a/Connections/Shear/__init__.py b/Connections/Shear/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Connections/__init__.py b/Connections/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/osdagMainPage.py b/osdagMainPage.py index 8665cbc..981f3a2 100644 --- a/osdagMainPage.py +++ b/osdagMainPage.py @@ -6,13 +6,14 @@ Created on 16-Jun-2015 import sys from PyQt4 import QtGui,QtCore from ui_osdagpage import Ui_MainWindow +from Connections.Shear.Finplate.finPlateMain import launchFinPlateController +#from finPlateMain import * + +#from finPlateMain import launchFinPlateController + class OsdagMainWindow(QtGui.QMainWindow): - - - - def __init__(self): QtGui.QMainWindow.__init__(self) self.ui = Ui_MainWindow() @@ -20,12 +21,30 @@ class OsdagMainWindow(QtGui.QMainWindow): self.ui.myListWidget.currentItemChanged.connect(self.changePage) self.ui.myListWidget.setCurrentRow(0) + self.ui.shearBtnStart.clicked.connect(self.showFinPlate) def changePage(self, current, previous): if not current: current = previous self.ui.myStackedWidget.setCurrentIndex(self.ui.myListWidget.row(current)) + + def showFinPlate(self): + + if self.ui.finPlateRdBtn.isChecked(): + launchFinPlateController(self) + #QtGui.QMessageBox.about(self,"info","finplate clicked") + elif self.ui.cleatRdBtn.isChecked(): + QtGui.QMessageBox.about(self,"info","cleat clicked") + elif self.ui.endPlateRdBtn.isChecked(): + QtGui.QMessageBox.about(self,"info","endplateclicked") + elif self.ui.seatedRdBtn.isChecked(): + QtGui.QMessageBox.about(self,"info","seated clicked") + else: + QtGui.QMessageBox.about(self,"info","Please select desire radio button") + + + if __name__ == '__main__': diff --git a/osdagpage.ui b/osdagpage.ui index 221c56a..b978063 100644 --- a/osdagpage.ui +++ b/osdagpage.ui @@ -275,13 +275,13 @@ QPushButton:pressed { background-color: #000000 } QTabWidget::Rounded - 1 + 0 Shear Connection - + 50 @@ -302,7 +302,7 @@ QPushButton:pressed { background-color: #000000 } Cleat - + 50 @@ -320,7 +320,7 @@ QPushButton:pressed { background-color: #000000 } End Plate - + 50 @@ -338,7 +338,7 @@ QPushButton:pressed { background-color: #000000 } Fin Plate - + 430 @@ -372,7 +372,7 @@ QPushButton:pressed { background-color: #000000 } Start - + 50 diff --git a/saveINPUT.txt b/saveINPUT.txt new file mode 100644 index 0000000..478e639 --- /dev/null +++ b/saveINPUT.txt @@ -0,0 +1,60 @@ +(dp0 +S'Member' +p1 +(dp2 +S'columSection' +p3 +S'ISSC 200' +p4 +sS'fy(MPa)' +p5 +I250 +sS'fu(MPa)' +p6 +I410 +sS'beamSection' +p7 +S'ISMB 400' +p8 +sS'connectivity' +p9 +S'Column web-Beam web' +p10 +ssS'Plate' +p11 +(dp12 +S'thickness(mm)' +p13 +I12 +sS'height(mm)' +p14 +I300 +sS'width(mm)' +p15 +I100 +ssS'Load' +p16 +(dp17 +S'shearForce(kN)' +p18 +I140 +ssS'Weld' +p19 +(dp20 +S'size(mm)' +p21 +I6 +ssS'Bolt' +p22 +(dp23 +S'grade' +p24 +F8.8 +sS'type' +p25 +S'HSFG' +p26 +sS'diameter(mm)' +p27 +I20 +ss. \ No newline at end of file diff --git a/ui_osdagpage.py b/ui_osdagpage.py index b48d828..b4cfd24 100644 --- a/ui_osdagpage.py +++ b/ui_osdagpage.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'osdagpage.ui' # -# Created: Tue Jun 16 17:27:55 2015 +# Created: Tue Jun 16 21:38:35 2015 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -151,34 +151,34 @@ class Ui_MainWindow(object): self.myTabWidget.setObjectName(_fromUtf8("myTabWidget")) self.tab = QtGui.QWidget() self.tab.setObjectName(_fromUtf8("tab")) - self.radioButton = QtGui.QRadioButton(self.tab) - self.radioButton.setGeometry(QtCore.QRect(50, 110, 137, 27)) + self.cleatRdBtn = QtGui.QRadioButton(self.tab) + self.cleatRdBtn.setGeometry(QtCore.QRect(50, 110, 137, 27)) font = QtGui.QFont() font.setPointSize(11) - self.radioButton.setFont(font) - self.radioButton.setStyleSheet(_fromUtf8("")) - self.radioButton.setObjectName(_fromUtf8("radioButton")) - self.radioButton_2 = QtGui.QRadioButton(self.tab) - self.radioButton_2.setGeometry(QtCore.QRect(50, 150, 137, 27)) + self.cleatRdBtn.setFont(font) + self.cleatRdBtn.setStyleSheet(_fromUtf8("")) + self.cleatRdBtn.setObjectName(_fromUtf8("cleatRdBtn")) + self.endPlateRdBtn = QtGui.QRadioButton(self.tab) + self.endPlateRdBtn.setGeometry(QtCore.QRect(50, 150, 137, 27)) font = QtGui.QFont() font.setPointSize(11) - self.radioButton_2.setFont(font) - self.radioButton_2.setObjectName(_fromUtf8("radioButton_2")) - self.radioButton_3 = QtGui.QRadioButton(self.tab) - self.radioButton_3.setGeometry(QtCore.QRect(50, 190, 137, 27)) + self.endPlateRdBtn.setFont(font) + self.endPlateRdBtn.setObjectName(_fromUtf8("endPlateRdBtn")) + self.finPlateRdBtn = QtGui.QRadioButton(self.tab) + self.finPlateRdBtn.setGeometry(QtCore.QRect(50, 190, 137, 27)) font = QtGui.QFont() font.setPointSize(11) - self.radioButton_3.setFont(font) - self.radioButton_3.setObjectName(_fromUtf8("radioButton_3")) - self.pushButton_3 = QtGui.QPushButton(self.tab) - self.pushButton_3.setGeometry(QtCore.QRect(430, 400, 186, 32)) + self.finPlateRdBtn.setFont(font) + self.finPlateRdBtn.setObjectName(_fromUtf8("finPlateRdBtn")) + self.shearBtnStart = QtGui.QPushButton(self.tab) + self.shearBtnStart.setGeometry(QtCore.QRect(430, 400, 186, 32)) font = QtGui.QFont() font.setPointSize(12) font.setBold(True) font.setItalic(False) font.setWeight(75) - self.pushButton_3.setFont(font) - self.pushButton_3.setStyleSheet(_fromUtf8("QPushButton {\n" + self.shearBtnStart.setFont(font) + self.shearBtnStart.setStyleSheet(_fromUtf8("QPushButton {\n" " color:#00ff00;\n" " background-color:#5930ac;\n" " border-style: outset;\n" @@ -189,13 +189,13 @@ class Ui_MainWindow(object): "QPushButton:pressed { background-color: #000000 }\n" " \n" "")) - self.pushButton_3.setObjectName(_fromUtf8("pushButton_3")) - self.radioButton_4 = QtGui.QRadioButton(self.tab) - self.radioButton_4.setGeometry(QtCore.QRect(50, 230, 137, 27)) + self.shearBtnStart.setObjectName(_fromUtf8("shearBtnStart")) + self.seatedRdBtn = QtGui.QRadioButton(self.tab) + self.seatedRdBtn.setGeometry(QtCore.QRect(50, 230, 137, 27)) font = QtGui.QFont() font.setPointSize(11) - self.radioButton_4.setFont(font) - self.radioButton_4.setObjectName(_fromUtf8("radioButton_4")) + self.seatedRdBtn.setFont(font) + self.seatedRdBtn.setObjectName(_fromUtf8("seatedRdBtn")) self.myTabWidget.addTab(self.tab, _fromUtf8("")) self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName(_fromUtf8("tab_2")) @@ -226,7 +226,7 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.myStackedWidget.setCurrentIndex(1) - self.myTabWidget.setCurrentIndex(1) + self.myTabWidget.setCurrentIndex(0) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): @@ -252,11 +252,11 @@ class Ui_MainWindow(object): self.myListWidget.setSortingEnabled(__sortingEnabled) self.pushButton_2.setText(_translate("MainWindow", "Help", None)) self.pushButton.setText(_translate("MainWindow", "Open File", None)) - self.radioButton.setText(_translate("MainWindow", "Cleat", None)) - self.radioButton_2.setText(_translate("MainWindow", "End Plate", None)) - self.radioButton_3.setText(_translate("MainWindow", "Fin Plate", None)) - self.pushButton_3.setText(_translate("MainWindow", "Start", None)) - self.radioButton_4.setText(_translate("MainWindow", "Seated", None)) + self.cleatRdBtn.setText(_translate("MainWindow", "Cleat", None)) + self.endPlateRdBtn.setText(_translate("MainWindow", "End Plate", None)) + self.finPlateRdBtn.setText(_translate("MainWindow", "Fin Plate", None)) + self.shearBtnStart.setText(_translate("MainWindow", "Start", None)) + self.seatedRdBtn.setText(_translate("MainWindow", "Seated", None)) self.myTabWidget.setTabText(self.myTabWidget.indexOf(self.tab), _translate("MainWindow", "Shear Connection", None)) self.myTabWidget.setTabText(self.myTabWidget.indexOf(self.tab_2), _translate("MainWindow", "Moment", None)) self.label_4.setText(_translate("MainWindow", "Comming soon!", None)) -- cgit