[GRASS-SVN] r42606 - in grass/trunk/gui/wxpython: gui_modules icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-06-20 19:00:37 +0000 (Sun, 20 Jun 2010)
New Revision: 42606

Modified:
   grass/trunk/gui/wxpython/gui_modules/wxnviz.py
   grass/trunk/gui/wxpython/icons/grass2_icons.py
   grass/trunk/gui/wxpython/icons/grass_icons.py
   grass/trunk/gui/wxpython/icons/icon.py
   grass/trunk/gui/wxpython/icons/silk_icons.py
Log:
wxGUI: remove redundancy from icon files


Modified: grass/trunk/gui/wxpython/gui_modules/wxnviz.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxnviz.py	2010-06-20 18:59:16 UTC (rev 42605)
+++ grass/trunk/gui/wxpython/gui_modules/wxnviz.py	2010-06-20 19:00:37 UTC (rev 42606)
@@ -160,12 +160,9 @@
         Nviz_set_bgcolor(self.data, Nviz_color_from_str("white")) # TODO
         self.SetBgColor("white")
         
-        # initialize view
-        Nviz_init_view()
-        
-        # set default lighting model
-        self.SetLightsDefault()
-        
+        # initialize view, lights
+        Nviz_init_view(self.data)
+                
         # clear window
         GS_clear(self.data.bgcolor)
         
@@ -178,23 +175,6 @@
         """
         self.data.bgcolor = Nviz_color_from_str(color_str)
         
-    def SetLightsDefault(self):
-        """!Set default lighting model
-        """
-        # first
-        Nviz_set_light_position(self.data, 1, 0.68, -0.68, 0.80, 0.0)
-        Nviz_set_light_bright(self.data,   1, 0.8)
-        Nviz_set_light_color(self.data,    1, 1.0, 1.0, 1.0)
-        Nviz_set_light_ambient(self.data,  1, 0.2, 0.2, 0.2)
-        
-        # second
-        Nviz_set_light_position(self.data, 2, 0.0, 0.0, 1.0, 0.0)
-        Nviz_set_light_bright(self.data,   2, 0.5)
-        Nviz_set_light_color(self.data,    2, 1.0, 1.0, 1.0)
-        Nviz_set_light_ambient(self.data,  2, 0.3, 0.3, 0.3)
-        
-        Debug.msg(3, "Nviz::SetLightsDefault()")
-        
     def SetLight(self, x, y, z, color, bright, ambient, w = 0, lid = 1):
         """!Change lighting settings
         @param x,y,z position

Modified: grass/trunk/gui/wxpython/icons/grass2_icons.py
===================================================================
--- grass/trunk/gui/wxpython/icons/grass2_icons.py	2010-06-20 18:59:16 UTC (rev 42605)
+++ grass/trunk/gui/wxpython/icons/grass2_icons.py	2010-06-20 19:00:37 UTC (rev 42606)
@@ -89,7 +89,6 @@
     # profile analysis
     "transect"     : 'layer-raster-profile.png',
     "profiledraw"  : 'show.png',
-    "datasave"     : 'save.png',
     # georectify
     "grGcpSet"     : 'gcp-create.png',
     'grGcpClear'   : 'gcp-remove.png',

Modified: grass/trunk/gui/wxpython/icons/grass_icons.py
===================================================================
--- grass/trunk/gui/wxpython/icons/grass_icons.py	2010-06-20 18:59:16 UTC (rev 42605)
+++ grass/trunk/gui/wxpython/icons/grass_icons.py	2010-06-20 19:00:37 UTC (rev 42606)
@@ -89,7 +89,6 @@
     # profile 
     "profile"    : 'gui-profile.gif',
     "transect"   : 'gui-profiledefine.gif',
-    "datasave"   : 'file-save.gif',
     "profiledraw" : 'gui-display.gif',
     "profileopt" : 'gui-profileopt.gif',
     # georectify

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2010-06-20 18:59:16 UTC (rev 42605)
+++ grass/trunk/gui/wxpython/icons/icon.py	2010-06-20 19:00:37 UTC (rev 42606)
@@ -300,7 +300,7 @@
                              label=_("Draw/re-draw profile")),
     "profileopt" : MetaIcon (img=Icons["settings"],
                              label=_("Profile options")),
-    "datasave"   : MetaIcon (img=Icons["datasave"],
+    "datasave"   : MetaIcon (img=Icons["fileSave"],
                              label=_("Save profile data to csv file")),
     "histogram"  : MetaIcon (img=Icons["histogram"],
                              label=_("Create histogram of image or raster file")),

Modified: grass/trunk/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/trunk/gui/wxpython/icons/silk_icons.py	2010-06-20 18:59:16 UTC (rev 42605)
+++ grass/trunk/gui/wxpython/icons/silk_icons.py	2010-06-20 19:00:37 UTC (rev 42606)
@@ -93,7 +93,6 @@
     "transect"   : 'image_edit.png',
     "profiledraw"  : 'arrow_refresh.png',
     "profileopt"   : 'color_swatch.png',
-    "datasave"     : 'page_save.png',
     # georectify
     "grGcpSet"     : 'bullet_add.png',
     'grGcpClear'   : 'cross.png',