Changes in / [5c0e717:c3e83d3] in sasview


Ignore:
Location:
src/sas/qtgui/Perspectives/Fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

    r6b50296 rf7e7e20  
    373373 
    374374    residuals.x = current_data.x[index][0] 
    375     residuals.dy = numpy.ones(len(residuals.y)) 
     375    residuals.dy = numpy.zeros(len(residuals.y)) 
    376376    residuals.dx = None 
    377377    residuals.dxl = None 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r287d356 r5aad7a5  
    958958        model = self.cbModel.currentText() 
    959959 
    960         # empty combobox forced to be read 
     960        # Assure the control is active 
     961        if not self.cbModel.isEnabled(): 
     962            return 
     963        # Empty combobox forced to be read 
    961964        if not model: 
    962965            return 
     
    11121115            self.disableModelCombo() 
    11131116            self.enableStructureCombo() 
     1117            # set the index to 0 
     1118            self.cbStructureFactor.setCurrentIndex(0) 
     1119            self.model_parameters = None 
    11141120            self._model_model.clear() 
    11151121            return 
     
    22982304        residuals = self.calculateResiduals(fitted_data) 
    22992305        self.model_data = fitted_data 
    2300  
    2301         new_plots = [fitted_data, residuals] 
     2306        new_plots = [fitted_data] 
     2307        if residuals is not None: 
     2308            new_plots.append(residuals) 
    23022309 
    23032310        # Create plots for intermediate product data 
     
    23172324            GuiUtils.deleteRedundantPlots(self.all_data[self.data_index], new_plots) 
    23182325 
     2326        # Update/generate plots 
    23192327        for plot in new_plots: 
    2320             if hasattr(plot, "id") and "esidual" in plot.id: 
    2321                 # TODO: fix updates to residuals plot 
    2322                 pass 
    2323             elif plot is not None: 
    2324                 self.communicate.plotUpdateSignal.emit([plot]) 
     2328            self.communicate.plotUpdateSignal.emit([plot]) 
    23252329 
    23262330    def complete2D(self, return_data): 
Note: See TracChangeset for help on using the changeset viewer.