Changeset 9f51c2c in sasview

Timestamp:

Aug 15, 2012 6:52:34 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

f866fb5

Parents:

25e4dda

Message:

broken plot/graph modification panel fixes

Location:

sansguiframe/src/sans/guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (3 diffs)
• appearanceDialog.py (modified) (10 diffs)
• graphAppearance.py (modified) (4 diffs)

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)
-        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 = appearanceDialog(self, 'Modify Plot Property')
+        icon = self.parent.GetIcon()
+        self.appD.SetIcon(icon)
+        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.Destroy()
@@ -664 +661 @@
 
     def modifyGraphAppearance(self,e):
-        self.graphApp = graphAppearance(self,'Modify graph appearance')
-
+        self.graphApp = graphAppearance(self,'Modify Graph Appearance')
+        icon = self.parent.GetIcon()
+        self.graphApp.SetIcon(icon)
         
 
@@ -674 +672 @@
                                   find_key(self.get_loc_label(),self.legendLoc),
                                   self.xcolor,self.ycolor)
-        if self.graphApp.ShowModal() == wx.ID_OK:
-            self.on_graphApp_close()
+        self.graphApp.Bind(wx.EVT_CLOSE, self.on_graphApp_close)
     
 
-    def on_graphApp_close(self):
+    def on_graphApp_close(self, event):
         """
         Gets values from graph appearance dialog and sends them off

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

@@ -7 +7 @@
 
 /**
-        This software was developed by Institut Laue-Langevin as part of
-        Distributed Data Analysis of Neutron Scattering Experiments (DANSE).
-
-        Copyright 2012 Institut Laue-Langevin
+    This software was developed by Institut Laue-Langevin as part of
+    Distributed Data Analysis of Neutron Scattering Experiments (DANSE).
+
+    Copyright 2012 Institut Laue-Langevin
 
 **/
@@ -24 +24 @@
 
 
-class appearanceDialog(wx.Dialog):
+class appearanceDialog(wx.Frame):
 
     def __init__(self,parent,title):
-        super(appearanceDialog,self).__init__(parent, title=title,
-                                              size=(570, 430))
-
-        self.symbolLabels = self.get_symbol_label()
-        self.colorLabels = self.get_color_label()
+        super(appearanceDialog,self).__init__(parent, title=title,size=(570,450), style=wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT)
+
+        self.okay_clicked = False
+        self.parent = parent
+        self.symbolLabels = self.parent.get_symbol_label()
+        self.colorLabels = self.parent.get_color_label()
 
 
@@ -64 +65 @@
         symbolText = wx.StaticText(panel, label='Shape')
         colorText = wx.StaticText(panel, label='Color')
-        sizeText = wx.StaticText(panel, label='Size')
+        sizeText = wx.StaticText(panel, label='Size ')
         labelText = wx.StaticText(panel, label='Legend label')
 
@@ -77 +78 @@
 
         # buttons
-        OkButton = wx.Button(panel, wx.ID_OK, label='OK')
+        OkButton = wx.Button(panel, label='OK')
+        OkButton.Bind(wx.EVT_BUTTON,self.onOK)
         cancelButton = wx.Button(panel, label='Cancel')
         cancelButton.Bind(wx.EVT_BUTTON, self.CloseDlg)
@@ -86 +88 @@
 
         ihbox1.Add(sizeText, flag = wx.ALL| wx.ALIGN_LEFT , border=10)
-        ihbox1.Add(self.sizeComboBox, 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)
 
@@ -94 +96 @@
 
 
-        ivbox2.Add(ihbox1, flag =  wx.ALL | wx.ALIGN_RIGHT,border=10)
-        ivbox2.Add(ihbox2, flag =  wx.ALL | wx.ALIGN_RIGHT,border=10)
+        ivbox2.Add(ihbox1, flag =wx.ALIGN_LEFT,border=10)
+        ivbox2.Add(ihbox2, flag =wx.ALIGN_LEFT,border=10)
 
         
-        hbox1.Add(ivbox1,flag =  wx.EXPAND | wx.ALIGN_LEFT ,border=10)
-        hbox1.Add(ivbox2,flag =  wx.EXPAND | wx.ALIGN_RIGHT ,border=10)
+        hbox1.Add(ivbox1,flag =wx.ALIGN_LEFT ,border=10)
+        hbox1.Add(ivbox2,flag =wx.ALIGN_LEFT ,border=10)
 
    
@@ -105 +107 @@
         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, wx.EXPAND | wx.ALL |wx.ALIGN_LEFT , border=10)
+        hbox3.Add(labelText, flag= wx.EXPAND | wx.RIGHT |  wx.ALIGN_LEFT, border=10)
+        hbox3.Add(self.labelTextBox, wx.EXPAND | wx.RIGHT |wx.ALIGN_LEFT , border=10)
   
         symbolStaticBoxSizer.Add(hbox1,flag = wx.ALL | wx.EXPAND,border=10)
@@ -154 +156 @@
             self.sizeComboBox.SetSelection(4)
         self.symbolListBox.SetSelection(self.sorted_sym_dic[symbol])
-        colorname = appearanceDialog.find_key(self.get_color_label(),color)
+        colorname = appearanceDialog.find_key(self.parent.get_color_label(),color)
         self.colorListBox.SetStringSelection(colorname)
 
@@ -170 +172 @@
         
         for color in sortedcolorLabels:
-            self.colorListBox.Append(str(color[0]))
+             self.colorListBox.Append(str(color[0]))
  
     def populateSize(self):
@@ -258 +260 @@
         return(size,color,symbol,name)
 
+    def onOK(self,e):
+        self.okay_clicked = True
+
+        self.Close()

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

@@ -7 +7 @@
 
 /**
-        This software was developed by Institut Laue-Langevin as part of
-        Distributed Data Analysis of Neutron Scattering Experiments (DANSE).
-
-        Copyright 2012 Institut Laue-Langevin
+    This software was developed by Institut Laue-Langevin as part of
+    Distributed Data Analysis of Neutron Scattering Experiments (DANSE).
+
+    Copyright 2012 Institut Laue-Langevin
 
 **/
@@ -23 +23 @@
 
 
-class graphAppearance(wx.Dialog):
+class graphAppearance(wx.Frame):
 
     def __init__(self, parent, title, legend=True):
@@ -105 +105 @@
 
         self.cancel_button = wx.Button(panel, label='Cancel')
-        self.ok_button = wx.Button(panel, wx.ID_OK, label='OK')
+        self.ok_button = wx.Button(panel, label='OK')
 
         self.cancel_button.Bind(wx.EVT_BUTTON, self.onCancel)
+        self.ok_button.Bind(wx.EVT_BUTTON, self.on_ok)
 
 
@@ -180 +181 @@
         if(fonty.ShowModal() == wx.ID_OK):
             self.yfont = fonty.get_font()
+
+    def on_ok(self, e):
+        self.Close()
 
     def onCancel(self, e):