Changeset 04ac604 in sasview


Ignore:
Timestamp:
Aug 21, 2018 4:28:33 AM (6 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
b51c8fc
Parents:
3933ee9
Message:

Don't transform data which has already been transformed.
Improved existing plot check.
SASVIEW-988

Location:
src/sas/qtgui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/DataExplorer.py

    recfe6b6 r04ac604  
    527527        plots = GuiUtils.plotsFromFilename(filename, model) 
    528528        ids = [list(self.active_plots.values())[id].data.id for id in range(len(self.active_plots))] 
     529        ids2 = [list(self.active_plots.keys())[id] for id in range(len(self.active_plots))] 
    529530 
    530531        new_plots = [] 
    531532        for item, plot in plots.items(): 
    532533            plot_id = plot.id 
    533             if plot_id in ids: 
     534            if plot_id in ids or plot_id in ids2: 
    534535                self.active_plots[plot_id].replacePlot(plot_id, plot) 
    535536            else: 
  • src/sas/qtgui/Plotting/Plotter.py

    r685e0e3 r04ac604  
    6464        self.title(title=value.name) 
    6565 
    66     def plot(self, data=None, color=None, marker=None, hide_error=False): 
     66    def plot(self, data=None, color=None, marker=None, hide_error=False, transform=True): 
    6767        """ 
    6868        Add a new plot of self._data to the chart. 
     
    8383 
    8484            # Transform data if required. 
    85             if self.data.xtransform is not None or self.data.ytransform is not None: 
     85            if transform and (self.data.xtransform is not None or self.data.ytransform is not None): 
    8686                _, _, xscale, yscale = GuiUtils.xyTransform(self.data, self.data.xtransform, self.data.ytransform) 
    8787                if xscale != 'log': 
     
    528528            self.xLabel = new_xlabel 
    529529            self.yLabel = new_ylabel 
    530             # Directly overwrite the data to avoid label reassignment 
    531             self._data = current_plot 
    532             self.plot() 
     530 
     531            self.plot(data=current_plot, transform=False) 
    533532 
    534533        pass # debug hook 
Note: See TracChangeset for help on using the changeset viewer.