Changeset f80236f in sasview

Timestamp:

Jan 12, 2012 9:10:18 AM (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:

6f140f2

Parents:

3a6c3b9

Message:

added tickmarker size changing with ticklabel size

Location:

plottools/src/danse/common/plottools

Files:

• PlotPanel.py (modified) (7 diffs)
• TextDialog.py (modified) (3 diffs)

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

@@ -258 +258 @@
         self.xaxis_unit = None
         self.xaxis_color = 'black'
-        self.xaxis_tick = False
+        self.xaxis_tick = None
         self.yaxis_font = None
         self.yaxis_label = None
         self.yaxis_unit = None
         self.yaxis_color = 'black'
-        self.yaxis_tick = False
+        self.yaxis_tick = None
         
         # check if zoomed.
@@ -1061 +1061 @@
         """
         xaxis_label, xaxis_unit, xaxis_font, xaxis_color,\
-                     is_ok, xaxis_tick = self._on_axis_label(axis='x')
+                     is_ok, is_tick = self._on_axis_label(axis='x')
         if not is_ok:
             return
@@ -1069 +1069 @@
         self.xaxis_font = xaxis_font
         self.xaxis_color = xaxis_color
-        self.xaxis_tick = xaxis_tick
+        if is_tick:
+            self.xaxis_tick = xaxis_font
         
         if self.data != None:
@@ -1100 +1101 @@
         """
         yaxis_label, yaxis_unit, yaxis_font, yaxis_color,\
-                        is_ok, yaxis_tick = self._on_axis_label(axis='y')
+                        is_ok, is_tick = self._on_axis_label(axis='y')
         if not is_ok:
             return
-        
+
         self.yaxis_label = yaxis_label
         self.yaxis_unit = yaxis_unit
         self.yaxis_font = yaxis_font
         self.yaxis_color = yaxis_color
-        self.yaxis_tick = yaxis_tick
+        if is_tick:
+            self.yaxis_tick = yaxis_font
 
         if self.data != None:
@@ -1255 +1257 @@
                                 handletextsep=.05, loc=self.legendLoc)
                  
-    def xaxis(self, label, units, font=None, color='black', t_font=False):
+    def xaxis(self, label, units, font=None, color='black', t_font=None):
         """xaxis label and units.
         
@@ -1271 +1273 @@
         if font:
             self.subplot.set_xlabel(label, fontproperties=font, color=color)
-            if t_font:
+            if t_font != None:
                 for tick in self.subplot.xaxis.get_major_ticks():
-                    tick.label.set_fontproperties(font) 
+                    tick.label.set_fontproperties(t_font) 
+                for line in self.subplot.xaxis.get_ticklines():
+                    size = t_font.get_size()
+                    line.set_markersize(size / 3)
+                    #line.set_markeredgewidth(int(size / 24 + 1))
         else:
             self.subplot.set_xlabel(label, color=color)
         pass
     
-    def yaxis(self, label, units, font=None, color='black', t_font=False):
+    def yaxis(self, label, units, font=None, color='black', t_font=None):
         """yaxis label and units."""
         if units != "": 
@@ -1286 +1292 @@
         if font:
             self.subplot.set_ylabel(label, fontproperties=font, color=color)
-            if t_font:
+            if t_font != None:
                 for tick_label in self.subplot.get_yticklabels():
-                    tick_label.set_fontproperties(font)
+                    tick_label.set_fontproperties(t_font)
+                for line in self.subplot.yaxis.get_ticklines():
+                    size = t_font.get_size()
+                    line.set_markersize(size / 3)
         else:
             self.subplot.set_ylabel(label, color=color)

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

@@ -24 +24 @@
         self.SetWindowVariant(variant=FONT_VARIANT)
         # default
-        self.family = FAMILY[0]
+        self.family = FAMILY[1]
         self.size = SIZE[3]
         self.style = STYLE[0]
         self.weight = WEIGHT[1]
         self.color = COLOR[0]
-        self.tick_label = True
+        self.tick_label = False
         #Dialog interface
         vbox  = wx.BoxSizer(wx.VERTICAL)
@@ -54 +54 @@
             self.tick_label_check = wx.CheckBox(self, -1, 
                                                 '', (10, 10))
-            self.tick_label_check.SetValue(True)
+            self.tick_label_check.SetValue(False)
             self.tick_label_check.SetToolTipString("Apply to tick label too.")
             wx.EVT_CHECKBOX(self, self.tick_label_check.GetId(), 
@@ -82 +82 @@
         self.fontFamily.SetMinSize((_BOX_WIDTH, -1))
         self._set_family_list()
-        self.fontFamily.SetSelection(0)
+        self.fontFamily.SetSelection(1)
         self.fontFamily.SetToolTipString("Font family of the text.")
         #font weight