Browse Source

wxGUI: georectify tool fixed (when using local copy of PseudoDC)
(merge from devbr6, https://trac.osgeo.org/grass/changeset/36503)


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

Martin Landa 16 years ago
parent
commit
0265e8d061

+ 1 - 2
gui/wxpython/gui_modules/georect.py

@@ -81,7 +81,7 @@ class GeorectWizard(object):
         # get environmental variables
         # get environmental variables
         #
         #
         self.grassdatabase = grass.gisenv()['GISDBASE']
         self.grassdatabase = grass.gisenv()['GISDBASE']
-
+        
         #
         #
         # read original environment settings
         # read original environment settings
         #
         #
@@ -93,7 +93,6 @@ class GeorectWizard(object):
                 line = line.replace('\n', '').strip()
                 line = line.replace('\n', '').strip()
                 if len(line) < 1:
                 if len(line) < 1:
                     continue
                     continue
-                print line
                 key, value = line.split(':', 1)
                 key, value = line.split(':', 1)
                 self.gisrc_dict[key.strip()] = value.strip()
                 self.gisrc_dict[key.strip()] = value.strip()
         finally:
         finally:

+ 1 - 1
gui/wxpython/gui_modules/toolbars.py

@@ -357,7 +357,7 @@ class GRToolbar(AbstractToolbar):
 
 
     def OnZoomMap(self, event):
     def OnZoomMap(self, event):
         """Zoom to selected map"""
         """Zoom to selected map"""
-        layer = self.mapcontent.GetListOfLayers()[0]
+        layer = self.mapcontent.GetListOfLayers()
 
 
         self.mapdisplay.MapWindow.ZoomToMap(layer=layer)
         self.mapdisplay.MapWindow.ZoomToMap(layer=layer)
 
 

+ 4 - 4
gui/wxpython/vdigit/pseudodc.i

@@ -78,20 +78,20 @@ public:
 			self->GetIdBounds(id, rect);
 			self->GetIdBounds(id, rect);
 			return 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);
 		        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,
 		        return self->FindObjects((wxCoord) x, (wxCoord) y,
 			                         (wxCoord) radius, *wxWHITE);
 			                         (wxCoord) radius, *wxWHITE);
                 }
                 }
 		void DrawRectangleRect(const wxRect& rect) {
 		void DrawRectangleRect(const wxRect& rect) {
 		        return self->DrawRectangle(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);
 		        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);
 		        return self->DrawRotatedText(text, (wxCoord) x, (wxCoord) y, angle);
 		}
 		}
 	}
 	}