Changeset 26b0a7c in sasview

Timestamp:

Jan 11, 2012 7:12: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:

2a09236

Parents:

d6202e30

Message:

tick label font change can be turned off

Location:

plottools/src/danse/common/plottools

Files:

• PlotPanel.py (modified) (11 diffs)
• TextDialog.py (modified) (6 diffs)

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

@@ -258 +258 @@
         self.xaxis_unit = None
         self.xaxis_color = 'black'
+        self.xaxis_tick = False
         self.yaxis_font = None
         self.yaxis_label = None
         self.yaxis_unit = None
         self.yaxis_color = 'black'
+        self.yaxis_tick = False
         
         # check if zoomed.
@@ -1059 +1061 @@
         """
         xaxis_label, xaxis_unit, xaxis_font, xaxis_color,\
-                     is_ok = self._on_axis_label(axis='x')
+                     is_ok, xaxis_tick = self._on_axis_label(axis='x')
         if not is_ok:
             return
@@ -1067 +1069 @@
         self.xaxis_font = xaxis_font
         self.xaxis_color = xaxis_color
+        self.xaxis_tick = xaxis_tick
         
         if self.data != None:
             # 2D
             self.xaxis(self.xaxis_label, self.xaxis_unit,\
-                        self.xaxis_font, self.xaxis_color)
+                        self.xaxis_font, self.xaxis_color, self.xaxis_tick)
             self.subplot.figure.canvas.draw_idle()
         else:
@@ -1097 +1100 @@
         """
         yaxis_label, yaxis_unit, yaxis_font, yaxis_color,\
-                        is_ok = self._on_axis_label(axis='y')
+                        is_ok, yaxis_tick = self._on_axis_label(axis='y')
         if not is_ok:
             return
@@ -1105 +1108 @@
         self.yaxis_font = yaxis_font
         self.yaxis_color = yaxis_color
+        self.yaxis_tick = yaxis_tick
 
         if self.data != None:
             # 2D
             self.yaxis(self.yaxis_label, self.yaxis_unit,\
-                        self.yaxis_font, self.yaxis_color)
+                        self.yaxis_font, self.yaxis_color, self.yaxis_tick)
             self.subplot.figure.canvas.draw_idle()
         else:
@@ -1143 +1147 @@
                 unit = textdial.getUnit()
                 colour = textdial.getColor()
+                is_tick = textdial.getTickLabel()
                 label_temp = textdial.getText()
                 if label_temp.count("\%s"% "\\") > 0:
@@ -1161 +1166 @@
         else:
             is_ok = False
+            is_tick = True
         textdial.Destroy()
-        return label, unit, font, colour, is_ok
+        return label, unit, font, colour, is_ok, is_tick
         
     def _on_removetext(self, event):
@@ -1249 +1255 @@
                                 handletextsep=.05, loc=self.legendLoc)
                  
-    def xaxis(self, label, units, font=None, color='black'):
+    def xaxis(self, label, units, font=None, color='black', t_font=False):
         """xaxis label and units.
         
@@ -1265 +1271 @@
         if font:
             self.subplot.set_xlabel(label, fontproperties=font, color=color)
-            for tick in self.subplot.xaxis.get_major_ticks():
-                tick.label.set_fontproperties(font) 
+            if t_font:
+                for tick in self.subplot.xaxis.get_major_ticks():
+                    tick.label.set_fontproperties(font) 
         else:
             self.subplot.set_xlabel(label, color=color)
         pass
     
-    def yaxis(self, label, units, font=None, color='black'):
+    def yaxis(self, label, units, font=None, color='black', t_font=False):
         """yaxis label and units."""
         if units != "": 
@@ -1279 +1286 @@
         if font:
             self.subplot.set_ylabel(label, fontproperties=font, color=color)
-            for tick_label in self.subplot.get_yticklabels():
-                tick_label.set_fontproperties(font)
+            if t_font:
+                for tick_label in self.subplot.get_yticklabels():
+                    tick_label.set_fontproperties(font)
         else:
             self.subplot.set_ylabel(label, color=color)
@@ -1817 +1825 @@
         self.set_yscale(_yscale)
         
-        self.xaxis(xname, xunits, self.xaxis_font, self.xaxis_color)
-        self.yaxis(yname, yunits, self.yaxis_font, self.yaxis_color)
+        self.xaxis(xname, xunits, self.xaxis_font, 
+                   self.xaxis_color, self.xaxis_tick)
+        self.yaxis(yname, yunits, self.yaxis_font, 
+                   self.yaxis_color, self.yaxis_tick)
         self.subplot.texts = self.textList
         self.subplot.figure.canvas.draw_idle()

plottools/src/danse/common/plottools/TextDialog.py

@@ -29 +29 @@
         self.weight = WEIGHT[1]
         self.color = COLOR[0]
+        self.tick_label = True
         #Dialog interface
         vbox  = wx.BoxSizer(wx.VERTICAL)
@@ -49 +50 @@
             self.unit_ctrl.SetValue(str(unit))
             unit_box = wx.BoxSizer(wx.HORIZONTAL)
+            tick_label_text = wx.StaticText(self, -1, 'Tick label')
+            tick_label_text.SetToolTipString("Apply to tick label too.")
+            self.tick_label_check = wx.CheckBox(self, -1, 
+                                                '', (10, 10))
+            self.tick_label_check.SetValue(True)
+            self.tick_label_check.SetToolTipString("Apply to tick label too.")
+            wx.EVT_CHECKBOX(self, self.tick_label_check.GetId(), 
+                            self.on_tick_label)
             enter_text = 'Enter text:'
         else:
@@ -57 +66 @@
             self.unit_ctrl = None
             unit_box = None
+            tick_label_text = None
+            self.tick_label_check = None
             enter_text = 'Enter text'
             if len(label) > 0:
@@ -119 +130 @@
         family_box.Add(wx.StaticText(self, -1, 'Size :'), -1, 0)
         family_box.Add(self.fontSize, -1, 0)
+        if unit_box != None:
+            family_box.Add((_BOX_WIDTH/2,-1))
+            family_box.Add(tick_label_text, -1, 0)
+            family_box.Add(self.tick_label_check, -1, 0)
         style_box.Add(wx.StaticText(self, -1, 'Style :'), -1, 0)
         style_box.Add(self.fontStyle, -1, 0)
@@ -202 +217 @@
         for idx in range(len(list)):
             self.fontColor.Append(list[idx],idx) 
+            
+    def on_tick_label(self, event):
+        """
+        Set the font for tick label
+        """
+        event.Skip()
+        self.tick_label = self.tick_label_check.GetValue()
                    
     def on_family(self, event):
@@ -292 +314 @@
         return str(self.color)
     
+    def getTickLabel(self):
+        """
+        Bool for use on tick label
+        """
+        return self.tick_label