Changes in src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py [f3cc979:70f4458] in sasview

File:

• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (13 diffs)

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

@@ -8 +8 @@
 from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Plotting.PlotterData import Data2D
-
-from sas.qtgui.Perspectives.Fitting.AssociatedComboBox import AssociatedComboBox
 
 model_header_captions = ['Parameter', 'Value', 'Min', 'Max', 'Units']
@@ -63 +61 @@
     return (param_name, param_length)
 
-def createFixedChoiceComboBox(param, item_row):
-    """
-    Determines whether param is a fixed-choice parameter, modifies items in item_row appropriately and returns a combo
-    box containing the fixed choices. Returns None if param is not fixed-choice.
-    
-    item_row is a list of QStandardItem objects for insertion into the parameter table. 
-    """
-
-    # Determine whether this is a fixed-choice parameter. There are lots of conditionals, simply because the
-    # implementation is not yet concrete; there are several possible indicators that the parameter is fixed-choice.
-    # TODO: (when the sasmodels implementation is concrete, clean this up)
-    choices = None
-    if isinstance(param.choices, (list, tuple)) and len(param.choices) > 0:
-        # The choices property is concrete in sasmodels, probably will use this
-        choices = param.choices
-    elif isinstance(param.units, (list, tuple)):
-        choices = [str(x) for x in param.units]
-
-    cbox = None
-    if choices is not None:
-        # Use combo box for input, if it is fixed-choice
-        cbox = AssociatedComboBox(item_row[1], idx_as_value=True)
-        cbox.addItems(choices)
-        item_row[2].setEditable(False)
-        item_row[3].setEditable(False)
-
-    return cbox
-
-def addParametersToModel(parameters, kernel_module, is2D, model=None, view=None):
-    """
-    Update local ModelModel with sasmodel parameters.
-    Actually appends to model, if model and view params are not None.
-    Always returns list of lists of QStandardItems.
+def addParametersToModel(parameters, kernel_module, is2D):
+    """
+    Update local ModelModel with sasmodel parameters
     """
     multishell_parameters = getIterParams(parameters)
@@ -104 +72 @@
     else:
         params = parameters.iq_parameters
-
-    rows = []
+    item = []
     for param in params:
         # don't include shell parameters
         if param.name == multishell_param_name:
             continue
-
         # Modify parameter name from <param>[n] to <param>1
         item_name = param.name
         if param in multishell_parameters:
             continue
+        #    item_name = replaceShellName(param.name, 1)
 
         item1 = QtGui.QStandardItem(item_name)
         item1.setCheckable(True)
         item1.setEditable(False)
-
+        # item_err = QtGui.QStandardItem()
         # check for polydisp params
         if param.polydisperse:
@@ -126 +93 @@
             item1_1 = QtGui.QStandardItem("Distribution")
             item1_1.setEditable(False)
-
             # Find param in volume_params
-            poly_pars = parameters.form_volume_parameters
-            if is2D:
-                poly_pars += parameters.orientation_parameters
-            for p in poly_pars:
+            for p in parameters.form_volume_parameters:
                 if p.name != param.name:
                     continue
                 width = kernel_module.getParam(p.name+'.width')
                 ptype = kernel_module.getParam(p.name+'.type')
+
                 item1_2 = QtGui.QStandardItem(str(width))
                 item1_2.setEditable(False)
@@ -146 +110 @@
                 poly_item.appendRow([item1_1, item1_2, item1_3, item1_4, item1_5])
                 break
-
             # Add the polydisp item as a child
             item1.appendRow([poly_item])
-
         # Param values
         item2 = QtGui.QStandardItem(str(param.default))
+        # TODO: the error column.
+        # Either add a proxy model or a custom view delegate
+        #item_err = QtGui.QStandardItem()
         item3 = QtGui.QStandardItem(str(param.limits[0]))
         item4 = QtGui.QStandardItem(str(param.limits[1]))
-        item5 = QtGui.QStandardItem(str(param.units))
+        item5 = QtGui.QStandardItem(param.units)
         item5.setEditable(False)
-
-        # Check if fixed-choice (returns combobox, if so, also makes some items uneditable)
-        row = [item1, item2, item3, item4, item5]
-        cbox = createFixedChoiceComboBox(param, row)
-
-        # Append to the model and use the combobox, if required
-        if None not in (model, view):
-            model.appendRow(row)
-            if cbox:
-                view.setIndexWidget(item2.index(), cbox)
-        rows.append(row)
-
-    return rows
-
-def addSimpleParametersToModel(parameters, is2D, parameters_original=None, model=None, view=None, row_num=None):
-    """
-    Update local ModelModel with sasmodel parameters (non-dispersed, non-magnetic)
-    Actually appends to model, if model and view params are not None.
-    Always returns list of lists of QStandardItems.
-
-    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)
+        item.append([item1, item2, item3, item4, item5])
+    return item
+
+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:
@@ -196 +147 @@
         params_orig = params
 
