Changeset b51c8fc in sasview for src/sas


Ignore:
Timestamp:
Aug 21, 2018 2:29:58 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:
28d070a, 4e887d8
Parents:
04ac604 (diff), c972e3a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ESS_GUI' of https://github.com/SasView/sasview into ESS_GUI

Location:
src/sas/qtgui
Files:
2 edited

Legend:

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

    r04ac604 rb51c8fc  
    12551255            #if current_tab_name in self.theory_model.item(current_index).text(): 
    12561256            if current_tab_name == self.theory_model.item(current_index).text(): 
    1257                 return 
    12581257                self.theory_model.removeRow(current_index) 
    12591258                break 
  • 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.