wxGUI/preferences: added possibility to switch on/off zooming by mouse wheel (requested by Michael Barton)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50138 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/core/settings.py

@@ -182,6 +182,10 @@ class Settings:
                 'bgcolor': {
                     'color' : (255, 255, 255, 255),
                     },
+                'mouseWheelZoom' : {
+                    'enabled' : True,
+                    'selection' : 0,
+                    },
                 },
             #
             # projection
@@ -775,6 +779,8 @@ class Settings:
         
         self.internalSettings['display']['driver']['choices'] = ['cairo', 'png']
         self.internalSettings['display']['statusbarMode']['choices'] = None # set during MapFrame init
+        self.internalSettings['display']['mouseWheelZoom']['choices'] = (_('Scroll forward to zoom in'),
+                                                                         _('Scroll back to zoom in'))
 
         self.internalSettings['nviz']['view'] = {}
         self.internalSettings['nviz']['view']['twist'] = {}

gui/wxpython/gui_core/preferences.py

@@ -706,6 +706,31 @@ class PreferencesDialog(PreferencesBaseDialog):
 
         gridSizer.Add(item = autoZooming,
                       pos = (row, 0), span = (1, 2))
+        
+        #
+        # mouse wheel zoom
+        #
+        row += 1
+        wheelZooming = wx.CheckBox(parent = panel, id = wx.ID_ANY,
+                                  label = _("Enable zooming by mouse wheel"),
+                                  name = "IsChecked")
+        wheelZooming.SetValue(self.settings.Get(group = 'display', key = 'mouseWheelZoom',
+                                                subkey = 'enabled'))
+        self.winId['display:mouseWheelZoom:enabled'] = wheelZooming.GetId()
+
+        gridSizer.Add(item = wheelZooming,
+                      pos = (row, 0), flag = wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL)
+                      
+        listOfModes = self.settings.Get(group = 'display', key = 'mouseWheelZoom', subkey = 'choices', internal = True)
+        zoomMode = wx.Choice(parent = panel, id = wx.ID_ANY, size = (200, -1),
+                             choices = listOfModes,
+                             name = "GetSelection")
+        zoomMode.SetSelection(self.settings.Get(group = 'display', key = 'mouseWheelZoom', subkey = 'selection'))
+        self.winId['display:mouseWheelZoom:selection'] = zoomMode.GetId()
+
+        gridSizer.Add(item = zoomMode,
+                      flag = wx.ALIGN_RIGHT,
+                      pos = (row, 1))
 
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
@@ -714,6 +739,10 @@ class PreferencesDialog(PreferencesBaseDialog):
                 
         # bindings
         fontButton.Bind(wx.EVT_BUTTON, self.OnSetFont)
+        wheelZooming.Bind(wx.EVT_CHECKBOX, self.OnEnableWheelZoom)
+        
+        # enable/disable controls according to settings
+        self.OnEnableWheelZoom(None)
         
         return panel
 
@@ -787,7 +816,7 @@ class PreferencesDialog(PreferencesBaseDialog):
         self.winId['cmd:verbosity:selection'] = verbosity.GetId()
         
         gridSizer.Add(item = verbosity,
-                      pos = (row, 1))
+                      pos = (row, 1), flag = wx.ALIGN_RIGHT)
         
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 3)
@@ -1259,6 +1288,13 @@ class PreferencesDialog(PreferencesBaseDialog):
 
         event.Skip()
 
+    def OnEnableWheelZoom(self, event):
+        """!Enable/disable wheel zoom mode control"""
+        checkId = self.winId['display:mouseWheelZoom:enabled']
+        choiceId = self.winId['display:mouseWheelZoom:selection']
+        enable = self.FindWindowById(checkId).IsChecked()
+        self.FindWindowById(choiceId).Enable(enable)
+        
 class DefaultFontDialog(wx.Dialog):
     """
     Opens a file selection dialog to select default font

gui/wxpython/mapdisp/mapwindow.py

@@ -912,6 +912,12 @@ class BufferedWindow(MapWindow, wx.Window):
     def OnMouseWheel(self, event):
         """!Mouse wheel moved
         """
+        if not UserSettings.Get(group = 'display',
+                                key = 'mouseWheelZoom',
+                                subkey = 'enabled'):
+            event.Skip()
+            return
+            
         self.processMouse = False
         current  = event.GetPositionTuple()[:]
         wheel = event.GetWheelRotation()
@@ -927,6 +933,11 @@ class BufferedWindow(MapWindow, wx.Window):
         else:
             zoomtype = -1
         
+        if UserSettings.Get(group = 'display',
+                            key = 'mouseWheelZoom',
+                            subkey = 'selection'):
+            zoomtype *= -1
+            
         # zoom
         self.Zoom(begin, end, zoomtype)
         

gui/wxpython/nviz/mapwindow.py

@@ -624,6 +624,12 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
 
     def OnMouseWheel(self, event):
         """!Change perspective"""
+        if not UserSettings.Get(group = 'display',
+                                key = 'mouseWheelZoom',
+                                subkey = 'enabled'):
+            event.Skip()
+            return
+            
         wheel = event.GetWheelRotation()
         Debug.msg (5, "GLWindow.OnMouseMotion(): wheel = %d" % wheel)
         if self.timerFly.IsRunning() and self.fly['mouseControl']:
@@ -632,6 +638,10 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
             else:
                 self.ChangeFlySpeed(increase = False)
         else:
+            if UserSettings.Get(group = 'display',
+                                key = 'mouseWheelZoom',
+                                subkey = 'selection'):
+                wheel *= -1
             self.DoZoom(zoomtype = wheel, pos = event.GetPositionTuple())
             
         # update statusbar

gui/wxpython/nviz/workspace.py

@@ -25,9 +25,7 @@ except ImportError:
 
 class NvizSettings(object):
     def __init__(self):
-        """Default 3D settings"""
-        UserSettings.Reset('nviz')
-        UserSettings.ReadSettingsFile()
+        pass
         
     def SetConstantDefaultProp(self):
         """Set default constant data properties"""

gui/wxpython/psmap/frame.py

@@ -42,6 +42,7 @@ from gui_core.menu    import Menu
 from gui_core.goutput import CmdThread, EVT_CMD_DONE
 from psmap.toolbars   import PsMapToolbar
 from core.gcmd        import RunCommand, GError, GMessage
+from core.settings    import UserSettings
 from gui_core.forms   import GUI
 from psmap.menudata   import PsMapData
 
@@ -1132,10 +1133,18 @@ class PsMapBufferedWindow(wx.Window):
         
     def OnMouse(self, event):
 
-        if event.GetWheelRotation():
+        if event.GetWheelRotation() and UserSettings.Get(group = 'display',
+                                                         key = 'mouseWheelZoom',
+                                                         subkey = 'enabled'):
             zoom = event.GetWheelRotation()
             use = self.mouse['use']
             self.mouse['begin'] = event.GetPosition()
+            
+            if UserSettings.Get(group = 'display',
+                                key = 'mouseWheelZoom',
+                                subkey = 'selection'):
+                zoom *= -1
+                
             if zoom > 0:
                 self.mouse['use'] = 'zoomin'
             else: