Changes in / [60a4e71:8e674ccf] in sasview

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (11 diffs)
• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (1 diff)
• Plotting/PlotterBase.py (modified) (2 diffs)

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

@@ -128 +128 @@
 
             # 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

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

@@ -569 +569 @@
             menu.exec_(self.lstParams.viewport().mapToGlobal(position))
         except AttributeError as ex:
-            logger.error("Error generating context menu: %s" % ex)
+            logging.error("Error generating context menu: %s" % ex)
         return
 
@@ -1227 +1227 @@
         if model_column in [delegate.poly_pd, delegate.poly_error, delegate.poly_min, delegate.poly_max]:
             row = self.getRowFromName(parameter_name)
-            param_item = self._model_model.item(row).child(0).child(0, model_column)
-            if param_item is None:
-                return
+            param_item = self._model_model.item(row)
             self._model_model.blockSignals(True)
-            param_item.setText(item.text())
+            param_item.child(0).child(0, model_column).setText(item.text())
             self._model_model.blockSignals(False)
 
@@ -1466 +1464 @@
             self.communicate.statusBarUpdateSignal.emit(msg)
             msg += results.mesg
-            logger.error(msg)
+            logging.error(msg)
             return
 
@@ -1509 +1507 @@
         if self.calc_fit._interrupting:
             msg = "Fitting cancelled by user after: %s s." % GuiUtils.formatNumber(elapsed)
-            logger.warning("\n"+msg+"\n")
+            logging.warning("\n"+msg+"\n")
         else:
             msg = "Fitting completed successfully in: %s s." % GuiUtils.formatNumber(elapsed)
@@ -2062 +2060 @@
                 kernel_module = generate.load_kernel_module(name)
             except ModuleNotFoundError as ex:
-                logger.error("Can't find the model "+ str(ex))
+                logging.error("Can't find the model "+ str(ex))
                 return
 
@@ -2530 +2528 @@
         """
         # TODO: remimplement thread cancellation
-        logger.error("".join(traceback.format_exception(etype, value, tb)))
+        logging.error("".join(traceback.format_exception(etype, value, tb)))
 
     def setTableProperties(self, table):
@@ -2712 +2710 @@
 
         if not datafile:
-            logger.info("No weight data chosen.")
+            logging.info("No weight data chosen.")
             raise IOError
 
@@ -2811 +2809 @@
 
         func = QtWidgets.QComboBox()
+        # Available range of shells displayed in the combobox
+        func.addItems([str(i) for i in range(param_length+1)])
+
+        # Respond to index change
+        func.currentIndexChanged.connect(self.modifyShellsInList)
 
         # cell 2: combobox
         item2 = QtGui.QStandardItem()
-
-        # cell 3: min value
-        item3 = QtGui.QStandardItem()
-
-        # cell 4: max value
-        item4 = QtGui.QStandardItem()
-
-        self._model_model.appendRow([item1, item2, item3, item4])
+        self._model_model.appendRow([item1, item2])
 
         # Beautify the row:  span columns 2-4
@@ -2830 +2826 @@
         self._n_shells_row = shell_row - 1
 
-        # Get the default number of shells for the model
-        kernel_pars = self.kernel_module._model_info.parameters.kernel_parameters
-        shell_par = None
-        for par in kernel_pars:
-            if par.name == param_name:
-                shell_par = par
-                break
-        if not shell_par:
-            logger.error("Could not find %s in kernel parameters.", param_name)
-        default_shell_count = shell_par.default
-        shell_min = 0
-        shell_max = 0
-        try:
-            shell_min = int(shell_par.limits[0])
-            shell_max = int(shell_par.limits[1])
-        except IndexError as ex:
-            # no info about limits
-            pass
-        item3.setText(str(shell_min))
-        item4.setText(str(shell_max))
-
-        # Respond to index change
-        func.currentTextChanged.connect(self.modifyShellsInList)
-
-        # Available range of shells displayed in the combobox
-        func.addItems([str(i) for i in range(shell_min, shell_max+1)])
-
-        # Add default number of shells to the model
-        func.setCurrentText(str(default_shell_count))
-
-    def modifyShellsInList(self, text):
+        # Set the index to the state-kept value
+        func.setCurrentIndex(self.current_shell_displayed
+                             if self.current_shell_displayed < func.count() else 0)
+
+    def modifyShellsInList(self, index):
         """
         Add/remove additional multishell parameters
@@ -2867 +2837 @@
         first_row = self._n_shells_row + 1
         remove_rows = self._num_shell_params
-        try:
-            index = int(text)
-        except ValueError:
-            # bad text on the control!
-            index = 0
-            logger.error("Multiplicity incorrect! Setting to 0")
 
         if remove_rows > 1:
@@ -2887 +2851 @@
         self.current_shell_displayed = index
 
-        # Param values for existing shells were reset to default; force all changes into kernel module
-        for row in new_rows:
-            par = row[0].text()
-            val = GuiUtils.toDouble(row[1].text())
-            self.kernel_module.setParam(par, val)
-
-        # Change 'n' in the parameter model; also causes recalculation
+        # Change 'n' in the parameter model, thereby updating the underlying model
         self._model_model.item(self._n_shells_row, 1).setText(str(index))
 

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -613 +613 @@
 
         # Check that the number of rows increased
-        # (note that n == 1 by default in core_multi_shell so this increases index by 2)
         more_rows = self.widget._model_model.rowCount() - last_row
-        self.assertEqual(more_rows, 4) # 4 new rows: 2 params per index
-
-        # Set to 0
+        self.assertEqual(more_rows, 6) # 6 new rows: 2 params per index
+
+        # Back to 0
         self.widget.lstParams.indexWidget(func_index).setCurrentIndex(0)
-        self.assertEqual(self.widget._model_model.rowCount(), last_row - 2) # 2 fewer rows than default
+        self.assertEqual(self.widget._model_model.rowCount(), last_row)
 
     def testPlotTheory(self):

src/sas/qtgui/Plotting/PlotterBase.py

@@ -10 +10 @@
 
 import matplotlib.pyplot as plt
-from matplotlib import rcParams
 
 DEFAULT_CMAP = pylab.cm.jet
@@ -30 +29 @@
         self.manager = manager
         self.quickplot = quickplot
-
-        # Set auto layout so x/y axis captions don't get cut off
-        rcParams.update({'figure.autolayout': True})
 
         #plt.style.use('ggplot')