Changeset d9e7792 in sasview

Timestamp:

Nov 30, 2018 2:57:46 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

99f8760, 11a336f, 9d23e4c

Parents:

5d75a181

Message:

Show Plot now restores minimized plots. SASVIEW-1221 == trac#13
Added "Minimize all plots" to Window menu
Changed draw → draw_idle to avoid weird numpy linalg errors

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (2 diffs)
• MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)
• Plotting/Plotter.py (modified) (4 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -1102 +1102 @@
             if data.plot_role != Data1D.ROLE_DATA:
                 self.active_plots[data_id].replacePlot(data_id, data)
+                # restore minimized window, if applicable
+                self.active_plots[data_id].showNormal()
             return True
         elif data_id in ids_vals:
             if data.plot_role != Data1D.ROLE_DATA:
                 list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data)
+                self.active_plots[data_id].showNormal()
             return True
         return False
@@ -1649 +1652 @@
                 logging.error("Closing of %s failed:\n %s" % (plot_id, str(ex)))
 
+    def minimizeAllPlots(self):
+        """
+        Minimize all currently displayed plots
+        """
+        for plot_id in PlotHelper.currentPlots():
+            plotter = PlotHelper.plotById(plot_id)
+            plotter.showMinimized()
+
     def closePlotsForItem(self, item):
         """

src/sas/qtgui/MainWindow/GuiManager.py

@@ -521 +521 @@
         self._workspace.actionNext.triggered.connect(self.actionNext)
         self._workspace.actionPrevious.triggered.connect(self.actionPrevious)
+        self._workspace.actionMinimizePlots.triggered.connect(self.actionMinimizePlots)
         self._workspace.actionClosePlots.triggered.connect(self.actionClosePlots)
         # Analysis
@@ -994 +995 @@
         pass
 
+    def actionMinimizePlots(self):
+        """
+        Minimizes all Plotters and Plotter2Ds.
+        """
+        self.filesWidget.minimizeAllPlots()
+        pass
+
     #============ HELP =================
     def actionDocumentation(self):

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -128 +128 @@
     <addaction name="actionPrevious"/>
     <addaction name="separator"/>
+    <addaction name="actionMinimizePlots"/>
     <addaction name="actionClosePlots"/>
    </widget>
@@ -577 +578 @@
    </property>
   </action>
+  <action name="actionMinimizePlots">
+   <property name="text">
+    <string>Minimize All Plots</string>
+   </property>
+  </action>
  </widget>
  <resources/>

src/sas/qtgui/Plotting/Plotter.py

@@ -205 +205 @@
 
         # refresh canvas
-        self.canvas.draw()
+        self.canvas.draw_idle()
 
     def createContextMenu(self):
@@ -352 +352 @@
             # Update the list of annotations
             self.textList.append(new_text)
-            self.canvas.draw()
+            self.canvas.draw_idle()
 
     def onRemoveText(self):
@@ -460 +460 @@
         self.ax.set_xlabel(xl)
         self.ax.set_ylabel(yl)
-        self.canvas.draw()
+        self.canvas.draw_idle()
 
     def onFreeze(self, id):
@@ -694 +694 @@
         self.legend_pos_loc = tuple(loc_in_norm_axes)
         self.legend._loc = self.legend_pos_loc
-        # self.canvas.draw()
         self.canvas.draw_idle()