enh: remember plot size when manually resizing

Author: paulmueller

CHANGELOG

@@ -2,6 +2,7 @@
  - reg: filters not applied in final plots since 2.25.1
  - fix: prevent `pipeline.lock` deadlocks via Qt signal cluttering
  - fix: update axes ranges when "Auto XY-range" is selected in plotting
+ - enh: remember plot size when manually resizing
  - enh: increase default disk store size from 2GB to 9GB
  - enh: reduce delay after selecting axes in the Plot view
  - ref: incorporate `PipelinePlot` into sender-receiver signal pyramid

dcscope/gui/analysis/ana_plot.py

@@ -508,16 +508,37 @@ def on_plot_removed(self):
     @QtCore.pyqtSlot(dict)
     def on_pp_mod_recv(self, data):
         """We received a signal that something changed"""
-        pp_dict = data.get("pipeline")
-        if pp_dict:
-            if self.isVisible():
+        if self.isVisible():
+            pp_dict = data.get("pipeline", {})
+            if "plot_added" in pp_dict:
                 plot_id = pp_dict.get("plot_added")
                 if plot_id is not None:
                     plot_index = self.pipeline.plot_ids.index(plot_id)
                 else:
                     plot_index = None
                 self.update_content(plot_index)
 
+            pr_dict = data.get("pipeline-rendering", {})
+            if "plot_size_changed" in pr_dict:
+                plot_id = pr_dict.get("plot_size_changed")
+                plot_index = self.pipeline.plot_ids.index(plot_id)
+                state = self.pipeline.plots[plot_index].__getstate__()
+                self.spinBox_size_x.setValue(state["layout"]["size x"])
+                self.spinBox_size_y.setValue(state["layout"]["size y"])
+            elif "plot_range_corrected" in pr_dict:
+                plot_id = pr_dict.get("plot_range_corrected")
+                plot_index = self.pipeline.plot_ids.index(plot_id)
+                state = self.pipeline.plots[plot_index].__getstate__()
+                for nm, rc in [("range x", self.widget_range_x),
+                               ("range y", self.widget_range_y)]:
+                    rc.blockSignals(True)
+                    rc.write_pipeline_state({
+                        "active": True,
+                        "start": state["general"][nm][0],
+                        "end": state["general"][nm][1],
+                        })
+                    rc.blockSignals(False)
+
     @QtCore.pyqtSlot()
     @show_wait_cursor
     def on_spacing_auto(self):

dcscope/gui/pipeline_plot.py

@@ -84,8 +84,6 @@ def on_pp_mod_recv(self, data):
                     "plot_created", self.identifier) != self.identifier
                 # A plot was removed.
                 or pip_data.get("plot_removed")
-                # We are emitting this signal ourself
-                or pip_data.get("plot_range_corrected")
             ):
                 pass
             else:
@@ -94,8 +92,22 @@ def on_pp_mod_recv(self, data):
                 self.update_content()
                 if plot.__getstate__() != plot_state:
                     # Updated the range controls
-                    self.pp_mod_send.emit({"pipeline": {
-                        "plot_range_corrected": self.identifier}})
+                    self.pp_mod_send.emit({"pipeline-rendering": {
+                        "plot_range_corrected": self.identifier,
+                    }})
+
+    @QtCore.pyqtSlot(QtGui.QResizeEvent)
+    def resizeEvent(self, event: QtGui.QResizeEvent):
+        if self.identifier:
+            # Update the plot parameters
+            plot_index = self.pipeline.plot_ids.index(self.identifier)
+            with self.pipeline.lock:
+                state = self.pipeline.plots[plot_index].__getstate__()
+                state["layout"]["size x"] = event.size().width()
+                state["layout"]["size y"] = event.size().height()
+                self.pipeline.plots[plot_index].__setstate__(state)
+            self.pp_mod_send.emit(
+                {"pipeline-rendering": {"plot_size_changed": self.identifier}})
 
     @QtCore.pyqtSlot()
     def update_content(self):