Changeset 657e52c in sasview for plottools/src/danse/common

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

Location:

plottools/src/danse/common/plottools

Files:

• PlotPanel.py (modified) (1 diff)
• SimpleFont.py (modified) (4 diffs)
• TextDialog.py (modified) (1 diff)

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

@@ -2 +2 @@
 """
 import logging
-import wx.lib.newevent
-
+import wx
 # Try a normal import first
 # If it fails, try specifying a version

plottools/src/danse/common/plottools/SimpleFont.py

@@ -34 +34 @@
         self.style = STYLE[0]
         self.weight = WEIGHT[1]
-
+        self.tick_label = None
+        self.tick_label_check = None
         self.InitUI()
         self.Centre()
         self.Show()
-
-
+        
     def InitUI(self):
         vbox = wx.BoxSizer(wx.VERTICAL)
@@ -57 +57 @@
         self.fontWeight = wx.ComboBox(self,pos=(300,60),
                                       style=wx.CB_READONLY,size=(100,-1))
-
+        self.tick_label_check = wx.CheckBox(self, -1, label='', pos=(80, 100), 
+                                                                                size=(15, -1))
+        self.tick_label_check.SetValue(False)
         self.okButton = wx.Button(self,wx.ID_OK,'OK',pos=(215,100))
         self.closeButton = wx.Button(self,wx.ID_CANCEL,'Cancel',pos=(315,100))
-
+        
         self._set_family_list()
         self._set_style_list()
         self._set_weight_list()
         self._set_point_list()
-
+        
         familyText = wx.StaticText(self, label='Family:', pos=(10,12))
         sizeText = wx.StaticText(self, label='Size:',pos=(220,12))
         styleText = wx.StaticText(self, label='Style:',pos=(10,62))
         weightText = wx.StaticText(self, label='Weight:',pos=(220,62))
-
+        tick_label_text = wx.StaticText(self,label='Tick label?', pos=(10, 100))
+        tick_label_text.SetToolTipString("Apply to tick label too.")
+                
     def _set_family_list(self):
         # list of font family
@@ -95 +99 @@
             self.fontPoint.Append(str(list[idx]),idx)
 
+    def get_ticklabel_check(self):
+        """
+        Get tick label check value
+        """
+        self.tick_label = self.tick_label_check.GetValue()
+        return self.tick_label
+
+    def set_ticklabel_check(self, check=False):
+        """
+        Set tick label check value
+        """
+        self.tick_label_check.SetValue(check)
 
     def set_default_font(self,font):
@@ -103 +119 @@
             self.fontPoint.SetSelection(3)
             self.fontStyle.SetSelection(0)
-
         else:
-            self.fontWeight.SetStringSelection(font.get_weight())
-            self.fontPoint.SetStringSelection(font.get_size())
-            self.fontFamily.SetStringSelection(font.get_family())
-            self.fontStyle.SetStringSelection(font.get_style())
-        
-
+                self.fontWeight.SetStringSelection(str(font.get_weight()))
+                self.fontPoint.SetStringSelection(str(int(font.get_size())))
+                self.fontFamily.SetStringSelection(str(font.get_family()[0]))
+                self.fontStyle.SetStringSelection(str(font.get_style()))
+                
     def get_font(self):
         FONT = FontProperties()
         font = FONT.copy()
-        font.set_size(self.fontPoint.GetValue())
+        font.set_size(str(self.fontPoint.GetValue()))
         font.set_name(str(self.fontFamily.GetValue()))
         font.set_slant(str(self.fontStyle.GetValue()))

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

@@ -97 +97 @@
         self.fontSize.SetMinSize((_BOX_WIDTH, -1))
         self._set_size_list()
-        self.fontSize.SetSelection(3)
+        self.fontSize.SetSelection(5)
         self.fontSize.SetToolTipString("Font size of the text.")
         #font style