[GRASS-SVN] r32774 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-15 06:50:20 -0400 (Fri, 15 Aug 2008)
New Revision: 32774

Modified:
   grass/trunk/gui/wxpython/gui_modules/preferences.py
   grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
Log:
wxGUI: track changes in d.rast, overlay->opaque, display driver option disabled now

Modified: grass/trunk/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/preferences.py	2008-08-15 08:35:11 UTC (rev 32773)
+++ grass/trunk/gui/wxpython/gui_modules/preferences.py	2008-08-15 10:50:20 UTC (rev 32774)
@@ -87,9 +87,9 @@
                 'displayFont' : {
                     'value' : ''
                     },
-                'driver': {
-                    'type': 'default'
-                    },
+                # 'driver': {
+                #    'type': 'default'
+                #    },
                 'compResolution' : {
                     'enabled' : False
                     },
@@ -143,8 +143,8 @@
                     'selection' : 'grassenv'
                     },
                 # d.rast
-                'rasterOverlay' : {
-                    'enabled' : True
+                'rasterOpaque' : {
+                    'enabled' : False
                     },
                 # d.vect
                 'showType': {
@@ -972,30 +972,29 @@
         #
         # display driver
         #
-        row = 0
-        gridSizer.Add(item=wx.StaticText(parent=panel, id=wx.ID_ANY,
-                                         label=_("Display driver:")),
-                      flag=wx.ALIGN_LEFT |
-                      wx.ALIGN_CENTER_VERTICAL,
-                      pos=(row, 0))
-        listOfDrivers = self.settings.Get(group='display', key='driver', subkey='choices', internal=True)
-        # check if cairo is available
-        if 'cairo' not in listOfDrivers:
-            for line in gcmd.Command(['d.mon', '-l']).ReadStdOutput():
-                if 'cairo' in line:
-                    listOfDrivers.append('cairo')
-                    break
-        driver = wx.Choice(parent=panel, id=wx.ID_ANY, size=(150, -1),
-                           choices=listOfDrivers,
-                           name="GetStringSelection")
-        driver.SetStringSelection(self.settings.Get(group='display', key='driver', subkey='type'))
-        self.winId['display:driver:type'] = driver.GetId()
+        #         row = 0
+        #         gridSizer.Add(item=wx.StaticText(parent=panel, id=wx.ID_ANY,
+        #                                          label=_("Display driver:")),
+        #                       flag=wx.ALIGN_LEFT |
+        #                       wx.ALIGN_CENTER_VERTICAL,
+        #                       pos=(row, 0))
+        #         listOfDrivers = self.settings.Get(group='display', key='driver', subkey='choices', internal=True)
+        #         # check if cairo is available
+        #         if 'cairo' not in listOfDrivers:
+        #             for line in gcmd.Command(['d.mon', '-l']).ReadStdOutput():
+        #                 if 'cairo' in line:
+        #                     listOfDrivers.append('cairo')
+        #                     break
+        #         driver = wx.Choice(parent=panel, id=wx.ID_ANY, size=(150, -1),
+        #                            choices=listOfDrivers,
+        #                            name="GetStringSelection")
+        #         driver.SetStringSelection(self.settings.Get(group='display', key='driver', subkey='type'))
+        #         self.winId['display:driver:type'] = driver.GetId()
+        
+        #         gridSizer.Add(item=driver,
+        #                       flag=wx.ALIGN_RIGHT,
+        #                       pos=(row, 1))
 
-        gridSizer.Add(item=driver,
-                      flag=wx.ALIGN_RIGHT,
-                      pos=(row, 1))
-
-
         #
         # Statusbar mode
         #
@@ -1129,13 +1128,13 @@
         # raster overlay
         #
         row = 0
-        rasterOverlay = wx.CheckBox(parent=panel, id=wx.ID_ANY,
-                                    label=_("Overlay raster maps"),
+        rasterOpaque = wx.CheckBox(parent=panel, id=wx.ID_ANY,
+                                    label=_("Make null cells opaque"),
                                     name='IsChecked')
-        rasterOverlay.SetValue(self.settings.Get(group='cmd', key='rasterOverlay', subkey='enabled'))
-        self.winId['cmd:rasterOverlay:enabled'] = rasterOverlay.GetId()
+        rasterOpaque.SetValue(self.settings.Get(group='cmd', key='rasterOpaque', subkey='enabled'))
+        self.winId['cmd:rasterOpaque:enabled'] = rasterOpaque.GetId()
         
-        gridSizer.Add(item=rasterOverlay,
+        gridSizer.Add(item=rasterOpaque,
                       pos=(row, 0), span=(1, 2))
         
         sizer.Add(item=gridSizer, proportion=1, flag=wx.ALL | wx.EXPAND, border=5)

Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-08-15 08:35:11 UTC (rev 32773)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-08-15 10:50:20 UTC (rev 32774)
@@ -722,8 +722,8 @@
         elif ltype == 'raster':
             cmd = ['d.rast']
             
-            if UserSettings.Get(group='cmd', key='rasterOverlay', subkey='enabled'):
-                cmd.append('-o')
+            if UserSettings.Get(group='cmd', key='rasterOpaque', subkey='enabled'):
+                cmd.append('-n')
             menuform.GUI().ParseCommand(cmd, completed=(self.GetOptData,layer,params),
                                         parentframe=self)
         elif ltype == '3d-raster':