Changeset e5ae812 in sasview

Timestamp:

Nov 13, 2018 7:25:48 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:

baeac95

Parents:

133812c7

Message:

Added C&S tab serialization.

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (5 diffs)
• MainWindow/GuiManager.py (modified) (2 diffs)
• Perspectives/Fitting/ConstraintWidget.py (modified) (2 diffs)
• Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (6 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -457 +457 @@
                 self.chkBatch.setChecked(True if value=='True' else False)
                 continue
+            if 'cs_tab' in key:
+                continue
             # send newly created items to the perspective
             self.updatePerspectiveWithProperties(key, value)
@@ -462 +464 @@
         # See if there are any batch pages defined and create them, if so
         self.updateWithBatchPages(all_data)
+
+        # Only now can we create/assign C&S pages.
+        for key, value in all_data.items():
+            if 'cs_tab' in key:
+                self.updatePerspectiveWithProperties(key, value)
 
     def updateWithBatchPages(self, all_data):
@@ -488 +495 @@
                 self._perspective().setData(data_item=items, is_batch=True)
                 self._perspective().updateFromParameters(page)
-
         pass
 
@@ -494 +500 @@
         """
         """
-        data_dict = {key:value['fit_data']}
-        # Create new model items in the data explorer
-        items = self.updateModelFromData(data_dict)
+        if 'fit_data' in value:
+            data_dict = {key:value['fit_data']}
+            # Create new model items in the data explorer
+            items = self.updateModelFromData(data_dict)
 
         if 'fit_params' in value:
@@ -512 +519 @@
                 # Assign parameters to the most recent (current) page.
                 self._perspective().updateFromParameters(page)
+        if 'cs_tab' in key and 'is_constraint' in value:
+            # Create a C&S page
+            self._perspective().addConstraintTab()
+            # Modify the tab
+            self._perspective().updateFromParameters(value)
+
         pass # debugger
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -594 +594 @@
             analysis[id] = data_content
 
+        # standalone constraint pages
+        for keys, values in params.items():
+            if not 'is_constraint' in values[0]:
+                continue
+            analysis[keys] = values[0]
+
         with open(filename, 'w') as outfile:
             GuiUtils.saveData(outfile, analysis)
@@ -1177 +1183 @@
             out_f.write("#Application appearance custom configuration\n")
             for key, item in config.__dict__.items():
-                if key[:2] != "__":
-                    if isinstance(item, str):
-                        item = '"' + item + '"'
-                    out_f.write("%s = %s\n" % (key, str(item)))
+                if key[:2] == "__":
+                    continue
+                if isinstance(item, str):
+                    item = '"' + item + '"'
+                out_f.write("%s = %s\n" % (key, str(item)))
         pass # debugger anchor

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

@@ -31 +31 @@
         # To keep with previous SasView values, use 300 as the start offset
         self.page_id = 301
+        self.tab_id = self.page_id
 
         # Are we chain fitting?
@@ -693 +694 @@
         # Update the tab
         constrained_tab.addConstraintToRow(constraint, constrained_row)
+
+    def getFitPage(self):
+        """
+        Retrieves the state of this page
+        """
+        param_list = []
+
+        param_list.append(['is_constraint', 'True'])
+        param_list.append(['data_id', "cs_tab"+str(self.page_id)])
+        param_list.append(['current_type', self.currentType])
+        param_list.append(['is_chain_fitting', str(self.is_chain_fitting)])
+        param_list.append(['special_case', self.cbCases.currentText()])
+
+        return param_list
+
+    def getFitModel(self):
+        """
+        Retrieves current model
+        """
+        model_list = []
+
+        checked_models = {}
+        for row in range(self.tblTabList.rowCount()):
+            model_name = self.tblTabList.item(row,1).data(0)
+            active = self.tblTabList.item(row,0).checkState()# == QtCore.Qt.Checked
+            checked_models[model_name] = str(active)
+
+        checked_constraints = {}
+        for row in range(self.tblConstraints.rowCount()):
+            model_name = self.tblConstraints.item(row,0).data(0)
+            active = self.tblConstraints.item(row,0).checkState()# == QtCore.Qt.Checked
+            checked_constraints[model_name] = str(active)
+
+        model_list.append(['checked_models', checked_models])
+        model_list.append(['checked_constraints', checked_constraints])
+        return model_list
+
+    def createPageForParameters(self, parameters=None):
+        """
+        Update the page with passed parameter values
+        """
+        # checked models
+        if not 'checked_models' in parameters:
+            return
+        models = parameters['checked_models'][0]
+        for model, check_state in models.items():
+            for row in range(self.tblTabList.rowCount()):
+                model_name = self.tblTabList.item(row,1).data(0)
+                if model_name != model:
+                    continue
+                # check/uncheck item
+                self.tblTabList.item(row,0).setCheckState(int(check_state))
+
+        if not 'checked_constraints' in parameters:
+            return
+        # checked constraints
+        models = parameters['checked_constraints'][0]
+        for model, check_state in models.items():
+            for row in range(self.tblConstraints.rowCount()):
+                model_name = self.tblConstraints.item(row,0).data(0)
+                if model_name != model:
+                    continue
+                # check/uncheck item
+                self.tblConstraints.item(row,0).setCheckState(int(check_state))
+
+        # fit/batch radio
+        isBatch = parameters['current_type'][0] == 'BatchPage'
+        if isBatch:
+            self.btnBatch.toggle()
+
+        # chain
+        is_chain = parameters['is_chain_fitting'][0] == 'True'
+        if isBatch:
+            self.chkChain.setChecked(is_chain)
+
+

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

@@ -39 +39 @@
         self.maxIndex = 1
 
-        ## Index of the current tab
-        #self.currentTab = 0
-
         # The default optimizer
         self.optimizer = 'Levenberg-Marquardt'
@@ -121 +118 @@
         for i, tab in enumerate(self.tabs):
             tab_data = self.getSerializedFitpage(tab)
-            if tab.tab_id is None: continue
             if 'data_id' not in tab_data: continue
             id = tab_data['data_id'][0]

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

@@ -1952 +1952 @@
         Emits plotRequestedSignal for all plots found in the given model under the provided item name.
         """
-        fitpage_name = "" if self.tab_id is None else "M"+str(self.tab_id)
+        fitpage_name = self.kernel_module.name
         plots = GuiUtils.plotsFromFilename(item_name, item_model)
         # Has the fitted data been shown?
@@ -3524 +3524 @@
         param_list.append(['data_name', filenames])
         param_list.append(['data_id', data_ids])
+        param_list.append(['tab_name', self.modelName()])
         # option tab
         param_list.append(['q_range_min', str(self.q_range_min)])
@@ -3596 +3597 @@
             except:
                 pass
-
-            param_list.append([param_name, param_checked, param_value, param_error, param_min, param_max])
+            # Do we have any constraints on this parameter?
+            constraint = self.getConstraintForRow(row)
+            cons = ()
+            if constraint is not None:
+                value = constraint.value
+                func = constraint.func
+                cons = (value, func)
+
+            param_list.append([param_name, param_checked, param_value, param_error, param_min, param_max, cons])
 
         def gatherPolyParams(row):
@@ -3705 +3713 @@
                 self.updateMultiplicityCombo(multip)
 
+        if 'tab_name' in line_dict.keys():
+            self.kernel_module.name = line_dict['tab_name'][0]
         if 'polydisperse_params' in line_dict.keys():
             self.chkPolydispersity.setChecked(line_dict['polydisperse_params'][0]=='True')
@@ -3827 +3837 @@
             ioffset = 0
             joffset = 0
-            if len(param_dict[param_name])>4:
+            if len(param_dict[param_name])>5:
                 # error values are not editable - no need to update
                 ioffset = 1
@@ -3840 +3850 @@
             except:
                 pass
+
+            # constraints
+            cons = param_dict[param_name][4+ioffset]
+            if cons is not None and cons:
+                value = cons[0]
+                function = cons[1]
+                constraint = Constraint()
+                constraint.value = value
+                constraint.func = function
+                self.addConstraintToRow(constraint=constraint, row=row)
 
             self.setFocus()