Changeset 855e7ad in sasview


Ignore:
Timestamp:
Sep 13, 2018 9:58:43 AM (5 days ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Pr_fixes, ESS_GUI_poly_plot2
Children:
768387e0, 68dc2873
Parents:
557fc498
Message:

Visibility of P® and I(Q) charts for inversion SASVIEW-995

Location:
src/sas/qtgui
Files:
2 edited

Legend:

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

    r33b3e4d r855e7ad  
    574574        new_plots = [] 
    575575        for item, plot in plots.items(): 
    576             if self.updatePlot(plot) or filename not in plot.name: 
     576            if self.updatePlot(plot): 
     577                # Don't create plots which are already displayed 
    577578                continue 
    578579            # Don't plot intermediate results, e.g. P(Q), S(Q) 
     
    582583                continue 
    583584            # Don't include plots from different fitpages, but always include the original data 
    584             if fitpage_name in plot.name or filename == plot.name: 
     585            if fitpage_name in plot.name or filename in plot.name or filename == plot.filename: 
    585586                # Residuals get their own plot 
    586587                if plot.plot_role == Data1D.ROLE_RESIDUAL: 
  • src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

    r2b8286c r855e7ad  
    1414# pr inversion calculation elements 
    1515from sas.sascalc.pr.invertor import Invertor 
     16from sas.qtgui.Plotting.PlotterData import Data1D 
    1617# Batch calculation display 
    1718from sas.qtgui.Utilities.GridPanel import BatchInversionOutputPanel 
     
    544545        if self.prPlot is not None: 
    545546            title = self.prPlot.name 
     547            self.prPlot.plot_role = Data1D.ROLE_RESIDUAL 
    546548            GuiUtils.updateModelItemWithPlot(self._data, self.prPlot, title) 
    547             self.communicate.plotRequestedSignal.emit([self.prPlot], None) 
    548549        if self.dataPlot is not None: 
    549550            title = self.dataPlot.name 
     551            self.dataPlot.plot_role = Data1D.ROLE_DEFAULT 
    550552            GuiUtils.updateModelItemWithPlot(self._data, self.dataPlot, title) 
    551             self.communicate.plotRequestedSignal.emit([self.dataPlot], None) 
     553        if self.dataPlot is not None or self.prPlot is not None: 
     554            self.communicate.plotRequestedSignal.emit([self.logic.data], None) 
    552555        self.enableButtons() 
    553556 
Note: See TracChangeset for help on using the changeset viewer.