Changeset 824e488 in sasview for src/sas/guiframe/local_perspectives/plotting/appearanceDialog.py

Timestamp:

Mar 5, 2015 2:18:47 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:

b5de88e

Parents:

b9dbd6b

Message:

pylint fixes and remove old code

File:

• src/sas/guiframe/local_perspectives/plotting/appearanceDialog.py (modified) (11 diffs)

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

@@ -19 +19 @@
         Initialization of the Panel
         """
-        super(appearanceDialog, self).__init__(parent, title=title, 
-                        size=(570,450), 
-                        style=wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT)
+        super(appearanceDialog,
+              self).__init__(parent, title=title, size=(570, 450),
+                             style=wx.DEFAULT_FRAME_STYLE | wx.FRAME_FLOAT_ON_PARENT)
 
         self.okay_clicked = False
@@ -45 +45 @@
         ivbox1 = wx.BoxSizer(wx.VERTICAL)
         ivbox2 = wx.BoxSizer(wx.VERTICAL)
- 
+
         ihbox1 = wx.BoxSizer(wx.HORIZONTAL)
         ihbox2 = wx.BoxSizer(wx.HORIZONTAL)
@@ -61 +61 @@
         # selection widgets
         self.symbollistbox = wx.ListBox(panel, -1, size=(200, 200))
-        self.colorlistbox = wx.ComboBox(panel, style=wx.CB_READONLY, 
+        self.colorlistbox = wx.ComboBox(panel, style=wx.CB_READONLY,
                                         size=(185, -1))
-        self.sizecombobox = wx.ComboBox(panel, style=wx.CB_READONLY, 
+        self.sizecombobox = wx.ComboBox(panel, style=wx.CB_READONLY,
                                         size=(90, -1))
         self.sizecombobox.Bind(wx.EVT_COMBOBOX, self.combo_click)
         self.sizecustombutton = wx.Button(panel, label='Custom...')
         self.sizecustombutton.Bind(wx.EVT_BUTTON, self.custom_size)
-        self.labeltextbox = wx.TextCtrl(panel, -1, "",  size=(440, -1))
+        self.labeltextbox = wx.TextCtrl(panel, -1, "", size=(440, -1))
 
         # buttons
@@ -77 +77 @@
 
         # now Add all the widgets to relevant spacer - tricky
-        ivbox1.Add(symboltext, flag=wx.ALL|wx.ALIGN_LEFT, border=10)
-        ivbox1.Add(self.symbollistbox, flag=wx.ALL|wx.ALIGN_LEFT, border=10)
-
-        ihbox1.Add(sizetext, flag=wx.ALL|wx.ALIGN_LEFT, border=10)
-        ihbox1.Add(self.sizecombobox, 
-                   flag= wx.ALL|wx.RIGHT|wx.ALIGN_LEFT, border=10)
-        ihbox1.Add(self.sizecustombutton, 
-                   flag=wx.ALIGN_LEFT|wx.ALL, border=10)
-
-        ihbox2.Add(colortext, flag=wx.ALL|wx.ALIGN_LEFT, border=10)
-        ihbox2.Add(self.colorlistbox, flag=wx.ALL|wx.ALIGN_LEFT, border=10)
+        ivbox1.Add(symboltext, flag=wx.ALL | wx.ALIGN_LEFT, border=10)
+        ivbox1.Add(self.symbollistbox, flag=wx.ALL | wx.ALIGN_LEFT, border=10)
+
+        ihbox1.Add(sizetext, flag=wx.ALL | wx.ALIGN_LEFT, border=10)
+        ihbox1.Add(self.sizecombobox,
+                   flag=wx.ALL | wx.RIGHT | wx.ALIGN_LEFT, border=10)
+        ihbox1.Add(self.sizecustombutton,
+                   flag=wx.ALIGN_LEFT | wx.ALL, border=10)
+
+        ihbox2.Add(colortext, flag=wx.ALL | wx.ALIGN_LEFT, border=10)
+        ihbox2.Add(self.colorlistbox, flag=wx.ALL | wx.ALIGN_LEFT, border=10)
 
         ivbox2.Add(ihbox1, flag=wx.ALIGN_LEFT, border=10)
@@ -95 +95 @@
         hbox1.Add(ivbox2, flag=wx.ALIGN_LEFT, border=10)
 
-        hbox2.Add(okbutton, flag=wx.ALL| wx.ALIGN_RIGHT, border=10)
-        hbox2.Add(cancelbutton, flag=wx.ALL|wx.ALIGN_RIGHT, border=10)
-
-        hbox3.Add(labeltext, flag=wx.EXPAND|wx.ALL|wx.ALIGN_LEFT, border=10)
-        hbox3.Add(self.labeltextbox, flag=wx.EXPAND|wx.ALL|wx.ALIGN_LEFT, border=10)
-  
-        symbolstaticboxsizer.Add(hbox1, flag=wx.ALL|wx.EXPAND, border=10)
-        vbox.Add(symbolstaticboxsizer, flag=wx.ALL|wx.EXPAND, border=10)
-        vbox.Add(hbox3, flag=wx.EXPAND|wx.RIGHT, border=10)
-        vbox.Add(wx.StaticLine(panel), 0, wx.ALL|wx.EXPAND, 5)
-        vbox.Add(hbox2, flag=wx.RIGHT|wx.ALIGN_RIGHT, border=10)
+        hbox2.Add(okbutton, flag=wx.ALL | wx.ALIGN_RIGHT, border=10)
+        hbox2.Add(cancelbutton, flag=wx.ALL | wx.ALIGN_RIGHT, border=10)
+
+        hbox3.Add(labeltext, flag=wx.EXPAND | wx.ALL | wx.ALIGN_LEFT, border=10)
+        hbox3.Add(self.labeltextbox, flag=wx.EXPAND | wx.ALL | wx.ALIGN_LEFT, border=10)
+
+        symbolstaticboxsizer.Add(hbox1, flag=wx.ALL | wx.EXPAND, border=10)
+        vbox.Add(symbolstaticboxsizer, flag=wx.ALL | wx.EXPAND, border=10)
+        vbox.Add(hbox3, flag=wx.EXPAND | wx.RIGHT, border=10)
+        vbox.Add(wx.StaticLine(panel), 0, wx.ALL | wx.EXPAND, 5)
+        vbox.Add(hbox2, flag=wx.RIGHT | wx.ALIGN_RIGHT, border=10)
 
         panel.SetSizer(vbox)
@@ -119 +119 @@
         On custom size
         """
