Changeset 34f23c8 in sasview for src/sas/sasgui/guiframe/local_perspectives/plotting

Timestamp:

Mar 20, 2019 10: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

Location:

src/sas/sasgui/guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (1 diff)
• Plotter1D.py (modified) (2 diffs)
• Plotter2D.py (modified) (2 diffs)
• SimplePlot.py (modified) (2 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -161 +161 @@
         new_plot.detector = self.base.data2D.detector
         # If the data file does not tell us what the axes are, just assume...
-        new_plot.xaxis("\\rm{\phi}", 'degrees')
-        new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
-        if hasattr(data, "scale") and data.scale == 'linear' and \
-                self.base.data2D.name.count("Residuals") > 0:
+        new_plot.xaxis(r"\rm{\phi}", 'degrees')
+        new_plot.yaxis(r"\rm{Intensity} ", "cm^{-1}")
+        if (hasattr(data, "scale") and data.scale == 'linear'
+                and self.base.data2D.name.count("Residuals") > 0):
             new_plot.ytransform = 'y'
-            new_plot.yaxis("\\rm{Residuals} ", "/")
+            new_plot.yaxis(r"\rm{Residuals} ", "/")
 
         new_plot.group_id = "AnnulusPhi" + self.base.data2D.name

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -205 +205 @@
         self.canvas.set_resizing(self.resizing)
         self.parent.set_schedule(True)
-        pos_x, pos_y = self.GetPositionTuple()
+        pos_x, pos_y = self.GetPosition()
         if pos_x != 0 and pos_y != 0:
-            self.size, _ = self.GetClientSizeTuple()
+            self.size, _ = self.GetClientSize()
         self.SetSizer(self.sizer)
         wx.CallAfter(self.parent.disable_app_menu, self)
@@ -714 +714 @@
             pos = self.ScreenToClient(pos_evt)
         except:
-            pos_x, pos_y = self.toolbar.GetPositionTuple()
+            pos_x, pos_y = self.toolbar.GetPosition()
             pos = (pos_x, pos_y + 5)
         self.PopupMenu(self._slicerpop, pos)

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -179 +179 @@
         # On Windows platform, default window size is incorrect, so set
         # toolbar width to figure width.
-        _, th = self.toolbar.GetSizeTuple()
-        fw, _ = self.canvas.GetSizeTuple()
+        _, th = self.toolbar.GetSize()
+        fw, _ = self.canvas.GetSize()
         self.toolbar.SetSize(wx.Size(fw, th))
         self.sizer.Add(self.toolbar, 0, wx.LEFT | wx.EXPAND)
@@ -400 +400 @@
             pos = self.ScreenToClient(pos_evt)
         except:
-            pos_x, pos_y = self.toolbar.GetPositionTuple()
+            pos_x, pos_y = self.toolbar.GetPosition()
             pos = (pos_x, pos_y + 5)
         self.PopupMenu(slicerpop, pos)

src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py

@@ -84 +84 @@
             pos = self.ScreenToClient(pos_evt)
         except:
-            pos_x, pos_y = self.toolbar.GetPositionTuple()
+            pos_x, pos_y = self.toolbar.GetPosition()
             pos = (pos_x, pos_y + 5)
         self.PopupMenu(slicerpop, pos)
@@ -135 +135 @@
         # set the resizing flag
         self.canvas.set_resizing(self.resizing)
-        pos_x, pos_y = self.GetPositionTuple()
+        pos_x, pos_y = self.GetPosition()
         if pos_x != 0 and pos_y != 0:
-            self.size, _ = self.GetClientSizeTuple()
+            self.size, _ = self.GetClientSize()
         self.SetSizer(self.sizer)