[GRASS-SVN] r36504 - in grass/trunk/gui/wxpython: gui_modules vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-03-28 10:57:16 -0400 (Sat, 28 Mar 2009)
New Revision: 36504

Modified:
   grass/trunk/gui/wxpython/gui_modules/georect.py
   grass/trunk/gui/wxpython/gui_modules/toolbars.py
   grass/trunk/gui/wxpython/vdigit/pseudodc.i
Log:
wxGUI: georectify tool fixed (when using local copy of PseudoDC)
       (merge from devbr6, r36503)


Modified: grass/trunk/gui/wxpython/gui_modules/georect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/georect.py	2009-03-28 14:54:19 UTC (rev 36503)
+++ grass/trunk/gui/wxpython/gui_modules/georect.py	2009-03-28 14:57:16 UTC (rev 36504)
@@ -81,7 +81,7 @@
         # get environmental variables
         #
         self.grassdatabase = grass.gisenv()['GISDBASE']
-
+        
         #
         # read original environment settings
         #
@@ -93,7 +93,6 @@
                 line = line.replace('\n', '').strip()
                 if len(line) < 1:
                     continue
-                print line
                 key, value = line.split(':', 1)
                 self.gisrc_dict[key.strip()] = value.strip()
         finally:

Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py	2009-03-28 14:54:19 UTC (rev 36503)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py	2009-03-28 14:57:16 UTC (rev 36504)
@@ -357,7 +357,7 @@
 
     def OnZoomMap(self, event):
         """Zoom to selected map"""
-        layer = self.mapcontent.GetListOfLayers()[0]
+        layer = self.mapcontent.GetListOfLayers()
 
         self.mapdisplay.MapWindow.ZoomToMap(layer=layer)
 

Modified: grass/trunk/gui/wxpython/vdigit/pseudodc.i
===================================================================
--- grass/trunk/gui/wxpython/vdigit/pseudodc.i	2009-03-28 14:54:19 UTC (rev 36503)
+++ grass/trunk/gui/wxpython/vdigit/pseudodc.i	2009-03-28 14:57:16 UTC (rev 36504)
@@ -78,20 +78,20 @@
 			self->GetIdBounds(id, rect);
 			return rect;
 		}
-		void TranslateId(int id, int dx, int dy) {
+		void TranslateId(int id, float dx, float dy) {
 		        self->TranslateId(id, (wxCoord) dx, (wxCoord) dy);
 		}
-		PyObject *FindObjects(int x, int y, int radius) {
+		PyObject *FindObjects(float x, float y, int radius) {
 		        return self->FindObjects((wxCoord) x, (wxCoord) y,
 			                         (wxCoord) radius, *wxWHITE);
                 }
 		void DrawRectangleRect(const wxRect& rect) {
 		        return self->DrawRectangle(rect);
                 }
-		void DrawText(const wxString& text, int x, int y) {
+		void DrawText(const wxString& text, float x, float y) {
 		        return self->DrawText(text, (wxCoord) x, (wxCoord) y);
 		}
-		void DrawRotatedText(const wxString& text, int x, int y, double angle) {
+		void DrawRotatedText(const wxString& text, float x, float y, double angle) {
 		        return self->DrawRotatedText(text, (wxCoord) x, (wxCoord) y, angle);
 		}
 	}