Changeset 8a687cfd in sasview for sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

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

File:

• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (1 diff)

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()