[GRASS-SVN] r41359 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-03-08 13:29:16 -0500 (Mon, 08 Mar 2010)
New Revision: 41359

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py
Log:
wxGUI/georect: track pen color
(merge r41358 from relbr64)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py	2010-03-08 18:24:41 UTC (rev 41358)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py	2010-03-08 18:29:16 UTC (rev 41359)
@@ -873,16 +873,22 @@
         wxCol = wx.Colour(col[0], col[1], col[2], 255)
         wpx = UserSettings.Get(group='georect', key='symbol', subkey='width')
         font = self.GetFont()
-
+        
+        penOrig = polypenOrig = None
+        
         idx = 0
         for gcp in self.mapcoordlist:
             mapWin = gcp[coordtype][2]
             if not self.list.IsChecked(idx) or not mapWin:
                 idx += 1
                 continue
-
-            mapWin.pen = wx.Pen(colour=wxCol, width=wpx, style=wx.SOLID)
-            mapWin.polypen = wx.Pen(colour=wxCol, width=wpx, style=wx.SOLID) # ?
+            
+            if not penOrig:
+                penOrig = mapWin.pen
+                polypenOrig = mapWin.polypen
+                mapWin.pen = wx.Pen(colour=wxCol, width=wpx, style=wx.SOLID)
+                mapWin.polypen = wx.Pen(colour=wxCol, width=wpx, style=wx.SOLID) # ?
+            
             coord = mapWin.Cell2Pixel((gcp[coordtype][0], gcp[coordtype][1]))
             mapWin.DrawCross(pdc=mapWin.pdcTmp, coords=coord,
                              size=5, text={ 'text' : '%s' % str(idx + 1),
@@ -893,9 +899,12 @@
                                                        coord[1] + 5,
                                                        5,
                                                        5]})
-            
             idx += 1
             
+        if penOrig:
+            mapWin.pen = penOrig
+            mapWin.polypen = polypenOrig
+        
     def SetGCPData(self, coordtype, coord, mapdisp=None, check=True):
         """
         Inserts coordinates from mouse click on map