Changeset 657e52c in sasview for sansguiframe/src/sans/guiframe/local_perspectives/plotting/graphAppearance.py

Timestamp:

Dec 14, 2012 2:50:24 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:

0203ade

Parents:

aa01d07b

Message:

merging from the release 2.2.0

File:

• sansguiframe/src/sans/guiframe/local_perspectives/plotting/graphAppearance.py (modified) (6 diffs)

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

@@ -36 +36 @@
         self.xfont = None
         self.yfont = None
+        self.is_xtick = False
+        self.is_ytick = False
 
 
@@ -172 +174 @@
         fonty = SimpleFont(self, wx.NewId(), title)
         fonty.set_default_font(self.xfont)
+        fonty.set_ticklabel_check(self.is_xtick)
         if(fonty.ShowModal() == wx.ID_OK):
             self.xfont = fonty.get_font()
+            self.is_xtick = fonty.get_ticklabel_check()
 
     def onyFont(self, e):
@@ -179 +183 @@
         fonty = SimpleFont(self, wx.NewId(), title)
         fonty.set_default_font(self.yfont)
+        fonty.set_ticklabel_check(self.is_ytick)
         if(fonty.ShowModal() == wx.ID_OK):
             self.yfont = fonty.get_font()
+            self.is_ytick = fonty.get_ticklabel_check()
 
     def on_ok(self, e):
@@ -233 +239 @@
     def setDefaults(self,grid,legend,xlab,ylab,xunit,yunit,
                     xaxis_font,yaxis_font,legend_loc,
-                    xcolor,ycolor):
+                    xcolor,ycolor, is_xtick, is_ytick):
         self.toggle_grid.SetValue(grid)
         if self.legend:
@@ -243 +249 @@
         self.xfont = xaxis_font
         self.yfont = yaxis_font
+        self.is_xtick = is_xtick
+        self.is_ytick = is_ytick
 
         if not xcolor:
@@ -303 +311 @@
         return self.yfont
     
+    def get_xtick_check(self):
+        return self.is_xtick
+
+    def get_ytick_check(self):
+        return self.is_ytick
+    
 
 if __name__ == '__main__':