diff options
Diffstat (limited to 'Connections/Shear')
-rw-r--r-- | Connections/Shear/Finplate/.txt | 46 | ||||
-rw-r--r-- | Connections/Shear/Finplate/__init__.py | 0 | ||||
-rw-r--r-- | Connections/Shear/Finplate/fin.log | 43 | ||||
-rw-r--r-- | Connections/Shear/Finplate/finPlate.ui | 6 | ||||
-rw-r--r-- | Connections/Shear/Finplate/finPlateMain.py | 33 | ||||
-rw-r--r-- | Connections/Shear/Finplate/saveINPUT.txt | 2 | ||||
-rw-r--r-- | Connections/Shear/Finplate/ui_finPlate.py | 4 | ||||
-rw-r--r-- | Connections/Shear/__init__.py | 0 |
8 files changed, 112 insertions, 22 deletions
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 --- /dev/null +++ b/Connections/Shear/Finplate/__init__.py 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 @@ -<link rel="stylesheet" type="text/css" href="log.css"/> +<link rel="stylesheet" type="text/css" href="./Connections/Shear/Finplate/log.css"/> + + <div class="LOG ERROR"> + <span class="DATE">Wed, 17 Jun 2015 00:15:22</span> + <span class="LEVEL">ERROR</span> + <span class="MSG">: Plate height provided is less than the minimum required </span> + </div> + + <div class="LOG WARNING"> + <span class="DATE">Wed, 17 Jun 2015 00:15:22</span> + <span class="LEVEL">WARNING</span> + <span class="MSG">: Plate height required should be more than 240.00 mm </span> + </div> + + <div class="LOG ERROR"> + <span class="DATE">Wed, 17 Jun 2015 00:15:22</span> + <span class="LEVEL">ERROR</span> + <span class="MSG">: Design is not safe + </span> + </div> <div class="LOG INFO"> - <span class="DATE">Fri, 12 Jun 2015 18:51:34</span> + <span class="DATE">Wed, 17 Jun 2015 00:15:22</span> <span class="LEVEL">INFO</span> - <span class="MSG">: Overall finplate connection design is safe</span> + <span class="MSG"> :===========================================================</span> </div> <div class="LOG INFO"> - <span class="DATE">Fri, 12 Jun 2015 18:51:34</span> + <span class="DATE">Wed, 17 Jun 2015 00:15:27</span> <span class="LEVEL">INFO</span> - <span class="MSG">: Overall finplate connection design is safe</span> + <span class="MSG">: Overall finplate connection design is safe +</span> </div> <div class="LOG INFO"> - <span class="DATE">Fri, 12 Jun 2015 18:54:45</span> + <span class="DATE">Wed, 17 Jun 2015 00:15:27</span> <span class="LEVEL">INFO</span> - <span class="MSG">: Overall finplate connection design is safe</span> + <span class="MSG"> :===========================================================</span> </div> <div class="LOG INFO"> - <span class="DATE">Fri, 12 Jun 2015 18:56:23</span> + <span class="DATE">Wed, 17 Jun 2015 00:15:27</span> <span class="LEVEL">INFO</span> - <span class="MSG">: Overall finplate connection design is safe</span> + <span class="MSG">: Overall finplate connection design is safe +</span> </div> <div class="LOG INFO"> - <span class="DATE">Fri, 12 Jun 2015 18:56:23</span> + <span class="DATE">Wed, 17 Jun 2015 00:15:27</span> <span class="LEVEL">INFO</span> - <span class="MSG">: Overall finplate connection design is safe</span> + <span class="MSG"> :===========================================================</span> </div> 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 @@ <height>16777215</height> </size> </property> + <property name="verticalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOn</enum> + </property> + <property name="overwriteMode"> + <bool>true</bool> + </property> </widget> </widget> </item> 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('''<link rel="stylesheet" type="text/css" href="./Connections/Shear/Finplate/log.css"/>''') + + #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('''<link rel="stylesheet" type="text/css" href="log.css"/>''') - - + 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 --- /dev/null +++ b/Connections/Shear/__init__.py |