Changeset aa333e3 in sasview


Ignore:
Timestamp:
Sep 26, 2018 8:59:54 AM (6 years ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
38f4bc6
Parents:
a80e182 (diff), 5eebcd6 (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

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • build_tools/conda_qt5_min_ubuntu.yml

    r1a1111f r009c7a4  
    33 - conda-forge 
    44dependencies: 
    5  - matplotlib 
     5 - matplotlib=2.1.0 
    66 - scipy 
    77 - hdf5 
  • src/sas/qtgui/MainWindow/DataExplorer.py

    r6ae7466 r428c3b2  
    624624        new_plots = [] 
    625625 
     626        # Get the main data plot 
     627        main_data = GuiUtils.dataFromItem(plot_item.parent()) 
     628        if main_data is None: 
     629            # Try the current item 
     630            main_data = GuiUtils.dataFromItem(plot_item) 
     631 
     632        # Make sure main data for 2D is always displayed 
     633        if main_data and not self.isPlotShown(main_data): 
     634            if isinstance(main_data, Data2D): 
     635                self.plotData([(plot_item, main_data)]) 
     636 
    626637        # Check if this is merely a plot update 
    627638        if self.updatePlot(plot_to_show): 
     
    638649            # Plots with main data points on the same chart 
    639650            # Get the main data plot 
    640             main_data = GuiUtils.dataFromItem(plot_item.parent()) 
    641             if main_data is None: 
    642                 # Try the current item 
    643                 main_data = GuiUtils.dataFromItem(plot_item) 
    644             if main_data is not None: 
     651            if main_data and not self.isPlotShown(main_data): 
    645652                new_plots.append((plot_item, main_data)) 
    646653            new_plots.append((plot_item, plot_to_show)) 
     
    648655        if new_plots: 
    649656            self.plotData(new_plots) 
     657 
     658    def isPlotShown(self, plot): 
     659        """ 
     660        Checks currently shown plots and returns true if match 
     661        """ 
     662        if not hasattr(plot, 'name'): 
     663            return False 
     664        ids_vals = [val.data.name for val in self.active_plots.values()] 
     665 
     666        return plot.name in ids_vals 
    650667 
    651668    def addDataPlot2D(self, plot_set, item): 
  • src/sas/qtgui/Plotting/BoxSum.py

    rd6b8a1d r5eebcd6  
    1313 
    1414class BoxSum(QtWidgets.QDialog, Ui_BoxSumUI): 
     15    closeWidgetSignal = QtCore.pyqtSignal() 
    1516    def __init__(self, parent=None, model=None): 
    1617        super(BoxSum, self).__init__() 
     
    4445        self.setFixedSize(self.minimumSizeHint()) 
    4546 
    46         # Handle the Apply button click 
    47         self.buttonBox.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onClose) 
     47        # Handle the Close button click 
     48        self.buttonBox.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(lambda:self.closeWidgetSignal.emit()) 
    4849 
    49     def onClose(self): 
    50         """ 
    51         close the window containing this panel 
    52         """ 
    53         self.close() 
    54  
  • src/sas/qtgui/Plotting/Plotter2D.py

    r34f13a83 r5eebcd6  
    335335        self.slicer.update() 
    336336 
     337        def boxWidgetClosed(): 
     338            # Need to disconnect the signal!! 
     339            self.boxwidget.closeWidgetSignal.disconnect() 
     340            # reset box on "Edit Slicer Parameters" window close 
     341            self.manager.parent.workspace().removeSubWindow(self.boxwidget_subwindow) 
     342            self.boxwidget = None 
     343 
    337344        # Get the BoxSumCalculator model. 
    338345        self.box_sum_model = self.slicer.model() 
     
    340347        self.boxwidget = BoxSum(self, model=self.box_sum_model) 
    341348        # Add the plot to the workspace 
    342         self.manager.parent.workspace().addSubWindow(self.boxwidget) 
     349        self.boxwidget_subwindow = self.manager.parent.workspace().addSubWindow(self.boxwidget) 
     350        self.boxwidget.closeWidgetSignal.connect(boxWidgetClosed) 
     351 
    343352        self.boxwidget.show() 
    344353 
  • src/sas/qtgui/MainWindow/MainWindow.py

    r3d18691 ra80e182  
    66from PyQt5.QtWidgets import QApplication 
    77from PyQt5.QtGui import QPixmap 
    8  
     8import sys 
    99# Local UI 
    1010from sas.qtgui.UI import main_resources_rc 
     
    2020        self.workspace = QMdiArea(self) 
    2121        self.setCentralWidget(self.workspace) 
     22 
     23        # Temporary solution for problem with menubar on Mac 
     24        if sys.platform == "darwin":  # Mac 
     25            self.menubar.setNativeMenuBar(False) 
    2226 
    2327        # Create the gui manager 
Note: See TracChangeset for help on using the changeset viewer.