Changeset 186d678 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Oct 31, 2018 4:08:16 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

48df831

Parents:

b1b71ad (diff), 04e1c80 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_project_save

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (14 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -294 +294 @@
         self.has_magnet_error_column = False
 
+        # Enablement of comboboxes
+        self.enabled_cbmodel = False
+        self.enabled_sfmodel = False
+
         # If the widget generated theory item, save it
         self.theory_item = None
@@ -460 +464 @@
         self.cbModel.setEnabled(False)
         self.lblModel.setEnabled(False)
+        self.enabled_cbmodel = False
 
     def enableModelCombo(self):
@@ -465 +470 @@
         self.cbModel.setEnabled(True)
         self.lblModel.setEnabled(True)
+        self.enabled_cbmodel = True
 
     def disableStructureCombo(self):
@@ -470 +476 @@
         self.cbStructureFactor.setEnabled(False)
         self.lblStructure.setEnabled(False)
+        self.enabled_sfmodel = False
 
     def enableStructureCombo(self):
@@ -475 +482 @@
         self.cbStructureFactor.setEnabled(True)
         self.lblStructure.setEnabled(True)
+        self.enabled_sfmodel = True
 
     def togglePoly(self, isChecked):
@@ -1009 +1017 @@
         Checks if the current model has magnetic scattering implemented
         """
-        current_model = self.cbModel.currentText()
-        return self.is2D and current_model in self.MAGNETIC_MODELS
+        has_params = False
+        if self.kernel_module:
+            has_mag_params = len(self.kernel_module.magnetic_params) > 0
+        return self.is2D and has_mag_params
 
     def onSelectModel(self):
@@ -1034 +1044 @@
         if not model:
             return
+
         self.chkMagnetism.setEnabled(self.canHaveMagnetism())
         self.chkMagnetism.setEnabled(self.canHaveMagnetism())
@@ -1175 +1186 @@
         self.SASModelToQModel(model, structure_factor)
 
+        # Enable magnetism checkbox for selected models
+        self.chkMagnetism.setEnabled(self.canHaveMagnetism())
+        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.chkMagnetism.isChecked() and self.canHaveMagnetism())
+
+        # Update column widths
         for column, width in self.lstParamHeaderSizes.items():
             self.lstParams.setColumnWidth(column, width)
@@ -1573 +1589 @@
         if param_dict is None:
             return
-        if hasattr(res, 'convergence') and len(res.convergence)>0:
-            self.communicate.resultPlotUpdateSignal.emit(result[0])
+        self.communicate.resultPlotUpdateSignal.emit(result[0])
 
         elapsed = result[1]
@@ -3110 +3125 @@
         shell_par = None
         for par in kernel_pars:
-            if par.name == param_name:
+            parname = par.name
+            if '[' in parname:
+                 parname = parname[:parname.index('[')]
+            if parname == param_name:
                 shell_par = par
                 break
-        if not shell_par:
+        if shell_par is None:
             logger.error("Could not find %s in kernel parameters.", param_name)
+            return
         default_shell_count = shell_par.default
         shell_min = 0
@@ -3124 +3143 @@
             # no info about limits
             pass
+        except Exception as ex:
+            logging.error("Badly defined multiplicity: "+ str(ex))
+            return
         # don't update the kernel here - this data is display only
         self._model_model.blockSignals(True)
@@ -3130 +3152 @@
         self._model_model.blockSignals(False)
 
+        ## Respond to index change
+        #func.currentTextChanged.connect(self.modifyShellsInList)
+
+        # Respond to button press
+        button.clicked.connect(self.onShowSLDProfile)
+
+        # Available range of shells displayed in the combobox
+        func.addItems([str(i) for i in range(shell_min, shell_max+1)])
+
         # Respond to index change
         func.currentTextChanged.connect(self.modifyShellsInList)
 
-        # Respond to button press
-        button.clicked.connect(self.onShowSLDProfile)
-
-        # Available range of shells displayed in the combobox
-        func.addItems([str(i) for i in range(shell_min, shell_max+1)])
-
         # Add default number of shells to the model
         func.setCurrentText(str(default_shell_count))
+        self.modifyShellsInList(str(default_shell_count))
 
     def modifyShellsInList(self, text):
@@ -3188 +3214 @@
         """
         # get profile data
-        x, y = self.kernel_module.getProfile()
+        try:
+            x, y = self.kernel_module.getProfile()
+        except TypeError:
+            msg = "SLD profile calculation failed."
+            logging.error(msg)
+            return
+
         y *= 1.0e6
         profile_data = Data1D(x=x, y=y)
@@ -3221 +3253 @@
 
         self.cbCategory.setEnabled(enabled)
-        self.cbModel.setEnabled(enabled)
+
+        if enabled:
+            # worry about original enablement of model and SF
+            self.cbModel.setEnabled(self.enabled_cbmodel)
+            self.cbStructureFactor.setEnabled(self.enabled_sfmodel)
+        else:
+            self.cbModel.setEnabled(enabled)
+            self.cbStructureFactor.setEnabled(enabled)
+
         self.cmdPlot.setEnabled(enabled)