Changeset 454670d in sasview for src/sas

Timestamp:

Apr 6, 2017 5:33:44 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:

2155824

Parents:

f182f93

Message:

Allow for multiple datasets to be opened by the fitting perspective

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (1 diff)
• Perspectives/Fitting/FittingPerspective.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (14 diffs)

src/sas/qtgui/DataExplorer.py

@@ -627 +627 @@
         # Notify the progress bar that the updates are over.
         self.communicator.progressBarUpdateSignal.emit(-1)
+        self.communicator.statusBarUpdateSignal.emit(message)
 
         return output, message

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

@@ -117 +117 @@
             raise AttributeError, msg
 
-        self._model_item = data_item[0]
+        for data in data_item:
+            # Find the first unassigned tab.
+            # If none, open a new tab.
+            available_tabs = list(map(lambda tab: tab.acceptsData(), self.tabs))
 
-        # Find the first unassigned tab.
-        # If none, open a new tab.
-        available_tabs = list(map(lambda tab: tab.acceptsData(), self.tabs))
-
-        if numpy.any(available_tabs):
-            self.tabs[available_tabs.index(True)].data = data_item
-        else:
-            self.addFit(data_item)
+            if numpy.any(available_tabs):
+                self.tabs[available_tabs.index(True)].data = data
+            else:
+                self.addFit(data)

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

@@ -4 +4 @@
 import numpy
 from collections import defaultdict
+from itertools import izip
 
 import logging
@@ -133 +134 @@
         self.cbCategory.setCurrentIndex(0)
 
+        # Connect signals to controls
+        self.initializeSignals()
+
+        # Initial control state
+        self.initializeControls()
+
         self._index = None
         if data is not None:
             self.data = data
-
-        # Connect signals to controls
-        self.initializeSignals()
-
-        # Initial control state
-        self.initializeControls()
+        # Update Q Ranges
+        #self.updateQRange()
 
     @property
@@ -150 +153 @@
     def data(self, value):
         """ data setter """
-        assert isinstance(value[0], QtGui.QStandardItem)
+        assert isinstance(value, QtGui.QStandardItem)
         # _index contains the QIndex with data
-        self._index = value[0]
+        self._index = value
 
         # Update logics with data items
-        self.logic.data = GuiUtils.dataFromItem(value[0])
+        self.logic.data = GuiUtils.dataFromItem(value)
 
         self.data_is_loaded = True
@@ -163 +166 @@
         self.updateQRange()
         self.cmdFit.setEnabled(True)
+        print "set to ", self.cmdFit.isEnabled()
 
     def acceptsData(self):
@@ -189 +193 @@
 
     def togglePoly(self, isChecked):
-        """
-        Enable/disable the polydispersity tab
-        """
+        """ Enable/disable the polydispersity tab """
         self.tabFitting.setTabEnabled(TAB_POLY, isChecked)
 
     def toggleMagnetism(self, isChecked):
-        """
-        Enable/disable the magnetism tab
-        """
+        """ Enable/disable the magnetism tab """
         self.tabFitting.setTabEnabled(TAB_MAGNETISM, isChecked)
 
     def toggle2D(self, isChecked):
-        """
-        Enable/disable the controls dependent on 1D/2D data instance
-        """
+        """ Enable/disable the controls dependent on 1D/2D data instance """
         self.chkMagnetism.setEnabled(isChecked)
         self.is2D = isChecked
@@ -223 +221 @@
         self.tabFitting.setTabEnabled(TAB_MAGNETISM, False)
         self.lblChi2Value.setText("---")
-        # Update Q Ranges
-        self.updateQRange()
 
     def initializeSignals(self):
@@ -413 +409 @@
         """
         Receive and display fitting results
-
         "result" is a tuple of actual result list and the fit time in seconds
         """
@@ -426 +421 @@
             not numpy.all(numpy.isfinite(res.pvec)):
             msg = "Fitting did not converge!!!"
+            self.communicate.statusBarUpdateSignal.emit(msg)
             logging.error(msg)
             return
@@ -431 +427 @@
         elapsed = result[1]
         msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)
-
         self.communicate.statusBarUpdateSignal.emit(msg)
 
@@ -438 +433 @@
         param_values = res.pvec
         param_stderr = res.stderr
-        from itertools import izip
-        # TODO: add errors to the dict so they can propagate to the view
         params_and_errors = zip(param_values, param_stderr)
         param_dict = dict(izip(param_list, params_and_errors))
@@ -451 +444 @@
         self.lblChi2Value.setText(chi2_repr)
 
-        pass
+        # Generate charts
 
     def iterateOverModel(self, func):
@@ -475 +468 @@
                 return
             # modify the param value
-            self._model_model.item(row_i, 1).setText(str(param_dict[param_name][0]))
+            param_repr = GuiUtils.formatNumber(param_dict[param_name][0], high=True)
+            self._model_model.item(row_i, 1).setText(param_repr)
             if self.has_error_column:
-                self._model_model.item(row_i, 2).setText(str(param_dict[param_name][1]))
+                error_repr = GuiUtils.formatNumber(param_dict[param_name][1], high=True)
+                self._model_model.item(row_i, 2).setText(error_repr)
 
         def createColumn(row_i):
@@ -500 +495 @@
         self._model_model.insertColumn(2, error_column)
         FittingUtilities.addErrorHeadersToModel(self._model_model)
-
 
     def onPlot(self):
@@ -674 +668 @@
             structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
             FittingUtilities.addSimpleParametersToModel(structure_parameters, self._model_model)
-            # Set the error column width to 0
-            self.lstParams.setColumnWidth(2, 20)
             # Update the counter used for multishell display
             self._last_model_row = self._model_model.rowCount()