Changeset 3477478 in sasview for src/sas/plottools/PropertyDialog.py

Timestamp:

Mar 5, 2015 12:38:29 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:

b9dbd6b

Parents:

2df0b74

Message:

pylint fixes

File:

• src/sas/plottools/PropertyDialog.py (modified) (4 diffs)

src/sas/plottools/PropertyDialog.py

@@ -8 +8 @@
     def __init__(self, parent, id=-1, title="Select the scale of the graph"):
         wx.Dialog.__init__(self, parent, id, title)
-        """
-        for the properties window
-        """
         self.parent = parent
         vbox = wx.BoxSizer(wx.VERTICAL)
-        sizer = wx.GridBagSizer(5,5)
+        sizer = wx.GridBagSizer(5, 5)
 
         x_size = 70
@@ -28 +25 @@
         self.xvalue = wx.ComboBox(self, -1)
         x_size += self.xvalue.GetSize()[0]
-        sizer.Add(self.xvalue, (iy, ix), (1, 1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
+        sizer.Add(self.xvalue, (iy, ix), (1, 1), wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+
         ix += 2
         self.yvalue = wx.ComboBox(self, -1)
         x_size += self.yvalue.GetSize()[0]
-        sizer.Add(self.yvalue, (iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
+        sizer.Add(self.yvalue, (iy, ix), (1, 1), wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+
         ix += 2
         self.view = wx.ComboBox(self, -1)
         x_size += self.view.GetSize()[0]
         self.view.SetMinSize((160, 30))
-        sizer.Add(self.view, (iy,ix), (1,1),
-                  wx.EXPAND|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
+        sizer.Add(self.view, (iy, ix), (1, 1),
+                  wx.EXPAND | wx.RIGHT | wx.ADJUST_MINSIZE, 10)
         self.SetMinSize((x_size, 50))
-        vbox.Add(sizer, 0, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-       
-        btCancel = wx.Button(self, wx.ID_CANCEL,'Cancel')
-        btOk = wx.Button(self, wx.ID_OK, "OK")
+        vbox.Add(sizer, 0, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+
+        cancel_button = wx.Button(self, wx.ID_CANCEL, 'Cancel')
+        ok_button = wx.Button(self, wx.ID_OK, "OK")
         sizer_button = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_button.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        sizer_button.Add(btOk, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
-        sizer_button.Add(btCancel, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
+        sizer_button.Add((20, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+        sizer_button.Add(ok_button, 0, wx.LEFT | wx.RIGHT | wx.ADJUST_MINSIZE, 10)
+        sizer_button.Add(cancel_button, 0, wx.LEFT | wx.RIGHT | wx.ADJUST_MINSIZE, 10)
         vbox.Add(sizer_button, 0,
-                 wx.EXPAND|wx.TOP|wx.BOTTOM|wx.ADJUST_MINSIZE, 10)
+                 wx.EXPAND | wx.TOP | wx.BOTTOM | wx.ADJUST_MINSIZE, 10)
         # scale value for x
         self.xvalue.SetValue("ln(x)")
@@ -60 +57 @@
         self.xvalue.Insert("log10(x)", 4)
         self.xvalue.Insert("log10(x^(4))", 5)
-        
+
         # scale value for y
         self.yvalue.SetValue("ln(y)")
@@ -81 +78 @@
         self.view.Insert("XS Guinier ln(y*x) vs x^(2)", 3)
         self.view.Insert("Porod y*x^(4) vs x^(4)", 4)
-        self.view.Insert("Kratky y*x^(2) vs x",5)        
+        self.view.Insert("Kratky y*x^(2) vs x", 5)
         self.SetSizer(vbox)
         self.Fit()
         self.Centre()
-           
+
     def setValues(self, x, y, view):
         """
         """
-        return  self.xvalue.SetValue(x), self.yvalue.SetValue(y),\
+        return  self.xvalue.SetValue(x), self.yvalue.SetValue(y), \
                     self.view.SetValue(view)
-        
+
     def getValues(self):
         """
         """
-        return self.xvalue.GetValue(), self.yvalue.GetValue(),\
+        return self.xvalue.GetValue(), self.yvalue.GetValue(), \
                             self.view.GetValue()