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

Fixed Bug in PeaKWidget: change from CD,cc or Debye to HN did not reset the parameters to be fixed

Browse Source
This commit is contained in:
Markus Rosenstihl
2014-09-28 21:16:06 +02:00
parent 1a1066a07e
commit 21a93d6d09
6 changed files with 138 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gui/ContainerWidgets.py → gui/container_widgets.py
View File

@ -65,7 +65,7 @@ class BaseWidget(QGroupBox):
def subtract(self):
self.subtract.emit()
def changeValues(self, num):
def change_values( self, num ):
self.changedTable.emit()
def fixedParameter(self):
@ -86,7 +86,7 @@ class BaseWidget(QGroupBox):
def update(self):
self.changedTable.emit()
def updateTable(self, beta, sd_beta=None):
def update_table( self, beta, sd_beta=None ):
for i, arg in enumerate(beta):
self.inputs[i].setValue(arg)
sd_style=""
@ -161,26 +161,19 @@ class PeakWidget(BaseWidget,QGroupBox):
]
for dsb in self.inputs:
dsb.valueChanged.connect(self.changeValues)
dsb.valueChanged.connect(self.change_values)
self.fixedCheckBoxes = [self.ui.checkBox_1,
self.ui.checkBox_2,
self.ui.checkBox_3,
self.ui.checkBox_4]
# self.ui.checkBox_3.stateChanged.connect(self._distrib_cc)
# self.ui.checkBox_4.stateChanged.connect(self._distrib_cd)
self.ui.comboBox.currentIndexChanged.connect(self._distrib_select)
def _distrib_select(self, dist):
self._distrib_hn(1)
if dist == 0: # hav-neg:
self.ui.checkBox_3.setChecked(False)
self.ui.checkBox_3.setDisabled(False)
self.ui.checkBox_4.setChecked(False)
self.ui.checkBox_4.setDisabled(False)
self.ui.doubleSpinBox_3.setDisabled(False)
self.ui.doubleSpinBox_4.setDisabled(False)
self._distrib_hn(1)
if dist == 1: # Cole-Cole:
self._distrib_cc(1)
if dist == 2: # Cole-Davidson
@ -188,6 +181,14 @@ class PeakWidget(BaseWidget,QGroupBox):
if dist == 3: # Cole-Davidson
self._distrib_debye(1)
def _distrib_hn( self, state ):
self.ui.checkBox_3.setChecked(False)
self.ui.checkBox_3.setDisabled(False)
self.ui.checkBox_4.setChecked(False)
self.ui.checkBox_4.setDisabled(False)
self.ui.doubleSpinBox_3.setDisabled(False)
self.ui.doubleSpinBox_4.setDisabled(False)
def _distrib_cd(self, state):
if state:
self.ui.doubleSpinBox_3.setValue(1.0)
@ -290,7 +291,7 @@ class StaticWidget(BaseWidget, QGroupBox):
self.fixedCheckBoxes = [ self.ui.checkBox_1]
for dsb in self.inputs:
dsb.valueChanged.connect(self.changeValues)
dsb.valueChanged.connect(self.change_values)
self.ui.removeButton.clicked.connect(self.remove)
self.func_type=r"$\epsilon_\infty$"
@ -336,7 +337,7 @@ class ConductivityWidget(BaseWidget, QGroupBox):
self.ui.checkBox_2,
self.ui.checkBox_3]
for dsb in self.inputs:
dsb.valueChanged.connect(self.changeValues)
dsb.valueChanged.connect(self.change_values)
@ -366,7 +367,7 @@ class PowerLawWidget(BaseWidget):
self.fixedCheckBoxes = [ self.ui.checkBox_2,
self.ui.checkBox_3]
for dsb in self.inputs:
dsb.valueChanged.connect(self.changeValues)
dsb.valueChanged.connect(self.change_values)
class YaffWidget(BaseWidget):
@ -460,7 +461,7 @@ class YaffWidget(BaseWidget):
self.ui.checkBox_10,
]
for dsb in self.inputs:
dsb.valueChanged.connect(self.changeValues)
dsb.valueChanged.connect(self.change_values)
self.change_model(0)
self._t_list, self._tau_list = None, None