Changeset 700b03b in sasview

Timestamp:

Sep 4, 2018 5:51:03 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

c7809a9

Parents:

00b7ddf0

git-author:

Torin Cooper-Bennun <torin.cooper-bennun@…> (08/17/18 11:51:05)

git-committer:

Torin Cooper-Bennun <torin.cooper-bennun@…> (09/04/18 05:51:03)

Message:

[CHERRY-PICK FROM 1547a91bc] handle duplicate names in P(Q)S(Q), using param item's internal data

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (2 diffs)
• FittingWidget.py (modified) (3 diffs)

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

@@ -124 +124 @@
     return item
 
-def addSimpleParametersToModel(parameters, is2D):
+def addSimpleParametersToModel(parameters, is2D, parameters_original=None):
     """
     Update local ModelModel with sasmodel parameters
+    parameters_original: list of parameters before any tagging on their IDs, e.g. for product model
+    (so that those are the display names; see below)
     """
     if is2D:
@@ -132 +134 @@
     else:
         params = parameters.iq_parameters
+
+    if parameters_original:
+        # 'parameters_original' contains the parameters as they are to be DISPLAYED, while 'parameters'
+        # contains the parameters as they were renamed; this is for handling name collisions in product model.
+        # The 'real name' of the parameter will be stored in the item's user data.
+        if is2D:
+            params_orig = [p for p in parameters_original.kernel_parameters if p.type != 'magnetic']
+        else:
+            params_orig = parameters_original.iq_parameters
+    else:
+        # no difference in names anyway
+        params_orig = params
+
     item = []
-    for param in params:
+    for param, param_orig in zip(params, params_orig):
         # Create the top level, checkable item
-        item_name = param.name
+        item_name = param_orig.name
         item1 = QtGui.QStandardItem(item_name)
+        item1.setData(param.name, QtCore.Qt.UserRole)
         item1.setCheckable(True)
         item1.setEditable(False)

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

@@ -2060 +2060 @@
         """
         structure_module = generate.load_kernel_module(structure_factor)
-        structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
-
-        structure_kernel = self.models[structure_factor]()
-        form_kernel = self.kernel_module
-
-        self.kernel_module = MultiplicationModel(form_kernel, structure_kernel)
+
+        s_kernel = self.models[structure_factor]()
+        p_kernel = self.kernel_module
+
+        p_pars_len = len(p_kernel._model_info.parameters.kernel_parameters)
+        s_pars_len = len(s_kernel._model_info.parameters.kernel_parameters) - 1 # no radius_effective
+
+        self.kernel_module = MultiplicationModel(p_kernel, s_kernel)
+
+        # S(Q) params from the product model are not necessarily the same as those from the S(Q) model; any conflicting
+        # names with P(Q) params will cause a rename; we also lose radius_effective (for now...)
+        s_params = modelinfo.ParameterTable(
+            self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len:p_pars_len+s_pars_len])
+
+        # These are the parameters before rename; ignore the first one, as it is radius_effective, which is removed
+        # from the product model to be handled internally (for now...)
+        s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters[1:])
 
         # Get new rows for QModel
-        new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)
+        # Any renamed parameters are stored as data in the relevant item, for later handling
+        new_rows = FittingUtilities.addSimpleParametersToModel(s_params, self.is2D, s_params_orig)
+
+        # TODO: deal with new parameter(s) added to product model, in kernel_parameters[p_pars_len+s_pars_len:]
 
         # Add heading row
@@ -2108 +2122 @@
         model_row = item.row()
         name_index = self._model_model.index(model_row, 0)
+        name_item = self._model_model.itemFromIndex(name_index)
 
         # Extract changed value.
@@ -2116 +2131 @@
             return
 
-        parameter_name = str(self._model_model.data(name_index)) # sld, background etc.
+        # if the item has user data, this is the actual parameter name (e.g. to handle duplicate names)
+        if name_item.data(QtCore.Qt.UserRole):
+            parameter_name = str(name_item.data(QtCore.Qt.UserRole))
+        else:
+            parameter_name = str(self._model_model.data(name_index))
 
         # Update the parameter value - note: this supports +/-inf as well