markusro/qdsfit
1
0
Fork 0
Code Issues Pull Requests Releases Activity

further reorganization

Browse Source
This commit is contained in:
Markus Rosenstihl
2015-01-08 13:18:45 +01:00
parent 21a93d6d09
commit 53234a2af8
16 changed files with 367 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ui/ConductivityGroupBox.py
View File

@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'ui/ConductivityGroupBox.ui'
#
# Created: Wed Sep 24 21:21:48 2014
# by: PyQt4 UI code generator 4.11.1
# Created: Tue Dec 16 15:06:22 2014
# by: PyQt4 UI code generator 4.11.3
#
# WARNING! All changes made in this file will be lost!
@ -26,7 +26,7 @@ except AttributeError:
class Ui_ConductivityGroupBox(object):
def setupUi(self, ConductivityGroupBox):
ConductivityGroupBox.setObjectName(_fromUtf8("ConductivityGroupBox"))
ConductivityGroupBox.resize(253, 156)
ConductivityGroupBox.resize(253, 158)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@ -113,9 +113,10 @@ class Ui_ConductivityGroupBox(object):
self.rSigma.setSizePolicy(sizePolicy)
self.rSigma.setObjectName(_fromUtf8("rSigma"))
self.gridLayout.addWidget(self.rSigma, 2, 1, 1, 1)
self.subtractConductivityButton = QtGui.QPushButton(ConductivityGroupBox)
self.subtractConductivityButton.setObjectName(_fromUtf8("subtractConductivityButton"))
self.gridLayout.addWidget(self.subtractConductivityButton, 0, 2, 1, 1)
self.pushButton_hide = QtGui.QPushButton(ConductivityGroupBox)
self.pushButton_hide.setCheckable(True)
self.pushButton_hide.setObjectName(_fromUtf8("pushButton_hide"))
self.gridLayout.addWidget(self.pushButton_hide, 0, 2, 1, 1)
self.label_3 = QtGui.QLabel(ConductivityGroupBox)
self.label_3.setObjectName(_fromUtf8("label_3"))
self.gridLayout.addWidget(self.label_3, 1, 0, 1, 1, QtCore.Qt.AlignHCenter)
@ -145,7 +146,7 @@ class Ui_ConductivityGroupBox(object):
self.label_4.setText(_translate("ConductivityGroupBox", "α", None))
self.rSigma_sd.setText(_translate("ConductivityGroupBox", "TextLabel", None))
self.rSigma.setToolTip(_translate("ConductivityGroupBox", "<html><head/><body><p>DC conductivity, should only be seen in the imaginary permitivity. If there is a Jonscher type of U<span style=\" font-style:italic;\">niversal Dielectric Response, </span>the ratio of σ&quot;/σ\'<span style=\" vertical-align:sub;\">(DC)</span> is a constant</p></body></html>", None))
self.subtractConductivityButton.setText(_translate("ConductivityGroupBox", "Hide", None))
self.pushButton_hide.setText(_translate("ConductivityGroupBox", "Hide", None))
self.label_3.setText(_translate("ConductivityGroupBox", "<html><head/><body><p>σ&quot;</p></body></html>", None))
self.iSigma.setToolTip(_translate("ConductivityGroupBox", "<html><head/><body><p>If there is a Jonscher type of U<span style=\" font-style:italic;\">niversal Dielectric Response, </span>the ratio of σ&quot;/σ\'<span style=\" vertical-align:sub;\">(DC)</span> is a constant</p></body></html>", None))
self.iSigma_sd.setText(_translate("ConductivityGroupBox", "TextLabel", None))

7
ui/ConductivityGroupBox.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>253</width>
<height>156</height>
<height>158</height>
</rect>
</property>
<property name="sizePolicy">
@ -171,10 +171,13 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="subtractConductivityButton">
<widget class="QPushButton" name="pushButton_hide">
<property name="text">
<string>Hide</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" alignment="Qt::AlignHCenter">

11
ui/PowerLawGroupBox.py
View File

