Changeset 34f23c8 in sasview for src/sas/sasgui/plottools/canvas.py

Timestamp:

Mar 20, 2019 8:06:22 AM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1249

Children:

9305b46

Parents:

09d7021

Message:

py3/wx4 compatibility changes for gui. Refs #1249

File:

• src/sas/sasgui/plottools/canvas.py (modified) (2 diffs)

src/sas/sasgui/plottools/canvas.py

@@ -53 +53 @@
         ppw = 1
         pph = 1
-    (pgw, _) = self.GetPageSizePixels()  # page size in pixels
-    (dcw, _) = dc.GetSize()
-    (grw, _) = self.canvas.GetSizeTuple()
+    pgw, _ = self.GetPageSizePixels()  # page size in pixels
+    dcw, _ = dc.GetSize()
+    grw, _ = self.canvas.GetSize()
 
     # save current figure dpi resolution and bg color,
@@ -152 +152 @@
         Render after a delay if no other render requests have been made.
         """
-        self.panel.subplot.grid(self.panel.grid_on)
-        if self.panel.legend is not None and self.panel.legend_pos_loc:
-            self.panel.legend._loc = self.panel.legend_pos_loc
+        if self.panel is not None:
+            # TODO: grid/panel manip doesn't belong here
+            self.panel.subplot.grid(self.panel.grid_on)
+            if self.panel.legend is not None and self.panel.legend_pos_loc:
+                self.panel.legend._loc = self.panel.legend_pos_loc
         self.idletimer.Restart(5, *args, **kwargs)  # Delay by 5 ms