Changeset 358b39d in sasview for src

Timestamp:

May 30, 2017 10:14:11 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

aca8418

Parents:

c1e380e

Message:

Minor improvements to the polydisp. function layout

File:

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

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

@@ -16 +16 @@
 from sasmodels import modelinfo
 from sasmodels.sasview_model import load_standard_models
+from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
+
 from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
 
@@ -40 +42 @@
 CATEGORY_STRUCTURE = "Structure Factor"
 STRUCTURE_DEFAULT = "None"
+
+DEFAULT_POLYDISP_FUNCTION = 'gaussian'
 
 # Mapping between column index and relevant parameter name extension
@@ -479 +483 @@
         parameter_name = str(name_index.data().toString()).lower() # "distribution of sld" etc.
         if "distribution of" in parameter_name:
-            parameter_name = parameter_name[16:]
+            # just the last word
+            parameter_name = parameter_name.rsplit()[-1]
 
         # Extract changed value. Assumes proper validation by QValidator/Delegate
@@ -998 +1003 @@
         poly_params = self.checkedListFromModel(self._poly_model)
         # Retrieve poly params names
-        poly_params = [param[16:]+'.width' for param in poly_params]
+        poly_params = [param.rsplit()[-1] + '.width' for param in poly_params]
         # TODO : add magnetic params
 
@@ -1207 +1212 @@
             FittingUtilities.addCheckedListToModel(self._poly_model, checked_list)
 
-            #TODO: Need to find cleaner way to input functions
+            # All possible polydisp. functions as strings in combobox
             func = QtGui.QComboBox()
-            func.addItems(['rectangle', 'array', 'lognormal', 'gaussian', 'schulz',])
+            func.addItems([str(name_disp) for name_disp in POLYDISPERSITY_MODELS.iterkeys()])
+            # Default index
+            func.setCurrentIndex(func.findText(DEFAULT_POLYDISP_FUNCTION))
+            # Index in the view
             func_index = self.lstPoly.model().index(row, 6)
+            # Set the combobox in cell
             self.lstPoly.setIndexWidget(func_index, func)