-        dlg = wx.TextEntryDialog(self, 
-                                 'Enter custom size', 
-                                 'Custom size', 
-                                 str(self.final_size))
-        if(dlg.ShowModal() == wx.ID_OK):
-            if(float(dlg.GetValue()) < 0):
+        dlg = wx.TextEntryDialog(self, 'Enter custom size', 'Custom size', str(self.final_size))
+        if dlg.ShowModal() == wx.ID_OK:
+            if float(dlg.GetValue()) < 0:
                 msg = "Unfortunately imaginary icons are not yet supported."
                 msg += "Please enter a positive value"
-                dial = wx.MessageDialog(None, msg, 'Error',
-                                         wx.OK|wx.ICON_ERROR)
+                dial = wx.MessageDialog(None, msg, 'Error', wx.OK | wx.ICON_ERROR)
                 dial.ShowModal()
                 dlg.Destroy()
@@ -145 +141 @@
         # set up gui values
         self.labeltextbox.SetValue(label)
-        if(size % 1 == 0 and size > 1 and size < 11):
+        if size % 1 == 0 and size > 1 and size < 11:
             self.sizecombobox.SetSelection(int(size) - 1)
         else:
             self.sizecombobox.SetSelection(4)
         self.symbollistbox.SetSelection(self.sorted_sym_dic[symbol])
-        colorname = appearanceDialog.find_key(self.parent.get_color_label(), 
-                                              color)
+        colorname = appearanceDialog.find_key(self.parent.get_color_label(), color)
         self.colorlistbox.SetStringSelection(colorname)
 
@@ -158 +153 @@
         Populate Symbols
         """
-        self.sorted_symbo_labels = sorted(self.symbo_labels.iteritems(), 
+        self.sorted_symbo_labels = sorted(self.symbo_labels.iteritems(),
                                           key=operator.itemgetter(1))
         self.sorted_sym_dic = {}
@@ -171 +166 @@
         Populate Colors
         """
-        sortedcolor_labels = sorted(self.color_labels.iteritems(), 
-                                   key=operator.itemgetter(1))
+        sortedcolor_labels = sorted(self.color_labels.iteritems(),
+                                    key=operator.itemgetter(1))
         for color in sortedcolor_labels:
             self.colorlistbox.Append(str(color[0]))
- 
+
     def populate_size(self):
         """
@@ -203 +198 @@
         """
         return [k for k, v in dic.iteritems() if v == val][0]
-        
-    def get_current_values(self): 
+
+    def get_current_values(self):
         """
         Get Current Values
@@ -212 +207 @@
         name = str(self.labeltextbox.GetValue())
         seltuple = self.symbollistbox.GetSelections()
-        symbol = appearanceDialog.find_key(self.sorted_sym_dic, 
+        symbol = appearanceDialog.find_key(self.sorted_sym_dic,
                                            int(seltuple[0]))
-        color = str(self.colorlistbox.GetValue()) 
+        color = str(self.colorlistbox.GetValue())
         return(size, color, symbol, name)