[GRASS-SVN] r44592 - in grass/branches/develbranch_6/gui/wxpython: gui_modules vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-12-13 07:29:24 -0800 (Mon, 13 Dec 2010)
New Revision: 44592

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
   grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
Log:
wxGUI: show error message when digitizer fails


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2010-12-13 14:45:18 UTC (rev 44591)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2010-12-13 15:29:24 UTC (rev 44592)
@@ -1311,9 +1311,13 @@
             gcmd.GError(parent = self.parent,
                         message = str(e))
             return False
+
+        try:
+            self.parent.digit.SetMapName(mapLayer.GetName())
+        except gcmd.GException, e:
+            gcmd.GError(str(e))
+            return
         
-        self.parent.digit.SetMapName(mapLayer.GetName())
-        
         # update toolbar
         self.combo.SetValue(mapLayer.GetName())
         self.parent.toolbars['map'].combo.SetValue (_('Digitize'))

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile	2010-12-13 14:45:18 UTC (rev 44591)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile	2010-12-13 15:29:24 UTC (rev 44592)
@@ -35,7 +35,7 @@
 
 $(SHLIB): $(LIB_NAME).i cats.cpp digit.cpp driver.cpp driver_draw.cpp \
 	driver_select.cpp line.cpp message.cpp select.cpp undo.cpp vertex.cpp
-	$(PYTHON) setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
+	$(PYTHON) setup.py build_ext --swig=swig --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
 
 .NOTPARALLEL: $(LIB_NAME).py $(LIB_NAME)_wrap.cpp