summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordeepa-chaudhari2015-06-21 22:57:43 +0530
committerdeepa-chaudhari2015-06-21 22:57:43 +0530
commitc8edec5808b4bda6f5754a6f7dd7d203cb62cfd7 (patch)
tree38953af6fb05d82c70fe9af18b1ba6c274178f48
parentaae0a7a8d0f691c3b4408494f663daf1dc42e535 (diff)
downloadOsdagLive-c8edec5808b4bda6f5754a6f7dd7d203cb62cfd7.tar.gz
OsdagLive-c8edec5808b4bda6f5754a6f7dd7d203cb62cfd7.tar.bz2
OsdagLive-c8edec5808b4bda6f5754a6f7dd7d203cb62cfd7.zip
save design report
-rw-r--r--Connections/Shear/Finplate/finPlate.ui10
-rw-r--r--Connections/Shear/Finplate/finPlateMain.py40
-rw-r--r--Connections/Shear/Finplate/ui_finPlate.py12
3 files changed, 32 insertions, 30 deletions
diff --git a/Connections/Shear/Finplate/finPlate.ui b/Connections/Shear/Finplate/finPlate.ui
index e5b13ff..e8c8ee2 100644
--- a/Connections/Shear/Finplate/finPlate.ui
+++ b/Connections/Shear/Finplate/finPlate.ui
@@ -559,7 +559,7 @@
<x>0</x>
<y>0</y>
<width>1335</width>
- <height>30</height>
+ <height>28</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -722,7 +722,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>11</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@@ -1080,7 +1080,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>11</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@@ -1254,7 +1254,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>11</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@@ -3166,7 +3166,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>11</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
diff --git a/Connections/Shear/Finplate/finPlateMain.py b/Connections/Shear/Finplate/finPlateMain.py
index 8b3d232..2f4211b 100644
--- a/Connections/Shear/Finplate/finPlateMain.py
+++ b/Connections/Shear/Finplate/finPlateMain.py
@@ -411,7 +411,9 @@ class MainController(QtGui.QMainWindow):
fileName = QtGui.QFileDialog.getSaveFileName(self,"Save File As","/home/deepa/SaveDesign","Text File (*.txt)")
f = open(fileName,'w')
yaml.dump(newDict,f,allow_unicode=True, default_flow_style=False)
- return self.save_file(fileName+".txt")
+
+ #return self.save_file(fileName+".txt")
+ QtGui.QMessageBox.about(self,'Information',"File saved")
def resetbtn_clicked(self):
@@ -795,7 +797,7 @@ class MainController(QtGui.QMainWindow):
def call_3DModel(self,flag):
-
+ self.ui.btnSvgSave.setEnabled(True)
if self.ui.btn3D.isEnabled():
self.ui.chkBxBeam.setChecked(QtCore.Qt.Unchecked)
self.ui.chkBxCol.setChecked(QtCore.Qt.Unchecked)
@@ -1111,23 +1113,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/ui_finPlate.py b/Connections/Shear/Finplate/ui_finPlate.py
index c52aca7..862a078 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: Wed Jun 17 13:03:56 2015
+# Created: Sun Jun 21 21:16:15 2015
# by: PyQt4 UI code generator 4.10.4
#
# WARNING! All changes made in this file will be lost!
@@ -219,7 +219,7 @@ class Ui_MainWindow(object):
self.verticalLayout_2.addWidget(self.splitter)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtGui.QMenuBar(MainWindow)
- self.menubar.setGeometry(QtCore.QRect(0, 0, 1335, 30))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 1335, 28))
self.menubar.setObjectName(_fromUtf8("menubar"))
self.menuFile = QtGui.QMenu(self.menubar)
self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -269,7 +269,7 @@ class Ui_MainWindow(object):
self.comboConnLoc = QtGui.QComboBox(self.dockWidgetContents)
self.comboConnLoc.setGeometry(QtCore.QRect(150, 170, 161, 25))
font = QtGui.QFont()
- font.setPointSize(10)
+ font.setPointSize(11)
font.setBold(False)
font.setWeight(50)
self.comboConnLoc.setFont(font)
@@ -404,7 +404,7 @@ class Ui_MainWindow(object):
self.comboDaimeter = QtGui.QComboBox(self.dockWidgetContents)
self.comboDaimeter.setGeometry(QtCore.QRect(150, 330, 160, 27))
font = QtGui.QFont()
- font.setPointSize(10)
+ font.setPointSize(11)
font.setBold(False)
font.setWeight(50)
self.comboDaimeter.setFont(font)
@@ -464,7 +464,7 @@ class Ui_MainWindow(object):
self.comboPlateThick_2 = QtGui.QComboBox(self.dockWidgetContents)
self.comboPlateThick_2.setGeometry(QtCore.QRect(150, 450, 160, 25))
font = QtGui.QFont()
- font.setPointSize(10)
+ font.setPointSize(11)
font.setBold(False)
font.setWeight(50)
self.comboPlateThick_2.setFont(font)
@@ -1016,7 +1016,7 @@ class Ui_MainWindow(object):
self.comboWldSize = QtGui.QComboBox(self.dockWidgetContents)
self.comboWldSize.setGeometry(QtCore.QRect(150, 570, 160, 25))
font = QtGui.QFont()
- font.setPointSize(10)
+ font.setPointSize(11)
font.setBold(False)
font.setWeight(50)
self.comboWldSize.setFont(font)