GUI/vdigit: fix snapping units, see https://trac.osgeo.org/grass/ticket/2848 (merge from trunk https://trac.osgeo.org/grass/changeset/69578, https://trac.osgeo.org/grass/changeset/69579, https://trac.osgeo.org/grass/changeset/69580)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@69595 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/core/settings.py

@@ -387,13 +387,14 @@ class Settings:
                     'units' : 'screen pixels'
                     },
                 # snapping
-                'snapping' : {
-                    'value' : 10,
-                    'units' : 'screen pixels'
-                    },
-                'snapToVertex' : {
-                    'enabled' : True
-                    },
+                'snapping': {
+                    'value': 10,
+                    'unit': 0,  # new
+                    'units': 'screen pixels'  # old for backwards comp.
+                },
+                'snapToVertex': {
+                    'enabled': True
+                },
                 # digitize new record
                 'addRecord' : {
                     'enabled' : True

gui/wxpython/vdigit/preferences.py

@@ -163,9 +163,14 @@ class VDigitSettingsDialog(wx.Dialog):
                                          min = -1, max = 1e6)
         self.snappingValue.Bind(wx.EVT_SPINCTRL, self.OnChangeSnappingValue)
         self.snappingValue.Bind(wx.EVT_TEXT, self.OnChangeSnappingValue)
-        self.snappingUnit = wx.Choice(parent = panel, id = wx.ID_ANY, size = (125, -1),
-                                      choices = [_("screen pixels"), _("map units")])
-        self.snappingUnit.SetStringSelection(UserSettings.Get(group = 'vdigit', key = "snapping", subkey = 'units'))
+        self.snappingUnit = wx.Choice(parent=panel, id=wx.ID_ANY, size=(
+            125, -1), choices=[_("screen pixels"), _("map units")])
+        try:
+            self.snappingUnit.SetSelection(UserSettings.Get(group='vdigit',
+                                                            key="snapping",
+                                                            subkey='unit'))
+        except:
+            self.snappingUnit.SetSelection(0)
         self.snappingUnit.Bind(wx.EVT_CHOICE, self.OnChangeSnappingUnits)
         flexSizer.Add(text, proportion = 0, flag = wx.ALIGN_CENTER_VERTICAL)
         flexSizer.Add(self.snappingValue, proportion = 0, flag = wx.ALIGN_CENTER | wx.FIXED_MINSIZE)
@@ -609,7 +614,7 @@ class VDigitSettingsDialog(wx.Dialog):
             res = (region['nsres'] + region['ewres']) / 2.
             threshold = self.digit.GetDisplay().GetThreshold(value = res)
         else:
-            if self.snappingUnit.GetStringSelection() == "map units":
+            if self.snappingUnit.GetSelection() == 1:  # map units
                 threshold = value
             else:
                 threshold = self.digit.GetDisplay().GetThreshold(value = value)
@@ -632,10 +637,10 @@ class VDigitSettingsDialog(wx.Dialog):
         """Snapping units change -> update static text
         """
         value = self.snappingValue.GetValue()
-        units = self.snappingUnit.GetStringSelection()
+        units = self.snappingUnit.GetSelection()
         threshold = self.digit.GetDisplay().GetThreshold(value = value, units = units)
 
-        if units == "map units":
+        if units == 1:  # map units
             self.snappingInfo.SetLabel(_("Snapping threshold is %(value).1f %(units)s") % 
                                        {'value' : value,
                                         'units' : self.mapUnits})
@@ -721,13 +726,13 @@ class VDigitSettingsDialog(wx.Dialog):
                          value = int(self.lineWidthValue.GetValue()))
 
         # snapping
-        UserSettings.Set(group = 'vdigit', key = "snapping", subkey = 'value',
-                         value = int(self.snappingValue.GetValue()))
-        UserSettings.Set(group = 'vdigit', key = "snapping", subkey = 'units',
-                         value = self.snappingUnit.GetStringSelection())
-        UserSettings.Set(group = 'vdigit', key = "snapToVertex", subkey = 'enabled',
-                         value = self.snapVertex.IsChecked())
-        
+        UserSettings.Set(group='vdigit', key="snapping", subkey='value',
+                         value=int(self.snappingValue.GetValue()))
+        UserSettings.Set(group='vdigit', key="snapping", subkey='unit',
+                         value=self.snappingUnit.GetSelection())
+        UserSettings.Set(group='vdigit', key="snapToVertex", subkey='enabled',
+                         value=self.snapVertex.IsChecked())
+
         # digitize new feature
         UserSettings.Set(group = 'vdigit', key = "addRecord", subkey = 'enabled',
                          value = self.addRecord.IsChecked())

gui/wxpython/vdigit/wxdisplay.py

@@ -1025,7 +1025,7 @@ class DisplayDriver:
         
         :param type: snapping mode (node, vertex)
         :param value: threshold to be set up
-        :param units: units (map, screen)
+        :param units: units (0 for screen pixels, 1 for map units)
 
         :return: threshold value
         """
@@ -1033,12 +1033,12 @@ 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
         
-        if units == "screen pixels":
+        if units == 0:
             # pixel -> cell
             res = max(self.region['nsres'], self.region['ewres'])
             return value * res