Changeset 8a687cfd in sasview

Timestamp:

Jul 5, 2012 4:26:59 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:

7c755888

Parents:

8f59e95

Message:

Graph appearance dialog for 2D also

Location:

sansguiframe/src/sans/guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (1 diff)
• Plotter2D.py (modified) (4 diffs)
• graphAppearance.py (modified) (5 diffs)

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

@@ -687 +687 @@
 
     def on_graphApp_close(self,e):
-# returns toggleGrid? toggleLegend? xlab, ylab, xunit, yunit, xfont, yfont, xcolor, ycolor, legendloc
-
-        #to do - make this passback mechanism much nicer
-        data = self.graphApp.getAppInfo()
-        self.onGridOnOff(data[0])
-        self.onLegend(data[1])
-        self.ChangeLegendLoc(data[10])
-
-        self.xaxis_label = data[2]
-        self.yaxis_label = data[3]
-        self.xaxis_unit = data[4]
-        self.yaxis_unit = data[5]
-
-        self.xaxis(data[2],data[4],data[6],data[8])
-        self.yaxis(data[3],data[5],data[7],data[9])
-
-        xfont = data[6]
-        yfont = data[7]
-
-        # and a little sanity checking along the way
+        # gets values from graph appearance dialog and sends them off
+        # to modify the plot
+
+        self.onGridOnOff(self.graphApp.get_togglegrid())
+        self.onLegend(self.graphApp.get_togglelegend())
+        self.ChangeLegendLoc(self.graphApp.get_legend_loc())
+
+        self.xaxis_label = self.graphApp.get_xlab()
+        self.yaxis_label = self.graphApp.get_ylab()
+        self.xaxis_unit = self.graphApp.get_xunit()
+        self.yaxis_unit = self.graphApp.get_yunit()
+
+        self.xaxis(self.xaxis_label,self.xaxis_unit,
+                   self.graphApp.get_xfont(),self.graphApp.get_xcolor())
+        self.yaxis(self.yaxis_label,self.yaxis_unit,
+                   self.graphApp.get_yfont(),self.graphApp.get_ycolor())
 
         self.graphApp.Destroy()

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

@@ -33 +33 @@
 from sans.guiframe.dataFitting import Data1D
 from matplotlib.font_manager import FontProperties
+from graphAppearance import graphAppearance
 (InternalEvent, EVT_INTERNAL) = wx.lib.newevent.NewEvent()
 
@@ -39 +40 @@
 DEFAULT_BEAM = 0.005
 BIN_WIDTH = 1.0
+
+
+def find_key(dic, val):
+    """return the key of dictionary dic given the value"""
+    return [k for k, v in dic.iteritems() if v == val][0]
 
 
@@ -375 +381 @@
         slicerpop.AppendSeparator()
         
-        id = wx.NewId()
-        slicerpop.Append(id, '&Edit Y Axis Label')
-        wx.EVT_MENU(self, id, self._on_yaxis_label)     
-        id = wx.NewId()
-        slicerpop.Append(id, '&Edit X Axis Label')
-        wx.EVT_MENU(self, id, self._on_xaxis_label)
-        id = wx.NewId()
-        slicerpop.Append(id, '&Toggle Grid On/Off', 'Toggle Grid On/Off')
-        wx.EVT_MENU(self, id, self.onGridOnOff)
+        # id = wx.NewId()
+        # slicerpop.Append(id, '&Edit Y Axis Label')
+        # wx.EVT_MENU(self, id, self._on_yaxis_label)     
+        # id = wx.NewId()
+        # slicerpop.Append(id, '&Edit X Axis Label')
+        # wx.EVT_MENU(self, id, self._on_xaxis_label)
+        # id = wx.NewId()
+        # slicerpop.Append(id, '&Toggle Grid On/Off', 'Toggle Grid On/Off')
+        # wx.EVT_MENU(self, id, self.onGridOnOff)
+        # slicerpop.AppendSeparator()
+
+        # ILL mod here
+
+        id = wx.NewId()
+        slicerpop.Append(id, '&Modify graph appearance','Modify graph appearance')
+        wx.EVT_MENU(self, id, self.modifyGraphAppearance)
         slicerpop.AppendSeparator()
+
+
         
         id = wx.NewId()
@@ -776 +791 @@
             self.parent.show_data2d(data, default_name)
         
+
+    def modifyGraphAppearance(self,e):
+        self.graphApp = graphAppearance(self,'Modify graph appearance',
+                                        legend=False)
+
+        
+
+        self.graphApp.setDefaults(self.grid_on,self.legend_on,
+                                  self.xaxis_label,self.yaxis_label,
+                                  self.xaxis_unit,self.yaxis_unit,
+                                  self.xaxis_font,self.yaxis_font,
+                                  find_key(self.get_loc_label(),self.legendLoc),
+                                  self.xcolor,self.ycolor)
+        self.graphApp.Bind(wx.EVT_CLOSE, self.on_graphApp_close)
+    
+
+    def on_graphApp_close(self,e):
+        # gets values from graph appearance dialog and sends them off
+        # to modify the plot
+
+        self.onGridOnOff(self.graphApp.get_togglegrid())
+
+        
+        self.xaxis_label = self.graphApp.get_xlab()
+        self.yaxis_label = self.graphApp.get_ylab()
+        self.xaxis_unit = self.graphApp.get_xunit()
+        self.yaxis_unit = self.graphApp.get_yunit()
+
+        self.xaxis(self.xaxis_label,self.xaxis_unit,
+                   self.graphApp.get_xfont(),self.graphApp.get_xcolor())
+        self.yaxis(self.yaxis_label,self.yaxis_unit,
+                   self.graphApp.get_yfont(),self.graphApp.get_ycolor())
+
+        self.graphApp.Destroy()

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

@@ -26 +26 @@
 class graphAppearance(wx.Frame):
 
-    def __init__(self,parent,title):
+    def __init__(self,parent,title,legend=True):
         super(graphAppearance,self).__init__(parent, title=title,size=(520,435))
+
+        self.legend = legend
 
         self.InitUI()
@@ -51 +53 @@
 
 
-        legendLocText = wx.StaticText(panel, label='Legend location: ')
-        self.legendLocCombo = wx.ComboBox(panel,style = wx.CB_READONLY, size=(180,-1))
-        self.fillLegendLocs()
-
-        self.toggleLegend = wx.CheckBox(panel, label='Toggle legend on/off')
+
+        if self.legend:
+            legendLocText = wx.StaticText(panel, label='Legend location: ')
+            self.legendLocCombo = wx.ComboBox(panel,style = wx.CB_READONLY, size=(180,-1))
+            self.fillLegendLocs()
+        else:
+            self.legendLocCombo = None
+
+
+        if self.legend:
+            self.toggleLegend = wx.CheckBox(panel, label='Toggle legend on/off')
+        else:
+            self.toggleLegend = None
+
         self.toggleGrid = wx.CheckBox(panel, label='Toggle grid on/off')
 
@@ -119 +130 @@
         yhbox2.Add(yfontButton,flag=wx.ALL | wx.ALIGN_RIGHT, border=5)
 
-
-        hbox1.Add(legendLocText, flag =  wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
-        hbox1.Add(self.legendLocCombo, flag =  wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
-        hbox1.Add((5,-1))
-        hbox1.Add(self.toggleLegend, flag = wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
+        if self.legend:
+            hbox1.Add(legendLocText, flag =  wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
+            hbox1.Add(self.legendLocCombo, flag =  wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
+
+        if self.legend:
+            hbox1.Add((5,-1))
+            hbox1.Add(self.toggleLegend, flag = wx.ALL | wx.EXPAND  | wx.ALIGN_LEFT, border=5)
 
         hbox2.Add(self.okButton, flag = wx.ALL | wx.ALIGN_RIGHT, border=5)
@@ -223 +236 @@
                     xcolor,ycolor):
         self.toggleGrid.SetValue(grid)
-        self.toggleLegend.SetValue(legend)
+        if self.legend:
+            self.toggleLegend.SetValue(legend)
         self.xaxisText.SetValue(xlab)
         self.yaxisText.SetValue(ylab)
@@ -242 +256 @@
             
 
-        
-        self.legendLocCombo.SetStringSelection(legend_loc)
-
-
-    def getAppInfo(self):
-        grid_on = self.toggleGrid.GetValue()
-        legend_on = self.toggleLegend.GetValue()
-        xlab = self.xaxisText.GetValue()
-        ylab = self.yaxisText.GetValue()
-        xunit = self.xaxisUnitText.GetValue()
-        yunit = self.yaxisUnitText.GetValue()
-        legend_loc = self.get_loc_label()[self.legendLocCombo.GetStringSelection()]
-        xcolor = self.xfontColor.GetValue()
-        ycolor = self.yfontColor.GetValue()
-
-
-        return [grid_on,legend_on,xlab,ylab,xunit,yunit,
-                self.xfont,self.yfont,
-                xcolor,ycolor,legend_loc]
-
-
+        if self.legend:
+            self.legendLocCombo.SetStringSelection(legend_loc)
+
+
+    # get whether grid is toggled on/off
+    def get_togglegrid(self):
+        return self.toggleGrid.GetValue()
+
+    # get whether legend is toggled on/off
+    def get_togglelegend(self):
+        return self.toggleLegend.GetValue()
+
+    # get x label
+    def get_xlab(self):
+        return self.xaxisText.GetValue()
+
+    # get y label
+    def get_ylab(self):
+        return self.yaxisText.GetValue()
+
+    # get x unit
+    def get_xunit(self):
+        return self.xaxisUnitText.GetValue()
+
+    # get y unit
+    def get_yunit(self):
+        return self.yaxisUnitText.GetValue()
+
+    # get legend location
+    def get_legend_loc(self):
+        return self.get_loc_label()[self.legendLocCombo.GetStringSelection()]
+
+    # get x axis label color
+    def get_xcolor(self):
+        return self.xfontColor.GetValue()
+
+    # get y axis label color
+    def get_ycolor(self):
+        return self.yfontColor.GetValue()
+
+    # get x axis font (type is FontProperties)
+    def get_xfont(self):
+        return self.xfont
+
+    # get y axis font
+    def get_yfont(self):
+        return self.yfont
+    
 
 if __name__ == '__main__':