Changes in / [c3e83d3:5c0e717] in sasview

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 diff)
• FittingWidget.py (modified) (4 diffs)

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

@@ -373 +373 @@
 
     residuals.x = current_data.x[index][0]
-    residuals.dy = numpy.zeros(len(residuals.y))
+    residuals.dy = numpy.ones(len(residuals.y))
     residuals.dx = None
     residuals.dxl = None

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

@@ -958 +958 @@
         model = self.cbModel.currentText()
 
-        # Assure the control is active
-        if not self.cbModel.isEnabled():
-            return
-        # Empty combobox forced to be read
+        # empty combobox forced to be read
         if not model:
             return
@@ -1115 +1112 @@
             self.disableModelCombo()
             self.enableStructureCombo()
-            # set the index to 0
-            self.cbStructureFactor.setCurrentIndex(0)
-            self.model_parameters = None
             self._model_model.clear()
             return
@@ -2304 +2298 @@
         residuals = self.calculateResiduals(fitted_data)
         self.model_data = fitted_data
-        new_plots = [fitted_data]
-        if residuals is not None:
-            new_plots.append(residuals)
+
+        new_plots = [fitted_data, residuals]
 
         # Create plots for intermediate product data
@@ -2324 +2317 @@
             GuiUtils.deleteRedundantPlots(self.all_data[self.data_index], new_plots)
 
-        # Update/generate plots
         for plot in new_plots:
-            self.communicate.plotUpdateSignal.emit([plot])
+            if hasattr(plot, "id") and "esidual" in plot.id:
+                # TODO: fix updates to residuals plot
+                pass
+            elif plot is not None:
+                self.communicate.plotUpdateSignal.emit([plot])
 
     def complete2D(self, return_data):