-    rows = []
+    item = []
     for param, param_orig in zip(params, params_orig):
         # Create the top level, checkable item
@@ -204 +155 @@
         item1.setCheckable(True)
         item1.setEditable(False)
-
         # Param values
         # TODO: add delegate for validation of cells
         item2 = QtGui.QStandardItem(str(param.default))
-        item3 = QtGui.QStandardItem(str(param.limits[0]))
-        item4 = QtGui.QStandardItem(str(param.limits[1]))
-        item5 = QtGui.QStandardItem(str(param.units))
-        item5.setEditable(False)
-
-        # Check if fixed-choice (returns combobox, if so, also makes some items uneditable)
-        row = [item1, item2, item3, item4, item5]
-        cbox = createFixedChoiceComboBox(param, row)
-
-        # Append to the model and use the combobox, if required
-        if None not in (model, view):
-            if row_num is None:
-                model.appendRow(row)
-            else:
-                model.insertRow(row_num, row)
-                row_num += 1
-
-            if cbox:
-                view.setIndexWidget(item2.index(), cbox)
-
-        rows.append(row)
-
-    return rows
+        item4 = QtGui.QStandardItem(str(param.limits[0]))
+        item5 = QtGui.QStandardItem(str(param.limits[1]))
+        item6 = QtGui.QStandardItem(str(param.units))
+        item6.setEditable(False)
+        item.append([item1, item2, item4, item5, item6])
+    return item
 
 def markParameterDisabled(model, row):
@@ -326 +259 @@
     model.header_tooltips = copy.copy(poly_header_error_tooltips)
 
-def addShellsToModel(parameters, model, index, row_num=None, view=None):
+def addShellsToModel(parameters, model, index, row_num=None):
     """
     Find out multishell parameters and update the model with the requested number of them.
     Inserts them after the row at row_num, if not None; otherwise, appends to end.
-    If view param is not None, supports fixed-choice params.
     Returns a list of lists of QStandardItem objects.
     """
@@ -353 +285 @@
                     item1_3 = QtGui.QStandardItem(str(p.limits[0]))
                     item1_4 = QtGui.QStandardItem(str(p.limits[1]))
-                    item1_5 = QtGui.QStandardItem(str(p.units))
+                    item1_5 = QtGui.QStandardItem(p.units)
                     poly_item.appendRow([item1_1, item1_2, item1_3, item1_4, item1_5])
                     break
@@ -361 +293 @@
             item3 = QtGui.QStandardItem(str(par.limits[0]))
             item4 = QtGui.QStandardItem(str(par.limits[1]))
-            item5 = QtGui.QStandardItem(str(par.units))
-            item5.setEditable(False)
-
-            # Check if fixed-choice (returns combobox, if so, also makes some items uneditable)
+            item5 = QtGui.QStandardItem(par.units)
             row = [item1, item2, item3, item4, item5]
-            cbox = createFixedChoiceComboBox(par, row)
-
-            # Always add to the model
+            rows.append(row)
+
             if row_num is None:
                 model.appendRow(row)
@@ -374 +302 @@
                 model.insertRow(row_num, row)
                 row_num += 1
-
-            # Apply combobox if required
-            if None not in (view, cbox):
-                view.setIndexWidget(item2.index(), cbox)
-
-            rows.append(row)
 
     return rows
@@ -552 +474 @@
 
     theory_name = str(current_data.name.split()[0])
-    res_name = reference_data.filename if reference_data.filename else reference_data.name
-    residuals.name = "Residuals for " + str(theory_name) + "[" + res_name + "]"
+    residuals.name = "Residuals for " + str(theory_name) + "[" + \
+                    str(reference_data.filename) + "]"
     residuals.title = residuals.name
     residuals.ytransform = 'y'
@@ -579 +501 @@
     """
     weight = None
-    if data is None:
-        return []
     if is2d:
-        if not hasattr(data, 'err_data'):
-            return []
         dy_data = data.err_data
         data = data.data
     else:
-        if not hasattr(data, 'dy'):
-            return []
         dy_data = data.dy
         data = data.y