Changeset b5de88e in sasview for src/sas/guiframe/local_perspectives/plotting/graphAppearance.py

Timestamp:

Mar 5, 2015 2:49:03 PM (10 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7d56795

Parents:

824e488

Message:

pylint fixes

File:

• src/sas/guiframe/local_perspectives/plotting/graphAppearance.py (modified) (14 diffs)

src/sas/guiframe/local_perspectives/plotting/graphAppearance.py

@@ -39 +39 @@
         self.is_ytick = False
 
-
     def InitUI(self):
 
@@ -53 +52 @@
         yhbox2 = wx.BoxSizer(wx.HORIZONTAL)
 
-
-
         if self.legend:
             legendLocText = wx.StaticText(panel, label='Legend location: ')
-            self.legend_loc_combo = wx.ComboBox(panel,style = wx.CB_READONLY, size=(180,-1))
+            self.legend_loc_combo = wx.ComboBox(panel, style=wx.CB_READONLY, size=(180, -1))
             self.fillLegendLocs()
         else:
             self.legend_loc_combo = None
 
-
         if self.legend:
             self.toggle_legend = wx.CheckBox(panel, label='Toggle legend on/off')
@@ -70 +66 @@
         self.toggle_grid = wx.CheckBox(panel, label='Toggle grid on/off')
 
-        
         xstatic_box = wx.StaticBox(panel, -1, 'x-axis label')
         xstatic_box_sizer = wx.StaticBoxSizer(xstatic_box, wx.VERTICAL)
@@ -76 +71 @@
         ystatic_box_sizer = wx.StaticBoxSizer(ystatic_box, wx.VERTICAL)
 
-
         xaxis_label = wx.StaticText(panel, label='X-axis: ')
         yaxis_label = wx.StaticText(panel, label='Y-axis: ')
@@ -82 +76 @@
         unitlabel_2 = wx.StaticText(panel, label='Units: ')
 
-        self.xaxis_text = wx.TextCtrl(panel, -1, "",size=(220, -1))
-        self.yaxis_text = wx.TextCtrl(panel, -1, "",size=(220, -1))
-
-        self.xaxis_unit_text = wx.TextCtrl(panel, -1,"",size=(100, -1))
-        self.yaxis_unit_text = wx.TextCtrl(panel, -1,"",size=(100, -1))
-
-
+        self.xaxis_text = wx.TextCtrl(panel, -1, "", size=(220, -1))
+        self.yaxis_text = wx.TextCtrl(panel, -1, "", size=(220, -1))
+
+        self.xaxis_unit_text = wx.TextCtrl(panel, -1, "", size=(100, -1))
+        self.yaxis_unit_text = wx.TextCtrl(panel, -1, "", size=(100, -1))
 
         xcolorLabel = wx.StaticText(panel, label='Font color: ')
@@ -95 +87 @@
         self.xfont_color.SetSelection(0)
         xfont_button = wx.Button(panel, label='Font')
-        xfont_button.Bind(wx.EVT_BUTTON, self.onxFont)
+        xfont_button.Bind(wx.EVT_BUTTON, self.on_x_font)
 
         ycolorLabel = wx.StaticText(panel, label='Font color: ')
-        self.yfont_color = wx.ComboBox(panel, size=(100, -1),style=wx.CB_READONLY)
+        self.yfont_color = wx.ComboBox(panel, size=(100, -1), style=wx.CB_READONLY)
         self.yfill_colors()
         self.yfont_color.SetSelection(0)
         yfont_button = wx.Button(panel, label='Font')
-        yfont_button.Bind(wx.EVT_BUTTON, self.onyFont)
-
-        
+        yfont_button.Bind(wx.EVT_BUTTON, self.on_y_font)
 
         self.cancel_button = wx.Button(panel, label='Cancel')
         self.ok_button = wx.Button(panel, label='OK')
 
-        self.cancel_button.Bind(wx.EVT_BUTTON, self.onCancel)
+        self.cancel_button.Bind(wx.EVT_BUTTON, self.on_cancel)
         self.ok_button.Bind(wx.EVT_BUTTON, self.on_ok)
 
-
-        xhbox1.Add(xaxis_label, flag= wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=10)
-        xhbox1.Add(self.xaxis_text, flag=wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=10)
-        xhbox1.Add(unitlabel_1, flag=wx.ALL | wx.EXPAND  | wx.ALIGN_RIGHT, border=10)
-        xhbox1.Add(self.xaxis_unit_text, flag=wx.ALL | wx.EXPAND  | wx.ALIGN_RIGHT, border=10)
-
-        yhbox1.Add(yaxis_label, flag= wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=10)
-        yhbox1.Add(self.yaxis_text, flag=wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=10)
-        yhbox1.Add(unitlabel_2, flag=wx.ALL | wx.EXPAND  | wx.ALIGN_RIGHT, border=10)
-        yhbox1.Add(self.yaxis_unit_text, flag=wx.ALL | wx.EXPAND  | wx.ALIGN_RIGHT, border=10)
+        xhbox1.Add(xaxis_label, flag=wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, border=10)
+        xhbox1.Add(self.xaxis_text, flag=wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, border=10)
+        xhbox1.Add(unitlabel_1, flag=wx.ALL | wx.EXPAND | wx.ALIGN_RIGHT, border=10)
+        xhbox1.Add(self.xaxis_unit_text, flag=wx.ALL | wx.EXPAND | wx.ALIGN_RIGHT, border=10)
+
+        yhbox1.Add(yaxis_label, flag=wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, border=10)
+        yhbox1.Add(self.yaxis_text, flag=wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, border=10)
+        yhbox1.Add(unitlabel_2, flag=wx.ALL | wx.EXPAND | wx.ALIGN_RIGHT, border=10)
+        yhbox1.Add(self.yaxis_unit_text, flag=wx.ALL | wx.EXPAND | wx.ALIGN_RIGHT, border=10)
 
         xhbox2.Add(xcolorLabel, flag=wx.ALL | wx.ALIGN_RIGHT, border=10)
@@ -132 +121 @@
 
         if self.legend:
-            hbox1.Add(legendLocText, flag =  wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
-            hbox1.Add(self.legend_loc_combo, flag =  wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
+            hbox1.Add(legendLocText, flag=wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, border=5)
+            hbox1.Add(self.legend_loc_combo, flag=wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, border=5)
 
         if self.legend:
             hbox1.Add((5, -1))
-            hbox1.Add(self.toggle_legend, flag = wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
-
-        hbox2.Add(self.ok_button, flag = wx.ALL | wx.ALIGN_RIGHT, border=5)
-        hbox2.Add(self.cancel_button, flag = wx.ALL | wx.ALIGN_RIGHT, border=5)
+            hbox1.Add(self.toggle_legend, flag=wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, border=5)
+
+        hbox2.Add(self.ok_button, flag=wx.ALL | wx.ALIGN_RIGHT, border=5)
+        hbox2.Add(self.cancel_button, flag=wx.ALL | wx.ALIGN_RIGHT, border=5)
         hbox2.Add((15, -1))
 
-        xstatic_box_sizer.Add(xhbox1, flag= wx.EXPAND , border=5)
+        xstatic_box_sizer.Add(xhbox1, flag=wx.EXPAND, border=5)
         xstatic_box_sizer.Add(xhbox2, flag=wx.ALL | wx.ALIGN_RIGHT, border=5)
-        ystatic_box_sizer.Add(yhbox1, flag= wx.EXPAND, border=5)
+        ystatic_box_sizer.Add(yhbox1, flag=wx.EXPAND, border=5)
         ystatic_box_sizer.Add(yhbox2, flag=wx.ALL | wx.ALIGN_RIGHT, border=5)
 
         vbox.Add((-1, 20))
-        vbox.Add(hbox1, flag = wx.EXPAND | wx.ALL, border=5)
-        vbox.Add(xstatic_box_sizer, flag = wx.ALL | wx.EXPAND, border=10)
-        vbox.Add(ystatic_box_sizer, flag = wx.ALL | wx.EXPAND, border=10)
-
-        vbox.Add(self.toggle_grid, flag = wx.ALIGN_RIGHT | wx.RIGHT, border=20)
-        vbox.Add(hbox2, flag = wx.ALIGN_RIGHT | wx.ALL , border=5)
-
+        vbox.Add(hbox1, flag=wx.EXPAND | wx.ALL, border=5)
+        vbox.Add(xstatic_box_sizer, flag=wx.ALL | wx.EXPAND, border=10)
+        vbox.Add(ystatic_box_sizer, flag=wx.ALL | wx.EXPAND, border=10)
+
+        vbox.Add(self.toggle_grid, flag=wx.ALIGN_RIGHT | wx.RIGHT, border=20)
+        vbox.Add(hbox2, flag=wx.ALIGN_RIGHT | wx.ALL, border=5)
 
         panel.SetSizer(vbox)
@@ -169 +157 @@
             self.yfont_color.Append(c_list[idx], idx)
 
-    def onxFont(self, e):
+    def on_x_font(self, e):
         title = 'Modify x axis font'
 
@@ -175 +163 @@
         fonty.set_default_font(self.xfont)
         fonty.set_ticklabel_check(self.is_xtick)
-        if(fonty.ShowModal() == wx.ID_OK):
+        if fonty.ShowModal() == wx.ID_OK:
             self.xfont = fonty.get_font()
             self.is_xtick = fonty.get_ticklabel_check()
 
-    def onyFont(self, e):
+    def on_y_font(self, e):
         title = 'Modify y axis font'
         fonty = SimpleFont(self, wx.NewId(), title)
         fonty.set_default_font(self.yfont)
         fonty.set_ticklabel_check(self.is_ytick)
-        if(fonty.ShowModal() == wx.ID_OK):
+        if fonty.ShowModal() == wx.ID_OK:
             self.yfont = fonty.get_font()
             self.is_ytick = fonty.get_ticklabel_check()
@@ -191 +179 @@
         self.Close()
 
-    def onCancel(self, e):
+    def on_cancel(self, e):
         self.Destroy()
 
@@ -237 +225 @@
 
 
-    def setDefaults(self,grid,legend,xlab,ylab,xunit,yunit,
-                    xaxis_font,yaxis_font,legend_loc,
-                    xcolor,ycolor, is_xtick, is_ytick):
+    def setDefaults(self, grid, legend, xlab, ylab, xunit, yunit,
+                    xaxis_font, yaxis_font, legend_loc,
+                    xcolor, ycolor, is_xtick, is_ytick):
         self.toggle_grid.SetValue(grid)
         if self.legend:
@@ -261 +249 @@
         else:
             self.yfont_color.SetStringSelection(ycolor)
-            
+
 
         if self.legend:
@@ -310 +298 @@
     def get_yfont(self):
         return self.yfont
-    
+
     def get_xtick_check(self):
         return self.is_xtick
@@ -316 +304 @@
     def get_ytick_check(self):
         return self.is_ytick
-    
+
 
 if __name__ == '__main__':
 
     app = wx.App()
-    graphD = graphAppearance(None,title='Modify graph appearance')
+    graphD = graphAppearance(None, title='Modify graph appearance')
     app.MainLoop()