@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'ui/PowerLawGroupBox.ui'
#
# Created: Wed Sep 24 21:21:48 2014
# by: PyQt4 UI code generator 4.11.1
# Created: Tue Dec 16 15:03:15 2014
# by: PyQt4 UI code generator 4.11.3
#
# WARNING! All changes made in this file will be lost!
@ -26,7 +26,7 @@ except AttributeError:
class Ui_PowerLawGroupBox(object):
def setupUi(self, PowerLawGroupBox):
PowerLawGroupBox.setObjectName(_fromUtf8("PowerLawGroupBox"))
PowerLawGroupBox.resize(206, 129)
PowerLawGroupBox.resize(253, 131)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@ -113,6 +113,10 @@ class Ui_PowerLawGroupBox(object):
self.checkBox_2.setText(_fromUtf8(""))
self.checkBox_2.setObjectName(_fromUtf8("checkBox_2"))
self.gridLayout.addWidget(self.checkBox_2, 1, 3, 1, 1, QtCore.Qt.AlignHCenter)
self.pushButton_hide = QtGui.QPushButton(PowerLawGroupBox)
self.pushButton_hide.setCheckable(True)
self.pushButton_hide.setObjectName(_fromUtf8("pushButton_hide"))
self.gridLayout.addWidget(self.pushButton_hide, 0, 2, 1, 1)
self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1)
self.retranslateUi(PowerLawGroupBox)
@ -128,4 +132,5 @@ class Ui_PowerLawGroupBox(object):
self.label_5.setText(_translate("PowerLawGroupBox", "TextLabel", None))
self.label_3.setText(_translate("PowerLawGroupBox", "n", None))
self.label_2.setText(_translate("PowerLawGroupBox", "U", None))
self.pushButton_hide.setText(_translate("PowerLawGroupBox", "Hide", None))

14
ui/PowerLawGroupBox.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>206</width>
<height>129</height>
<width>253</width>
<height>131</height>
</rect>
</property>
<property name="sizePolicy">
@ -167,6 +167,16 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_hide">
<property name="text">
<string>Hide</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>

8
ui/QDSMain.py
View File

@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'ui/QDSMain.ui'
#
# Created: Wed Sep 24 21:21:48 2014
# by: PyQt4 UI code generator 4.11.1
# Created: Tue Sep 30 15:34:02 2014
# by: PyQt4 UI code generator 4.11.2
#
# WARNING! All changes made in this file will be lost!
@ -67,6 +67,8 @@ class Ui_MainWindow(object):
self.menubar.setObjectName(_fromUtf8("menubar"))
self.menuExtras = QtGui.QMenu(self.menubar)
self.menuExtras.setObjectName(_fromUtf8("menuExtras"))
self.menuConfiguration = QtGui.QMenu(self.menubar)
self.menuConfiguration.setObjectName(_fromUtf8("menuConfiguration"))
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtGui.QStatusBar(MainWindow)
self.statusbar.setObjectName(_fromUtf8("statusbar"))
@ -125,6 +127,7 @@ class Ui_MainWindow(object):
self.actionShow_Derivative.setObjectName(_fromUtf8("actionShow_Derivative"))
self.menuExtras.addAction(self.actionShow_Derivative)
self.menubar.addAction(self.menuExtras.menuAction())
self.menubar.addAction(self.menuConfiguration.menuAction())
self.toolBar.addAction(self.actionAdd_Peak)
self.toolBar.addAction(self.actionAdd_Cond)
self.toolBar.addAction(self.actionAdd_PowerLaw)
@ -141,6 +144,7 @@ class Ui_MainWindow(object):
def retranslateUi(self, MainWindow):
MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow", None))
self.menuExtras.setTitle(_translate("MainWindow", "Extras", None))
self.menuConfiguration.setTitle(_translate("MainWindow", "Configuration", None))
self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar", None))
self.actionAdd_Peak.setText(_translate("MainWindow", "Add Peak", None))
self.actionAdd_Cond.setText(_translate("MainWindow", "Add Cond.", None))

6
ui/QDSMain.ui
View File

@ -73,7 +73,13 @@
</property>
<addaction name="actionShow_Derivative"/>
</widget>
<widget class="QMenu" name="menuConfiguration">
<property name="title">
<string>Configuration</string>
</property>
</widget>
<addaction name="menuExtras"/>
<addaction name="menuConfiguration"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar">