Changeset 8f59e95 in sasview

Timestamp:

Jul 4, 2012 4:56:50 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:

8a687cfd

Parents:

d560a37

Message:

New dialog added for modifying graph appearance (axes & legend)

Files:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (6 diffs)
• plottools/src/danse/common/plottools/SimpleFont.py (added)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (6 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/graphAppearance.py (added)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -948 +948 @@
         self.onContextMenu(event)
         
-    def onLegend(self, event):
+# modified kieranrcampbell ILL june2012
+    def onLegend(self,legOnOff):
         """
         Toggles whether legend is visible/not visible
         """
         
-        if self.legend_on:
+        if not legOnOff:
             for ax in self.axes:
                 self.remove_legend(ax)
@@ -971 +972 @@
         
         self.subplot.figure.canvas.draw_idle()
-        self.legend_on = not self.legend_on
+        self.legend_on = legOnOff
     
+
+    # to do - remove this function when done
+
     def onChangeLegendLoc(self, event):
         """
@@ -997 +1001 @@
         self.subplot.figure.canvas.draw_idle()
         
+
+    def ChangeLegendLoc(self, label):
+        """
+        Changes legend loc based on user input
+        """
+        
+        self.legendLoc = label
+        self.legend_pos_loc = None
+        # sort them by labels
+        handles, labels = self.subplot.get_legend_handles_labels()
+        hl = sorted(zip(handles, labels),
+                    key=operator.itemgetter(1))
+        handles2, labels2 = zip(*hl)
+        self.line_collections_list = handles2
+        self.legend = self.subplot.legend(handles2, labels2,
+                            prop=FontProperties(size=10), numpoints=1,
+                            handletextsep=.05, loc=self.legendLoc)
+        if self.legend != None:
+                self.legend.set_picker(self.legend_picker)
+                self.legend.set_axes(self.subplot)
+        self.subplot.figure.canvas.draw_idle()
+        
+
+
+
     def remove_legend(self, ax=None):
         """
@@ -1048 +1077 @@
         #based on this and plot it at user designated coordinates
 
-    def onGridOnOff(self, event):
+    def onGridOnOff(self,gridon_off):
         """
         Allows ON/OFF Grid
         """
-        if self.grid_on:
-            self.grid_on = False
-        else:
-            self.grid_on = True
+        self.grid_on = gridon_off
+
         self.subplot.figure.canvas.draw_idle()
         
@@ -1266 +1293 @@
         
         """
+
+        self.xcolor = color
         if units != "":
             label = label + " (" + units + ")"
@@ -1284 +1313 @@
     def yaxis(self, label, units, font=None, color='black', t_font=None):
         """yaxis label and units."""
+        self.ycolor = color
+
         if units != "":
             label = label + " (" + units + ")"

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

@@ -37 +37 @@
 from binder import BindArtist
 from appearanceDialog import appearanceDialog
+from graphAppearance import graphAppearance
 
 DEFAULT_QMAX = 0.05
@@ -43 +44 @@
 BIN_WIDTH = 1
 IS_MAC = (sys.platform == 'darwin')
+
+
+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]
+
+
 
 class ModelPanel1D(PlotPanel, PanelBase):
@@ -478 +486 @@
 
                 id = wx.NewId()
-                plot_menu.Append(id, '&Modify graph properties', name)
+                plot_menu.Append(id, '&Modify plot properties', name)
                 wx.EVT_MENU(self, id, self.createAppDialog)
 
@@ -495 +503 @@
                 loc_menu.Append(id, str(label), str(label))
                 wx.EVT_MENU(self, id, self.onChangeLegendLoc)
-            id = wx.NewId()
-            self._slicerpop.AppendMenu(id, '&Modify Legend Location', loc_menu)
-            
-            id = wx.NewId()
-            self._slicerpop.Append(id, '&Toggle Legend On/Off', 'Toggle Legend On/Off')
-            wx.EVT_MENU(self, id, self.onLegend)
+            
+
+            # ILL mod start here
+
+            # id = wx.NewId()
+            # self._slicerpop.AppendMenu(id, '&Modify Legend Location', loc_menu)
+
+            # id = wx.NewId()
+            # self._slicerpop.Append(id, '&Toggle Legend On/Off', 'Toggle Legend On/Off')
+            # wx.EVT_MENU(self, id, self.onLegend)
+            # self._slicerpop.AppendSeparator()
+            
+            # id = wx.NewId()
+            # self._slicerpop.Append(id, '&Edit Y Axis Label')
+            # wx.EVT_MENU(self, id, self._on_yaxis_label)     
+            # id = wx.NewId()
+            # self._slicerpop.Append(id, '&Edit X Axis Label')
+            # wx.EVT_MENU(self, id, self._on_xaxis_label)
+    
+            # id = wx.NewId()
+            # self._slicerpop.Append(id, '&Toggle Grid On/Off', 'Toggle Grid On/Off')
+            # wx.EVT_MENU(self, id, self.onGridOnOff)
+            # self._slicerpop.AppendSeparator()
+
+            id = wx.NewId()
+            self._slicerpop.Append(id, '&Modify graph appearance','Modify graph appearance')
+            wx.EVT_MENU(self, id, self.modifyGraphAppearance)
             self._slicerpop.AppendSeparator()
-            
-            id = wx.NewId()
-            self._slicerpop.Append(id, '&Edit Y Axis Label')
-            wx.EVT_MENU(self, id, self._on_yaxis_label)     
-            id = wx.NewId()
-            self._slicerpop.Append(id, '&Edit X Axis Label')
-            wx.EVT_MENU(self, id, self._on_xaxis_label)
-    
-            id = wx.NewId()
-            self._slicerpop.Append(id, '&Toggle Grid On/Off', 'Toggle Grid On/Off')
-            wx.EVT_MENU(self, id, self.onGridOnOff)
-            self._slicerpop.AppendSeparator()
+
             
             if self.position != None:
@@ -630 +648 @@
             curr_symbol = 13
 
-        self.appD = appearanceDialog(self,'Modify graph properties')
+        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)    
@@ -652 +670 @@
         self.appD.Destroy()
         self._check_zoom_plot()
+
+
+    def modifyGraphAppearance(self,e):
+        self.graphApp = graphAppearance(self,'Modify graph appearance')
+
+        
+
+        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):
+# 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
+
+        self.graphApp.Destroy()