Changeset 8f59e95 in sasview for plottools/src/danse/common

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)

Location:

plottools/src/danse/common/plottools

Files:

• PlotPanel.py (modified) (6 diffs)
• SimpleFont.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 + ")"