Changeset aa333e3 in sasview

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:

• build_tools/conda_qt5_min_ubuntu.yml (modified) (1 diff)
• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (3 diffs)
• src/sas/qtgui/Plotting/BoxSum.py (modified) (2 diffs)
• src/sas/qtgui/Plotting/Plotter2D.py (modified) (2 diffs)
• src/sas/qtgui/MainWindow/MainWindow.py (modified) (2 diffs)

build_tools/conda_qt5_min_ubuntu.yml

@@ -3 +3 @@
  - conda-forge
 dependencies:
- - matplotlib
+ - matplotlib=2.1.0
  - scipy
  - hdf5

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -624 +624 @@
         new_plots = []
 
+        # Get the main data plot
+        main_data = GuiUtils.dataFromItem(plot_item.parent())
+        if main_data is None:
+            # Try the current item
+            main_data = GuiUtils.dataFromItem(plot_item)
+
+        # Make sure main data for 2D is always displayed
+        if main_data and not self.isPlotShown(main_data):
+            if isinstance(main_data, Data2D):
+                self.plotData([(plot_item, main_data)])
+
         # Check if this is merely a plot update
         if self.updatePlot(plot_to_show):
@@ -638 +649 @@
             # Plots with main data points on the same chart
             # Get the main data plot
-            main_data = GuiUtils.dataFromItem(plot_item.parent())
-            if main_data is None:
-                # Try the current item
-                main_data = GuiUtils.dataFromItem(plot_item)
-            if main_data is not None:
+            if main_data and not self.isPlotShown(main_data):
                 new_plots.append((plot_item, main_data))
             new_plots.append((plot_item, plot_to_show))
@@ -648 +655 @@
         if new_plots:
             self.plotData(new_plots)
+
+    def isPlotShown(self, plot):
+        """
+        Checks currently shown plots and returns true if match
+        """
+        if not hasattr(plot, 'name'):
+            return False
+        ids_vals = [val.data.name for val in self.active_plots.values()]
+
+        return plot.name in ids_vals
 
     def addDataPlot2D(self, plot_set, item):

src/sas/qtgui/Plotting/BoxSum.py

@@ -13 +13 @@
 
 class BoxSum(QtWidgets.QDialog, Ui_BoxSumUI):
+    closeWidgetSignal = QtCore.pyqtSignal()
     def __init__(self, parent=None, model=None):
         super(BoxSum, self).__init__()
@@ -44 +45 @@
         self.setFixedSize(self.minimumSizeHint())
 
-        # Handle the Apply button click
-        self.buttonBox.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onClose)
+        # Handle the Close button click
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(lambda:self.closeWidgetSignal.emit())
 
-    def onClose(self):
-        """
-        close the window containing this panel
-        """
-        self.close()
-

src/sas/qtgui/Plotting/Plotter2D.py

@@ -335 +335 @@
         self.slicer.update()
 
+        def boxWidgetClosed():
+            # Need to disconnect the signal!!
+            self.boxwidget.closeWidgetSignal.disconnect()
+            # reset box on "Edit Slicer Parameters" window close
+            self.manager.parent.workspace().removeSubWindow(self.boxwidget_subwindow)
+            self.boxwidget = None
+
         # Get the BoxSumCalculator model.
         self.box_sum_model = self.slicer.model()
@@ -340 +347 @@
         self.boxwidget = BoxSum(self, model=self.box_sum_model)
         # Add the plot to the workspace
-        self.manager.parent.workspace().addSubWindow(self.boxwidget)
+        self.boxwidget_subwindow = self.manager.parent.workspace().addSubWindow(self.boxwidget)
+        self.boxwidget.closeWidgetSignal.connect(boxWidgetClosed)
+
         self.boxwidget.show()
 

src/sas/qtgui/MainWindow/MainWindow.py

@@ -6 +6 @@
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtGui import QPixmap
-
+import sys
 # Local UI
 from sas.qtgui.UI import main_resources_rc
@@ -20 +20 @@
         self.workspace = QMdiArea(self)
         self.setCentralWidget(self.workspace)
+
+        # Temporary solution for problem with menubar on Mac
+        if sys.platform == "darwin":  # Mac
+            self.menubar.setNativeMenuBar(False)
 
         # Create the gui manager