more cleanup

This commit is contained in:
Markus Rosenstihl 2014-09-24 21:32:58 +02:00
parent 79cb5b3ec4
commit 685839f900
41 changed files with 23 additions and 5581 deletions

View File

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

5
QDS.py
View File

@ -1,6 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
from gui import QDSMain, ExtraDifferentialWidget
_author_ = "Markus Rosenstihl" _author_ = "Markus Rosenstihl"
@ -24,7 +23,9 @@ import pyqtgraph as pg
from Container import Conductivity, PowerComplex, Static, Peak, YAFF from Container import Conductivity, PowerComplex, Static, Peak, YAFF
from ContainerWidgets import ParameterWidget 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 from data.data import Data

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
# -*- coding: utf-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 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -1,8 +1,8 @@
# -*- coding: utf-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 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

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

View File

@ -1,8 +1,8 @@
# -*- coding: utf-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 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -1,8 +1,8 @@
# -*- coding: utf-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 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -1,8 +1,8 @@
# -*- coding: utf-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 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -1,8 +1,8 @@
# -*- coding: utf-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 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -1,8 +1,8 @@
# -*- coding: utf-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 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -1,8 +1,8 @@
# -*- coding: utf-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 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # 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_9.setText(_translate("Form", "TextLabel", None))
self.label_6.setText(_translate("Form", "TextLabel", None)) self.label_6.setText(_translate("Form", "TextLabel", None))
self.label_type.setText(_translate("Form", "Type", 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_2.setText(_translate("Form", "TextLabel", None))
self.label_102.setText(_translate("Form", "g", 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)) self.label_222.setText(_translate("Form", "<html><head/><body><p>τ<span style=\" vertical-align:sub;\">α</span></p></body></html>", None))

View File

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

0
ui/__init__.py Normal file
View File

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 320 B

View File

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 304 B

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB