Changeset 42787fb in sasview


Ignore:
Timestamp:
May 7, 2018 9:34:50 AM (16 months ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
fa05c6c1
Parents:
3c6ecd9
Message:

Fixing issues with DataOperationUtility? calculator

Location:
src/sas/qtgui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

    raed0532 r42787fb  
    181181        self.cbOperator.setCurrentIndex(0) 
    182182 
    183         self.output = None 
    184         self.data1 = None 
    185         self.data2 = None 
    186         self.filenames = None 
    187         self.list_data_items = [] 
    188  
    189183        self.data1OK = False 
    190184        self.data2OK = False 
     
    428422            # plot 1D data 
    429423            plotter = PlotterWidget(self, quickplot=True) 
     424            data.scale = 'linear' 
    430425            plotter.data = data 
    431  
     426            plotter.showLegend = False 
    432427            graph.setLayout(layout) 
    433428            layout.addWidget(plotter) 
     
    437432 
    438433            plotter.plot(hide_error=True, marker='.') 
    439             # plotter.legend = None 
    440434 
    441435            plotter.show() 
  • src/sas/qtgui/Plotting/Plotter.py

    rbb57068 r42787fb  
    166166        # Now add the legend with some customizations. 
    167167 
    168         self.legend = ax.legend(loc='upper right', shadow=True) 
    169         if self.legend: 
    170             self.legend.set_picker(True) 
     168        if self.showLegend: 
     169            self.legend = ax.legend(loc='upper right', shadow=True) 
     170            if self.legend: 
     171                self.legend.set_picker(True) 
    171172 
    172173        # Current labels for axes 
  • src/sas/qtgui/Plotting/PlotterBase.py

    reb1a386 r42787fb  
    7676        self.gotLegend = 0 
    7777 
     78        self.show_legend = True 
     79 
    7880        # Annotations 
    7981        self.selectedText = None 
     
    174176        self.ax.set_xscale(scale) 
    175177        self._xscale = scale 
     178 
     179    @property 
     180    def showLegend(self): 
     181        """ Legend visibility getter """ 
     182        return self.show_legend 
     183 
     184    @showLegend.setter 
     185    def showLegend(self, show=True): 
     186        """ Legend visibility setter """ 
     187        self.show_legend = show 
    176188 
    177189    def upatePlotHelper(self): 
Note: See TracChangeset for help on using the changeset viewer.