Changeset 186d678 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Oct 31, 2018 6:08:16 AM (6 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

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (14 diffs)
• SmearingWidget.py (modified) (4 diffs)
• UnitTesting/FittingWidgetTest.py (modified) (2 diffs)
• ViewDelegate.py (modified) (3 diffs)
• FittingPerspective.py (modified) (3 diffs)
• UnitTesting/ComplexConstraintTest.py (modified) (1 diff)

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)
 

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

@@ -220 +220 @@
         self.txtSmearDown.setEnabled(True)
         self.txtSmearUp.setEnabled(True)
-        self.txtSmearDown.setText(str(0.0))
-        self.txtSmearUp.setText(str(0.0))
+        #self.txtSmearDown.setText(str(0.0))
+        #self.txtSmearUp.setText(str(0.0))
 
     def setSlitLabels(self):
@@ -235 +235 @@
         self.txtSmearDown.setEnabled(True)
         self.txtSmearUp.setEnabled(True)
-        self.txtSmearDown.setText(str(0.0))
-        self.txtSmearUp.setText(str(0.0))
+        #self.txtSmearDown.setText(str(0.0))
+        #self.txtSmearUp.setText(str(0.0))
 
     def setDQLabels(self):
@@ -330 +330 @@
         """
         _, accuracy, d_height, d_width = self.state()
+
         # Check changes in slit width
         if d_width is None:
@@ -337 +338 @@
 
         if isinstance(self.data, Data2D):
+            self.current_smearer = smear_selection(self.data, self.kernel_model)
             return
         # make sure once more if it is smearer

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -185 +185 @@
 
         # Observe no such luck
-        self.assertEqual(self.widget.cbCategory.currentIndex(), 7)
+        self.assertEqual(self.widget.cbCategory.currentIndex(), 6)
         self.assertEqual(self.widget.cbModel.count(), 29)
 
@@ -219 +219 @@
         # 
         # Now change the model
+<<<<<<< HEAD
         self.widget.cbModel.setCurrentIndex(4)
+=======
+        self.widget.cbModel.setCurrentIndex(2)
+>>>>>>> ESS_GUI
         self.assertEqual(self.widget.cbModel.currentText(),'dab')
 

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

@@ -13 +13 @@
         Overwrite generic constructor to allow for some globals
         """
-        super(QtWidgets.QStyledItemDelegate, self).__init__()
+        super(ModelViewDelegate, self).__init__()
 
         # Main parameter table view columns
@@ -125 +125 @@
         Overwrite generic constructor to allow for some globals
         """
-        super(QtWidgets.QStyledItemDelegate, self).__init__()
+        super(PolyViewDelegate, self).__init__()
 
         self.poly_parameter = 0
@@ -226 +226 @@
         Overwrite generic constructor to allow for some globals
         """
-        super(QtWidgets.QStyledItemDelegate, self).__init__()
+        super(MagnetismViewDelegate, self).__init__()
 
         self.mag_parameter = 0

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

@@ -112 +112 @@
     def onLatexCopy(self):
         self.currentTab.onCopyToClipboard("Latex")
+
+    def serializeAllFitpage(self):
+        # serialize all active fitpages and return
+        # a dictionary: {data_id: fitpage_state}
+        params = {}
+        for i, tab in enumerate(self.tabs):
+            tab_data = self.getSerializedFitpage(tab)
+            if tab.tab_id is None: continue
+            id = tab_data['data_id'][0]
+            params[id] = tab_data
+        return params
+
+    def serializeCurrentFitpage(self):
+        # serialize current(active) fitpage
+        return self.getSerializedFitpage(self.currentTab)
+
+    def getSerializedFitpage(self, tab):
+        """
+        get serialize requested fit tab
+        """
+        fitpage_state = tab.getFitPage()
+        fitpage_state += tab.getFitModel()
+        # put the text into dictionary
+        line_dict = {}
+        for line in fitpage_state:
+            #content = line.split(',')
+            if len(line) > 1:
+                line_dict[line[0]] = line[1:]
+        return line_dict
+
+    def currentTabDataId(self):
+        """
+        Returns the data ID of the current tab
+        """
+        tab_id = None
+        if self.currentTab.data:
+            tab_id = self.currentTab.data.id
+        return tab_id
+
+    def updateFromParameters(self, parameters):
+        """
+        Pass the update parameters to the current fit page
+        """
+        self.currentTab.createPageForParameters(parameters)
 
     def closeEvent(self, event):
@@ -258 +302 @@
         return True
 
+    def isSerializable(self):
+        """
+        Tell the caller that this perspective writes its state
+        """
+        return True
+
     def setData(self, data_item=None, is_batch=False):
         """
@@ -337 +387 @@
         pass
 
+    def getCurrentStateAsXml(self):
+        """
+        Returns an XML version of the current state
+        """
+        state = {}
+        for tab in self.tabs:
+            pass
+        return state
+
     @property
     def currentTab(self):

src/sas/qtgui/Perspectives/Fitting/UnitTesting/ComplexConstraintTest.py

@@ -34 +34 @@
         category_index = self.tab1.cbCategory.findText("Shape Independent")
         self.tab1.cbCategory.setCurrentIndex(category_index)
+        model_index = self.tab1.cbModel.findText("be_polyelectrolyte")
+        self.tab1.cbModel.setCurrentIndex(model_index)
+
         category_index = self.tab2.cbCategory.findText("Cylinder")
         self.tab2.cbCategory.setCurrentIndex(category_index)
+        model_index = self.tab2.cbModel.findText("barbell")
+        self.tab2.cbModel.setCurrentIndex(model_index)
 
         tabs = [self.tab1, self.tab2]