added debye relaxation peak

ConductivityGroupBox.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ConductivityGroupBox.ui'
 #
-# Created: Thu Mar 20 00:32:53 2014
+# Created: Thu Mar 20 00:40:00 2014
 #      by: PyQt4 UI code generator 4.10.3
 #
 # WARNING! All changes made in this file will be lost!

CustomWidgets.py

@@ -168,6 +168,8 @@ class PeakWidget(BaseWidget,QGroupBox):
             self._distrib_cc(1)
         if dist == 2: # Cole-Davidson
             self._distrib_cd(1)
+        if dist == 3: # Cole-Davidson
+            self._distrib_debye(1)
 
     def _distrib_cd(self, state):
         if state:
@@ -180,6 +182,22 @@ class PeakWidget(BaseWidget,QGroupBox):
         else:
             self.ui.doubleSpinBox_3.setDisabled(False)
 
+    def _distrib_debye(self, state):
+        if state:
+            self.ui.doubleSpinBox_3.setValue(1.0)
+            self.ui.doubleSpinBox_3.setDisabled(True)
+            self.ui.doubleSpinBox_4.setValue(1.0)
+            self.ui.doubleSpinBox_4.setDisabled(True)
+            self.ui.checkBox_3.setChecked(True)
+            self.ui.checkBox_3.setDisabled(True)
+            self.ui.checkBox_4.setChecked(True)
+            self.ui.checkBox_4.setDisabled(True)
+
+        else:
+            self.ui.doubleSpinBox_3.setDisabled(False)
+            self.ui.doubleSpinBox_4.setDisabled(False)
+
+
     def _distrib_cc(self, state):
         if state:
             self.ui.doubleSpinBox_4.setValue(1.0)

PeakGroupBox.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'PeakGroupBox.ui'
 #
-# Created: Thu Mar 20 00:32:53 2014
+# Created: Thu Mar 20 00:40:00 2014
 #      by: PyQt4 UI code generator 4.10.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -152,6 +152,7 @@ class Ui_PeakGroupBox(object):
         self.comboBox.addItem(_fromUtf8(""))
         self.comboBox.addItem(_fromUtf8(""))
         self.comboBox.addItem(_fromUtf8(""))
+        self.comboBox.addItem(_fromUtf8(""))
         self.gridLayout.addWidget(self.comboBox, 0, 2, 1, 1, QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter)
         self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1)
 
@@ -175,4 +176,5 @@ class Ui_PeakGroupBox(object):
         self.comboBox.setItemText(0, _translate("PeakGroupBox", "H-N", None))
         self.comboBox.setItemText(1, _translate("PeakGroupBox", "C-C", None))
         self.comboBox.setItemText(2, _translate("PeakGroupBox", "C-D", None))
+        self.comboBox.setItemText(3, _translate("PeakGroupBox", "Debye", None))
 

PeakGroupBox.ui

@@ -259,6 +259,11 @@
          <string extracomment="Cole-Davidson Distribution">C-D</string>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>Debye</string>
+        </property>
+       </item>
       </widget>
      </item>
     </layout>

PowerLawGroupBox.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'PowerLawGroupBox.ui'
 #
-# Created: Thu Mar 20 00:32:53 2014
+# Created: Thu Mar 20 00:40:00 2014
 #      by: PyQt4 UI code generator 4.10.3
 #
 # WARNING! All changes made in this file will be lost!

QDS.py

@@ -105,7 +105,7 @@ class AppWindow(QMainWindow):
 
         self.data = Data()
 
-        self.fit_boundary = pg.LinearRegionItem(brush=QColor(254,254,254,10))
+        self.fit_boundary = pg.LinearRegionItem(brush=QColor(0,127,254,15))
         self.ui.graphicsView.addItem(self.data.data_curve_imag)
         self.ui.graphicsView.addItem(self.data.data_curve_real)
         self.ui.graphicsView.addItem(self.data.fitted_curve_imag)

QDSMain.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'QDSMain.ui'
 #
-# Created: Thu Mar 20 00:32:53 2014
+# Created: Thu Mar 20 00:39:59 2014
 #      by: PyQt4 UI code generator 4.10.3
 #
 # WARNING! All changes made in this file will be lost!

StaticGroupBox.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'StaticGroupBox.ui'
 #
-# Created: Thu Mar 20 00:32:53 2014
+# Created: Thu Mar 20 00:40:00 2014
 #      by: PyQt4 UI code generator 4.10.3
 #
 # WARNING! All changes made in this file will be lost!

images_rc.py

@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created: Do. Mär. 20 00:32:52 2014
+# Created: Do. Mär. 20 00:39:59 2014
 #      by: The Resource Compiler for PyQt (Qt v4.8.5)
 #
 # WARNING! All changes made in this file will be lost!