浏览代码

wxGUI/vdigit: solve backwards compatibility for https://trac.osgeo.org/grass/ticket/2848

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@69580 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 8 年之前
父节点
当前提交
9ddbd0307d
共有 3 个文件被更改,包括 5 次插入4 次删除
  1. 2 1
      gui/wxpython/core/settings.py
  2. 2 2
      gui/wxpython/vdigit/preferences.py
  3. 1 1
      gui/wxpython/vdigit/wxdisplay.py

+ 2 - 1
gui/wxpython/core/settings.py

@@ -394,7 +394,8 @@ class Settings:
                 # snapping
                 'snapping': {
                     'value': 10,
-                    'units': 0
+                    'unit': 0,  # new
+                    'units': 'screen pixels'  # old for backwards comp.
                 },
                 'snapToVertex': {
                     'enabled': True

+ 2 - 2
gui/wxpython/vdigit/preferences.py

@@ -220,7 +220,7 @@ class VDigitSettingsDialog(wx.Dialog):
         try:
             self.snappingUnit.SetSelection(UserSettings.Get(group='vdigit',
                                                             key="snapping",
-                                                            subkey='units'))
+                                                            subkey='unit'))
         except:
             self.snappingUnit.SetSelection(0)
         self.snappingUnit.Bind(wx.EVT_CHOICE, self.OnChangeSnappingUnits)
@@ -1003,7 +1003,7 @@ class VDigitSettingsDialog(wx.Dialog):
         # snapping
         UserSettings.Set(group='vdigit', key="snapping", subkey='value',
                          value=int(self.snappingValue.GetValue()))
-        UserSettings.Set(group='vdigit', key="snapping", subkey='units',
+        UserSettings.Set(group='vdigit', key="snapping", subkey='unit',
                          value=self.snappingUnit.GetSelection())
         UserSettings.Set(group='vdigit', key="snapToVertex", subkey='enabled',
                          value=self.snapVertex.IsChecked())

+ 1 - 1
gui/wxpython/vdigit/wxdisplay.py

@@ -1107,7 +1107,7 @@ class DisplayDriver:
             value = UserSettings.Get(group='vdigit', key=type, subkey='value')
 
         if units is None:
-            units = UserSettings.Get(group='vdigit', key=type, subkey='units')
+            units = UserSettings.Get(group='vdigit', key=type, subkey='unit')
 
         if value < 0:
             value = (self.region['nsres'] + self.region['ewres']) / 2.0