Changeset 3fdb68a in sasview

Timestamp:

Aug 9, 2012 5:33:31 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

96277b9

Parents:

443b1b8

Message:

Small fixes to appearance dialogs

Files:

• pr_inversion/test/test_output.txt (modified) (1 diff)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/appearanceDialog.py (modified) (4 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/graphAppearance.py (modified) (3 diffs)

pr_inversion/test/test_output.txt

@@ -3 +3 @@
 #alpha=0.0007
 #chi2=836.797
-#elapsed=0.0010469
+#elapsed=0.000852108
 #qmin=None
 #qmax=None

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -634 +634 @@
             curr_symbol = 13
 
-        self.appD = appearanceDialog(self,'Modify plot properties')
-        self.appD.setDefaults(float(curr_size),int(curr_color),str(appearanceDialog.find_key(self.get_symbol_label(),int(curr_symbol))),curr_label)
-        self.appD.Bind(wx.EVT_CLOSE, self.on_AppDialog_close)    
-
-    def on_AppDialog_close(self,e):
-        if(self.appD.okay_clicked == True):
-            info = self.appD.getCurrentValues() # returns (size,color,symbol,datalabel)
-            self.appearance_selected_plot.custom_color = self._color_labels[info[1].encode('ascii','ignore')]
-
-            self.appearance_selected_plot.markersize = float(info[0])
-            self.appearance_selected_plot.symbol = self.get_symbol_label()[info[2]] # self._symbol_labels[info[2].encode('ascii','ignore')]
-            self.appearance_selected_plot.label = str(info[3])
-
-            pos = self.parent._window_menu.FindItem(self.window_caption)
-            helpString = 'Show/Hide Graph: '
-            for plot in  self.plots.itervalues():
-                helpString += (' ' + str(plot.label) +';')
-                self.parent._window_menu.SetHelpString(pos, helpString)
-                self._is_changed_legend_label = True
+        self.appD = appearanceDialog(self, 'Modify plot properties')
+        self.appD.setDefaults(float(curr_size),
+                              int(curr_color),
+                              str(appearanceDialog.find_key\
+                                      (self.get_symbol_label(),
+                                       int(curr_symbol))),curr_label)
+        if self.appD.ShowModal() == wx.ID_OK:
+            self.on_AppDialog_close()
+
+    def on_AppDialog_close(self):
+
+        info = self.appD.getCurrentValues() # returns (size,color,symbol,datalabel)
+        self.appearance_selected_plot.custom_color = self._color_labels[info[1].encode('ascii','ignore')]
+        
+        self.appearance_selected_plot.markersize = float(info[0])
+        self.appearance_selected_plot.symbol = self.get_symbol_label()[info[2]] # self._symbol_labels[info[2].encode('ascii','ignore')]
+        self.appearance_selected_plot.label = str(info[3])
+        
+        pos = self.parent._window_menu.FindItem(self.window_caption)
+        helpString = 'Show/Hide Graph: '
+        for plot in  self.plots.itervalues():
+            helpString += (' ' + str(plot.label) + ';')
+            self.parent._window_menu.SetHelpString(pos, helpString)
+            self._is_changed_legend_label = True
                 
         self.appD.Destroy()
@@ -669 +674 @@
                                   find_key(self.get_loc_label(),self.legendLoc),
                                   self.xcolor,self.ycolor)
-        self.graphApp.Bind(wx.EVT_CLOSE, self.on_graphApp_close)
+        if self.graphApp.ShowModal() == wx.ID_OK:
+            self.on_graphApp_close()
     
 
-    def on_graphApp_close(self, event):
+    def on_graphApp_close(self):
         """
         Gets values from graph appearance dialog and sends them off

sansguiframe/src/sans/guiframe/local_perspectives/plotting/appearanceDialog.py

@@ -24 +24 @@
 
 
-class appearanceDialog(wx.Frame):
+class appearanceDialog(wx.Dialog):
 
     def __init__(self,parent,title):
-        super(appearanceDialog,self).__init__(parent, title=title,size=(570,430))
-
-        self.okay_clicked = False
+        super(appearanceDialog,self).__init__(parent, title=title,
+                                              size=(570, 430))
 
         self.symbolLabels = self.get_symbol_label()
@@ -78 +77 @@
 
         # buttons
-        OkButton = wx.Button(panel, label='OK')
-        OkButton.Bind(wx.EVT_BUTTON,self.onOK)
+        OkButton = wx.Button(panel, wx.ID_OK, label='OK')
         cancelButton = wx.Button(panel, label='Cancel')
         cancelButton.Bind(wx.EVT_BUTTON, self.CloseDlg)
@@ -172 +170 @@
         
         for color in sortedcolorLabels:
-             self.colorListBox.Append(str(color[0]))
+            self.colorListBox.Append(str(color[0]))
  
     def populateSize(self):
@@ -260 +258 @@
         return(size,color,symbol,name)
 
-    def onOK(self,e):
-        self.okay_clicked = True
-
-        self.Close()

sansguiframe/src/sans/guiframe/local_perspectives/plotting/graphAppearance.py

@@ -23 +23 @@
 
 
-class graphAppearance(wx.Frame):
+class graphAppearance(wx.Dialog):
 
     def __init__(self, parent, title, legend=True):
@@ -105 +105 @@
 
         self.cancel_button = wx.Button(panel, label='Cancel')
-        self.ok_button = wx.Button(panel, label='OK')
+        self.ok_button = wx.Button(panel, wx.ID_OK, label='OK')
 
         self.cancel_button.Bind(wx.EVT_BUTTON, self.onCancel)
-        self.ok_button.Bind(wx.EVT_BUTTON, self.on_ok)
 
 
@@ -181 +180 @@
         if(fonty.ShowModal() == wx.ID_OK):
             self.yfont = fonty.get_font()
-
-    def on_ok(self, e):
-        self.Close()
 
     def onCancel(self, e):