From bb16d098a89a48a7d09663df441604d88532ee36 Mon Sep 17 00:00:00 2001
From: deepa-chaudhari
Date: Wed, 1 Jul 2015 10:39:11 +0530
Subject: presentation copy

---
 Connections/Shear/Finplate/finPlate.ui       |  8 +++---
 Connections/Shear/Finplate/finPlateMain.py   | 38 ++++++++++++++--------------
 Connections/Shear/Finplate/finplate_calc1.py |  4 +--
 Connections/Shear/Finplate/ui_finPlate.py    | 10 ++++----
 4 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'Connections/Shear')

diff --git a/Connections/Shear/Finplate/finPlate.ui b/Connections/Shear/Finplate/finPlate.ui
index a2e734b..0232550 100644
--- a/Connections/Shear/Finplate/finPlate.ui
+++ b/Connections/Shear/Finplate/finPlate.ui
@@ -688,7 +688,7 @@
       </font>
      </property>
      <property name="placeholderText">
-      <string>000.000</string>
+      <string>000.0</string>
      </property>
     </widget>
     <widget class="QLabel" name="label_3">
@@ -759,7 +759,7 @@
       </font>
      </property>
      <property name="placeholderText">
-      <string>000.000</string>
+      <string>000.0</string>
      </property>
     </widget>
     <widget class="QLabel" name="label">
@@ -3311,7 +3311,7 @@
       <rect>
        <x>0</x>
        <y>120</y>
-       <width>130</width>
+       <width>191</width>
        <height>25</height>
       </rect>
      </property>
@@ -3323,7 +3323,7 @@
       </font>
      </property>
      <property name="text">
-      <string>No. of bolts</string>
+      <string>No. of bolts required</string>
      </property>
     </widget>
     <widget class="QLineEdit" name="txtShrCapacity">
diff --git a/Connections/Shear/Finplate/finPlateMain.py b/Connections/Shear/Finplate/finPlateMain.py
index f9747c3..cf9c7bb 100644
--- a/Connections/Shear/Finplate/finPlateMain.py
+++ b/Connections/Shear/Finplate/finPlateMain.py
@@ -199,8 +199,8 @@ class MainController(QtGui.QMainWindow):
         dictbeamdata = self.fetchBeamPara()
         beam_tw = float(dictbeamdata[QString("tw")])
         plateThickness = [6,8,10,12,14,16,18,20]
-        newlist = []
-        for ele in plateThickness[:]:
+        newlist = ['Select plate thickness']
+        for ele in plateThickness[1:]:
             item = int(ele)
             if item >= beam_tw:
                 newlist.append(str(item))
@@ -1114,23 +1114,23 @@ def launchFinPlateController(osdagMainWindow):
     
     
 
-# if __name__ == '__main__':
-#     #launchFinPlateController(None)
-#       
-#     # linking css to log file to display colour logs.
-#     set_osdaglogger()
-#     rawLogger = logging.getLogger("raw")
-#     rawLogger.setLevel(logging.INFO)
-#     fh = logging.FileHandler("fin.log", mode="w")
-#     formatter = logging.Formatter('''%(message)s''')
-#     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()
-#     sys.exit(app.exec_())
+if __name__ == '__main__':
+    #launchFinPlateController(None)
+       
+    # linking css to log file to display colour logs.
+    set_osdaglogger()
+    rawLogger = logging.getLogger("raw")
+    rawLogger.setLevel(logging.INFO)
+    fh = logging.FileHandler("fin.log", mode="w")
+    formatter = logging.Formatter('''%(message)s''')
+    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()
+    sys.exit(app.exec_())
 
 
 
diff --git a/Connections/Shear/Finplate/finplate_calc1.py b/Connections/Shear/Finplate/finplate_calc1.py
index 9859f6c..34efdb4 100644
--- a/Connections/Shear/Finplate/finplate_calc1.py
+++ b/Connections/Shear/Finplate/finplate_calc1.py
@@ -398,8 +398,8 @@ def finConn(uiObj):
     outputObj['Plate']['minWidth'] = web_plate_w_req
     outputObj['Plate']['externalmoment'] = moment_demand
     outputObj['Plate']['momentcapacity'] = moment_capacity
-    outputObj['Plate']['height'] = web_plate_l
-    outputObj['Plate']['width'] = web_plate_w
+    outputObj['Plate']['height'] = float(web_plate_l)
+    outputObj['Plate']['width'] = float(web_plate_w)
     
     
     #return outputObj
diff --git a/Connections/Shear/Finplate/ui_finPlate.py b/Connections/Shear/Finplate/ui_finPlate.py
index 1f1614c..8104489 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: Mon Jun 22 15:01:55 2015
+# Created: Wed Jun 24 15:15:09 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -1070,7 +1070,7 @@ class Ui_MainWindow(object):
         self.txtNoBolts.setReadOnly(True)
         self.txtNoBolts.setObjectName(_fromUtf8("txtNoBolts"))
         self.t_7 = QtGui.QLabel(self.dockWidgetContents_2)
-        self.t_7.setGeometry(QtCore.QRect(0, 120, 130, 25))
+        self.t_7.setGeometry(QtCore.QRect(0, 120, 191, 25))
         font = QtGui.QFont()
         font.setPointSize(10)
         font.setBold(False)
@@ -1506,12 +1506,12 @@ class Ui_MainWindow(object):
         self.menuHelp.setTitle(_translate("MainWindow", "Help", None))
         self.menuGraphics.setTitle(_translate("MainWindow", "Graphics", None))
         self.inputDock.setWindowTitle(_translate("MainWindow", "Input dock", None))
-        self.txtFy.setPlaceholderText(_translate("MainWindow", "000.000", None))
+        self.txtFy.setPlaceholderText(_translate("MainWindow", "000.0", None))
         self.label_3.setText(_translate("MainWindow", "<html><head/><body><p>Column section *</p></body></html>", None))
         self.comboConnLoc.setItemText(0, _translate("MainWindow", "Select Connectivity", None))
         self.comboConnLoc.setItemText(1, _translate("MainWindow", "Column flange-Beam web", None))
         self.comboConnLoc.setItemText(2, _translate("MainWindow", "Column web-Beam web", None))
-        self.txtFu.setPlaceholderText(_translate("MainWindow", "000.000", None))
+        self.txtFu.setPlaceholderText(_translate("MainWindow", "000.0", None))
         self.label.setText(_translate("MainWindow", "<html><head/><body><p>Connecting members</p></body></html>", None))
         self.label_4.setText(_translate("MainWindow", "<html><head/><body><p>Connectivity *</p></body></html>", None))
         self.lbl_fu.setText(_translate("MainWindow", "<html><head/><body><p><span style=\" font-style:italic;\">f</span><span style=\" font-style:italic; vertical-align:sub;\">u </span>(MPa) * </p></body></html>", None))
@@ -1625,7 +1625,7 @@ class Ui_MainWindow(object):
         self.comboWldSize.setItemText(6, _translate("MainWindow", "12", None))
         self.label_9.setText(_translate("MainWindow", "Beam section *", None))
         self.outputDock.setWindowTitle(_translate("MainWindow", "Output dock", None))
-        self.t_7.setText(_translate("MainWindow", "No. of bolts", None))
+        self.t_7.setText(_translate("MainWindow", "No. of bolts required", None))
         self.label_152.setText(_translate("MainWindow", "Gauge (mm)", None))
         self.labl123_7.setText(_translate("MainWindow", "<html><head/><body><p>Capacity of bolt (kN)</p></body></html>", None))
         self.label_153.setText(_translate("MainWindow", "End distance (mm)", None))
-- 
cgit