more cleanup

ContainerWidgets.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from gui import ConductivityGroupBox, PeakGroupBox, StaticGroupBox, PowerLawGroupBox, YAFFparameters, YAFFConfig
+from ui import ConductivityGroupBox, PeakGroupBox, StaticGroupBox, PowerLawGroupBox, YAFFparameters, YAFFConfig
 
 __author__ = 'markusro'
 

QDS.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
-from gui import QDSMain, ExtraDifferentialWidget
 
 _author_ = "Markus Rosenstihl"
 
@@ -24,7 +23,9 @@ import pyqtgraph as pg
 
 from Container import Conductivity, PowerComplex, Static, Peak, YAFF
 from ContainerWidgets import ParameterWidget
-from math.BDSMathlib import FunctionRegister, FitRoutine
+from ui import QDSMain, ExtraDifferentialWidget
+
+from libmath.BDSMathlib import FunctionRegister, FitRoutine
 from data.data import Data
 
 

ui/ConductivityGroupBox.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'ConductivityGroupBox.ui'
+# Form implementation generated from reading ui file 'ui/ConductivityGroupBox.ui'
 #
-# Created: Tue Sep 23 21:38:12 2014
+# Created: Wed Sep 24 21:21:48 2014
 #      by: PyQt4 UI code generator 4.11.1
 #
 # WARNING! All changes made in this file will be lost!

ui/ExtraDifferential.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'ExtraDifferential.ui'
+# Form implementation generated from reading ui file 'ui/ExtraDifferential.ui'
 #
-# Created: Tue Sep 23 21:38:12 2014
+# Created: Wed Sep 24 21:21:48 2014
 #      by: PyQt4 UI code generator 4.11.1
 #
 # WARNING! All changes made in this file will be lost!

ui/ExtraDifferentialWidget.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-from gui import ExtraDifferential
+from ui import ExtraDifferential
 
 __author__ = 'markusro'
 

ui/PeakGroupBox.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'PeakGroupBox.ui'
+# Form implementation generated from reading ui file 'ui/PeakGroupBox.ui'
 #
-# Created: Tue Sep 23 21:38:12 2014
+# Created: Wed Sep 24 21:21:48 2014
 #      by: PyQt4 UI code generator 4.11.1
 #
 # WARNING! All changes made in this file will be lost!

ui/PowerLawGroupBox.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'PowerLawGroupBox.ui'
+# Form implementation generated from reading ui file 'ui/PowerLawGroupBox.ui'
 #
-# Created: Tue Sep 23 21:38:12 2014
+# Created: Wed Sep 24 21:21:48 2014
 #      by: PyQt4 UI code generator 4.11.1
 #
 # WARNING! All changes made in this file will be lost!

ui/QDSMain.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'QDSMain.ui'
+# Form implementation generated from reading ui file 'ui/QDSMain.ui'
 #
-# Created: Tue Sep 23 21:38:12 2014
+# Created: Wed Sep 24 21:21:48 2014
 #      by: PyQt4 UI code generator 4.11.1
 #
 # WARNING! All changes made in this file will be lost!

ui/StaticGroupBox.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'StaticGroupBox.ui'
+# Form implementation generated from reading ui file 'ui/StaticGroupBox.ui'
 #
-# Created: Tue Sep 23 21:38:12 2014
+# Created: Wed Sep 24 21:21:48 2014
 #      by: PyQt4 UI code generator 4.11.1
 #
 # WARNING! All changes made in this file will be lost!

ui/YAFFConfig.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'YAFFConfig.ui'
+# Form implementation generated from reading ui file 'ui/YAFFConfig.ui'
 #
-# Created: Tue Sep 23 21:38:12 2014
+# Created: Wed Sep 24 21:21:48 2014
 #      by: PyQt4 UI code generator 4.11.1
 #
 # WARNING! All changes made in this file will be lost!

ui/YAFFparameters.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'YAFFparameters.ui'
+# Form implementation generated from reading ui file 'ui/YAFFparameters.ui'
 #
-# Created: Tue Sep 23 21:38:12 2014
+# Created: Wed Sep 24 21:21:48 2014
 #      by: PyQt4 UI code generator 4.11.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -279,7 +279,7 @@ class Ui_Form(object):
         self.label_9.setText(_translate("Form", "TextLabel", None))
         self.label_6.setText(_translate("Form", "TextLabel", None))
         self.label_type.setText(_translate("Form", "Type", None))
-        self.label_huh.setText(_translate("Form", "TextLabel", None))
+        self.label_huh.setText(_translate("Form", "N/A", None))
         self.label_2.setText(_translate("Form", "TextLabel", None))
         self.label_102.setText(_translate("Form", "g", None))
         self.label_222.setText(_translate("Form", "<html><head/><body><p>τ<span style=\" vertical-align:sub;\">α</span></p></body></html>", None))

ui/YAFFparameters.ui

@@ -178,7 +178,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="label_huh">
      <property name="text">
-      <string>TextLabel</string>
+      <string>N/A</string>
      </property>
     </widget>
    </item>