Bladeren bron

wxGUI d.histogram: Set default font (#695)

* wxGUI d.histogram: set default font

* wxGUI d.histogram: fix get 'GRASS_ENCODING' value
Tomas Zigo 4 jaren geleden
bovenliggende
commit
476a3afe1a
1 gewijzigde bestanden met toevoegingen van 13 en 4 verwijderingen
  1. 13 4
      gui/wxpython/modules/histogram.py

+ 13 - 4
gui/wxpython/modules/histogram.py

@@ -24,6 +24,7 @@ import wx
 
 from core import globalvar
 from core.render import Map
+from core.settings import UserSettings
 from gui_core.forms import GUI
 from mapdisp.gprint import PrintOptions
 from core.utils import GetLayerNameFromCmd
@@ -227,10 +228,10 @@ class BufferedWindow(wx.Window):
         Debug.msg(
             2, "BufferedWindow.UpdateHist(%s): render=%s" %
             (img, self.render))
-        
+
         if not self.render:
             return
-        
+
         # render new map images
         # set default font and encoding environmental variables
         if "GRASS_FONT" in os.environ:
@@ -240,7 +241,7 @@ class BufferedWindow(wx.Window):
         if "GRASS_ENCODING" in os.environ:
             self._oldencoding = os.environ["GRASS_ENCODING"]
         if self.parent.encoding is not None and self.parent.encoding != "ISO-8859-1":
-            os.environ[GRASS_ENCODING] = self.parent.encoding
+            os.environ["GRASS_ENCODING"] = self.parent.encoding
 
         # using active comp region
         self.Map.GetRegion(update=True)
@@ -318,7 +319,15 @@ class HistogramFrame(wx.Frame):
         self.params = {}  # previously set histogram parameters
         self.propwin = ''  # ID of properties dialog
 
-        self.font = ""
+        # Default font
+        font_properties = UserSettings.Get(
+            group='histogram', key='font', settings_type='default')
+        self.font = wx.Font(
+            font_properties['defaultSize'],
+            font_properties['family'],
+            font_properties['style'],
+            font_properties['weight'],
+        ).GetFaceName().lower()
         self.encoding = 'ISO-8859-1'  # default encoding for display fonts
 
         self.toolbar = HistogramToolbar(parent=self)