Changeset 593b5790 in sasview


Ignore:
Timestamp:
Jul 27, 2018 6:35:23 AM (6 years ago)
Author:
Torin Cooper-Bennun <torin.cooper-bennun@…>
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:
3067196
Parents:
ee7e423 (diff), fce6c55 (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:
3 edited

Legend:

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

    r6ff103a rfce6c55  
    965965            method_name='Plotter2D' 
    966966 
    967         new_plot = globals()[method_name](self, quickplot=True) 
    968         new_plot.data = data 
     967        self.new_plot = globals()[method_name](self, quickplot=True) 
     968        self.new_plot.data = data 
    969969        #new_plot.plot(marker='o') 
    970         new_plot.plot() 
     970        self.new_plot.plot() 
    971971 
    972972        # Update the global plot counter 
    973973        title = "Plot " + data.name 
    974         new_plot.setWindowTitle(title) 
     974        self.new_plot.setWindowTitle(title) 
    975975 
    976976        # Show the plot 
    977         new_plot.show() 
     977        self.new_plot.show() 
    978978 
    979979    def quickData3DPlot(self): 
     
    988988        data = GuiUtils.dataFromItem(model_item) 
    989989 
    990         new_plot = Plotter2D(self, quickplot=True, dimension=3) 
    991         new_plot.data = data 
    992         new_plot.plot() 
     990        self.new_plot = Plotter2D(self, quickplot=True, dimension=3) 
     991        self.new_plot.data = data 
     992        self.new_plot.plot() 
    993993 
    994994        # Update the global plot counter 
    995995        title = "Plot " + data.name 
    996         new_plot.setWindowTitle(title) 
     996        self.new_plot.setWindowTitle(title) 
    997997 
    998998        # Show the plot 
    999         new_plot.show() 
     999        self.new_plot.show() 
    10001000 
    10011001    def showEditDataMask(self, data=None): 
  • src/sas/qtgui/Plotting/Plotter2D.py

    rd9150d8 rfce6c55  
    402402            output = copy.deepcopy(data) 
    403403 
     404        # get the x and y_bin arrays. 
     405        x_bins, y_bins = PlotUtilities.get_bins(self.qx_data, self.qy_data) 
     406        self._data.x_bins = x_bins 
     407        self._data.y_bins = y_bins 
     408 
    404409        zmin_temp = self.zmin 
    405410        # check scale 
  • src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py

    rfde5bcd ree7e423  
    5555            text_html = GuiUtils.convertUnitToHTML(str(options.text)) 
    5656            doc.setHtml(text_html) 
     57            doc.setDocumentMargin(1) 
    5758 
    5859            # delete the original content 
Note: See TracChangeset for help on using the changeset viewer.