Changeset 1970780 in sasview

Timestamp:

Apr 9, 2017 5:33:01 AM (8 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:

9208346

Parents:

71361f0

Message:

Add display of orientational parameters + minor refactoring

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (7 diffs)
• GuiManager.py (modified) (1 diff)
• Perspectives/Fitting/FittingUtilities.py (modified) (4 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)

src/sas/qtgui/DataExplorer.py

@@ -24 +24 @@
 from sas.qtgui.DroppableDataLoadWidget import DroppableDataLoadWidget
 from sas.qtgui.MaskEditor import MaskEditor
+
+import Perspectives
 
 class DataExplorerWindow(DroppableDataLoadWidget):
@@ -91 +93 @@
         self.cbgraph.currentIndexChanged.connect(self.enableGraphCombo)
 
-        self._perspective = self.parent.perspective()
-
         # Proxy model for showing a subset of Data1D/Data2D content
         self.data_proxy = QtGui.QSortFilterProxyModel(self)
@@ -151 +151 @@
         Populate the Perspective combobox and define callbacks
         """
+        available_perspectives = sorted([p for p in Perspectives.PERSPECTIVES.keys()])
+        if available_perspectives:
+            self.cbFitting.clear()
+            self.cbFitting.addItems(available_perspectives)
         self.cbFitting.currentIndexChanged.connect(self.updatePerspectiveCombo)
         # Set the index so we see the default (Fitting)
         self.updatePerspectiveCombo(0)
+
+    def _perspective(self):
+        """
+        Returns the current perspective
+        """
+        return self.parent.perspective()
 
     def loadFromURL(self, url):
@@ -313 +323 @@
         Send selected item data to the current perspective and set the relevant notifiers
         """
-        # should this reside on GuiManager or here?
-        self._perspective = self.parent.perspective()
-
         # Set the signal handlers
         self.communicator.updateModelFromPerspectiveSignal.connect(self.updateModelFromPerspective)
@@ -332 +339 @@
 
         # Which perspective has been selected?
-        if len(selected_items) > 1 and not self._perspective.allowBatch():
-            msg = self._perspective.title() + " does not allow multiple data."
+        if len(selected_items) > 1 and not self._perspective().allowBatch():
+            msg = self._perspective().title() + " does not allow multiple data."
             msgbox = QtGui.QMessageBox()
             msgbox.setIcon(QtGui.QMessageBox.Critical)
@@ -342 +349 @@
 
         # Notify the GuiManager about the send request
-        self._perspective.setData(data_item=selected_items)
+        self._perspective().setData(data_item=selected_items)
 
     def freezeTheory(self, event):
@@ -424 +431 @@
         """
         self.communicator.perspectiveChangedSignal.emit(self.cbFitting.currentText())
+        self.chkBatch.setEnabled(self.parent.perspective().allowBatch())
 
     def newPlot(self):

src/sas/qtgui/GuiManager.py

@@ -30 +30 @@
 # Perspectives
 import Perspectives
-from sas.qtgui.Perspectives.Invariant.InvariantPerspective import InvariantWindow
-from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
+#from sas.qtgui.Perspectives.Invariant.InvariantPerspective import InvariantWindow
+#from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
 from sas.qtgui.DataExplorer import DataExplorerWindow
 

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

@@ -36 +36 @@
     return (param_name, param_length)
 
-def addParametersToModel(parameters, model):
+def addParametersToModel(parameters, is2D):
     """
     Update local ModelModel with sasmodel parameters
@@ -42 +42 @@
     multishell_parameters = getIterParams(parameters)
     multishell_param_name, _ = getMultiplicity(parameters)
-
-    for param in parameters.iq_parameters:
+    params = parameters.iqxy_parameters if is2D else parameters.iq_parameters
+    item = []
+    for param in params:
         # don't include shell parameters
         if param.name == multishell_param_name:
@@ -80 +81 @@
         item4 = QtGui.QStandardItem(str(param.limits[1]))
         item5 = QtGui.QStandardItem(param.units)
-        model.appendRow([item1, item2, item3, item4, item5])
-
-def addSimpleParametersToModel(parameters, model):
+        item.append([item1, item2, item3, item4, item5])
+    return item
+
+def addSimpleParametersToModel(parameters, is2D):
     """
     Update local ModelModel with sasmodel parameters
     """
-    for param in parameters.iq_parameters:
+    params = parameters.iqxy_parameters if is2D else parameters.iq_parameters
+    item = []
+    for param in params:
         # Create the top level, checkable item
         item_name = param.name
@@ -99 +103 @@
         item5 = QtGui.QStandardItem(str(param.limits[1]))
         item6 = QtGui.QStandardItem(param.units)
-        model.appendRow([item1, item2, item4, item5, item6])
+        item.append([item1, item2, item4, item5, item6])
+    return item
 
 def addCheckedListToModel(model, param_list):

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

@@ -201 +201 @@
         self.chkMagnetism.setEnabled(isChecked)
         self.is2D = isChecked
+        # Reload the current model
+        self.onSelectModel()
 
     def initializeControls(self):
@@ -671 +673 @@
 
         # Update the QModel
-        FittingUtilities.addParametersToModel(self.model_parameters, self._model_model)
+        new_rows = FittingUtilities.addParametersToModel(self.model_parameters, self.is2D)
+        for row in new_rows:
+            self._model_model.appendRow(row)
         # Update the counter used for multishell display
         self._last_model_row = self._model_model.rowCount()
@@ -681 +685 @@
             structure_module = generate.load_kernel_module(structure_factor)
             structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
-            FittingUtilities.addSimpleParametersToModel(structure_parameters, self._model_model)
+            new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)
+            for row in new_rows:
+                self._model_model.appendRow(row)
             # Update the counter used for multishell display
             self._last_model_row = self._model_model.rowCount()
@@ -724 +730 @@
 
         self.kernel_module.params[parameter_name] = value
-        print "UPDATED %s / %s with %0.3f." %(parameter_name, property_name, value)
 
         # min/max to be changed in self.kernel_module.details[parameter_name] = ['Ang', 0.0, inf]