wxGUI: better error message handling in vdigit

initial support for copy categories/attributes in vdigit
some wxGUI fixes
(merge from devbr6, https://trac.osgeo.org/grass/changeset/33149)


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

gui/wxpython/gui_modules/gcmd.py

@@ -443,6 +443,9 @@ class Command:
 
     def GetError(self):
         """Get error message or ''"""
+        if not self.cmdThread.module:
+            return _("Unable to exectute command: '%s'") % ' '.join(self.cmd)
+
         for type, msg in self.__ProcessStdErr():
             if type == 'ERROR':
                 return msg

gui/wxpython/gui_modules/mapdisp.py

@@ -1119,7 +1119,8 @@ class BufferedWindow(MapWindow, wx.Window):
                     else:
                         point = False
 
-                    digitClass.AddPoint(map, point, east, north)
+                    if digitClass.AddPoint(map, point, east, north) < 0:
+                        return
 
                     self.UpdateMap(render=False) # redraw map
 
@@ -1741,8 +1742,9 @@ class BufferedWindow(MapWindow, wx.Window):
                     if len(self.polycoords) < 2: # ignore 'one-point' lines
                         return
                     
-                    digitClass.AddLine(map, line, self.polycoords)
-
+                    if digitClass.AddLine(map, line, self.polycoords) < 0:
+                        return
+                    
                     position = self.Cell2Pixel(self.polycoords[-1])
                     self.polycoords = []
                     self.UpdateMap(render=False)

gui/wxpython/gui_modules/toolbars.py

@@ -436,11 +436,7 @@ class VDigitToolbar(AbstractToolbar):
         
         # toogle to pointer by default
         self.OnTool(None)
-
-        if UserSettings.Get(group='advanced', key='digitInterface', subkey='type') == 'vdigit':
-            self.toolbar[0].EnableTool(self.copyCats, False) # not implemented (TODO)
-            self.toolbar[0].SetToolShortHelp(self.copyCats, _("Not implemented yet"))
-            
+        
     def ToolbarData(self, row=None):
         """
         Toolbar data
@@ -502,7 +498,7 @@ class VDigitToolbar(AbstractToolbar):
                      self.OnDisplayCats),
                     (self.copyCats, "digCopyCats", Icons["digCopyCats"].GetBitmap(),
                      wx.ITEM_CHECK, Icons["digCopyCats"].GetLabel(), Icons["digCopyCats"].GetDesc(),
-                     self.OnCopyCats),
+                     self.OnCopyCA),
                     (self.displayAttr, "digDispAttr", Icons["digDispAttr"].GetBitmap(),
                      wx.ITEM_CHECK, Icons["digDispAttr"].GetLabel(), Icons["digDispAttr"].GetDesc(),
                      self.OnDisplayAttr),
@@ -671,13 +667,60 @@ class VDigitToolbar(AbstractToolbar):
                         'id'   : self.displayAttr }
         self.parent.MapWindow.mouse['box'] = 'point'
 
+    def OnCopyCA(self, event):
+        """Copy categories/attributes menu"""
+        point = wx.GetMousePosition()
+        toolMenu = wx.Menu()
+        # Add items to the menu
+        cats = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                           text=_('Copy categories'),
+                           kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(cats)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopyCats, cats)
+        if self.action['desc'] == "copyCats":
+            cats.Check(True)
+
+        attrb = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                            text=_('Duplicate attributes'),
+                            kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(attrb)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopyAttrb, attrb)
+        if self.action['desc'] == "copyAttrs":
+            attrb.Check(True)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.parent.MapWindow.PopupMenu(toolMenu)
+        toolMenu.Destroy()
+        
+        if self.action['desc'] == "addPoint":
+            self.toolbar[0].ToggleTool(self.copyCats, False)
+        
     def OnCopyCats(self, event):
         """Copy categories"""
+        if self.action['desc'] == 'copyCats': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.copyCats, False)
+            self.OnAddPoint(event)
+            return
+        
         Debug.msg(2, "Digittoolbar.OnCopyCats():")
         self.action = { 'desc' : "copyCats",
                         'id'   : self.copyCats }
         self.parent.MapWindow.mouse['box'] = 'point'
 
+    def OnCopyAttrb(self, event):
+        if self.action['desc'] == 'copyAttrs': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.copyCats, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnCopyAttrb():")
+        self.action = { 'desc' : "copyAttrs",
+                        'id'   : self.copyCats }
+        self.parent.MapWindow.mouse['box'] = 'point'
+        
     def OnUndo(self, event):
         """Undo previous changes"""
         self.parent.digit.Undo()
@@ -795,12 +838,13 @@ class VDigitToolbar(AbstractToolbar):
         toolMenu.Destroy()
         
         if self.action['desc'] == 'addPoint':
-            self.toolbar[0].ToggleTool(self.additionalTools, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
         
     def OnCopy(self, event):
         """Copy selected features from (background) vector map"""
         if self.action['desc'] == 'copyLine': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         
@@ -813,6 +857,7 @@ class VDigitToolbar(AbstractToolbar):
         """Flip selected lines/boundaries"""
         if self.action['desc'] == 'flipLine': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         
@@ -825,6 +870,7 @@ class VDigitToolbar(AbstractToolbar):
         """Merge selected lines/boundaries"""
         if self.action['desc'] == 'mergeLine': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         
@@ -837,6 +883,7 @@ class VDigitToolbar(AbstractToolbar):
         """Break selected lines/boundaries"""
         if self.action['desc'] == 'breakLine': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         
@@ -849,6 +896,7 @@ class VDigitToolbar(AbstractToolbar):
         """Snap selected features"""
         if self.action['desc'] == 'snapLine': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         
@@ -861,6 +909,7 @@ class VDigitToolbar(AbstractToolbar):
         """Connect selected lines/boundaries"""
         if self.action['desc'] == 'connectLine': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         
@@ -873,6 +922,7 @@ class VDigitToolbar(AbstractToolbar):
         """Query selected lines/boundaries"""
         if self.action['desc'] == 'queryLine': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         
@@ -886,6 +936,7 @@ class VDigitToolbar(AbstractToolbar):
         """Z bulk-labeling selected lines/boundaries"""
         if self.action['desc'] == 'zbulkLine': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         
@@ -903,6 +954,7 @@ class VDigitToolbar(AbstractToolbar):
         """
         if self.action['desc'] == 'typeConv': # select previous action
             self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
             self.OnAddPoint(event)
             return
         

gui/wxpython/gui_modules/utils.py

@@ -98,7 +98,11 @@ def GetLayerNameFromCmd(dcmd, fullyQualified=False, param=None,
                     break
             
         if idx < len(dcmd):
-            mapname = dcmd[idx].split('=')[1]
+            try:
+                mapname = dcmd[idx].split('=')[1]
+            except IndexError:
+                return ''
+            
             if fullyQualified and '@' not in mapname:
                 if layerType in ('raster', 'vector', '3d-raster'):
                     try:

gui/wxpython/gui_modules/vdigit.py

@@ -37,6 +37,8 @@ import sys
 import string
 import copy
 
+from threading import Thread
+
 import wx
 import wx.lib.colourselect as csel
 import wx.lib.mixins.listctrl as listmix
@@ -686,6 +688,7 @@ class VEdit(AbstractDigit):
             return False
 
         # collect cats
+        # FIXME: currently layer is ignored...
         gcmd.Command(['v.edit',
                      '--q',
                      'map=%s' % self.map,
@@ -789,7 +792,8 @@ class VDigit(AbstractDigit):
         AbstractDigit.__init__(self, mapwindow)
 
         try:
-            self.digit = wxvdigit.Digit(self.driver.GetDevice())
+            self.digit = wxvdigit.Digit(self.driver.GetDevice(),
+                                        mapwindow)
         except (ImportError, NameError):
             self.digit = None
 
@@ -823,15 +827,15 @@ class VDigit(AbstractDigit):
 
         if z:
             ret = self.digit.AddLine(type, [x, y, z], layer, cat,
-                                     str(UserSettings.Get(group='vdigit', key="backgroundMap", subkey='value')), snap, thresh)
+                                     str(UserSettings.Get(group='vdigit', key="backgroundMap",
+                                                          subkey='value')), snap, thresh)
         else:
             ret = self.digit.AddLine(type, [x, y], layer, cat,
-                                     str(UserSettings.Get(group='vdigit', key="backgroundMap", subkey='value')), snap, thresh)
-
-        if ret == -1:
-            raise gcmd.DigitError, _("Adding new feature to vector map <%s> failed.") % map
-
+                                     str(UserSettings.Get(group='vdigit', key="backgroundMap",
+                                                          subkey='value')), snap, thresh)
         self.toolbar.EnableUndo()
+
+        return ret
         
     def AddLine (self, map, line, coords):
         """Add line/boundary
@@ -864,12 +868,11 @@ class VDigit(AbstractDigit):
         
         ret = self.digit.AddLine(type, listCoords, layer, cat,
                                  str(UserSettings.Get(group='vdigit', key="backgroundMap", subkey='value')), snap, thresh)
-        
-        if ret == -1:
-            raise gcmd.DigitError, _("Adding new feature to vector map <%s> failed.") % map
-        
+
         self.toolbar.EnableUndo()
         
+        return ret
+    
     def DeleteSelectedLines(self):
         """Delete selected features
 
@@ -1090,19 +1093,19 @@ class VDigit(AbstractDigit):
 
         return ret
 
-    def CopyCats(self, cats, ids):
+    def CopyCats(self, fromId, toId):
         """Copy given categories to objects with id listed in ids
 
-        @param cats list of cats to be copied
-        @param ids  ids of lines to be modified
+        @param cats ids of 'from' feature
+        @param ids  ids of 'to' feature(s)
 
         @return number of modified features
         @return -1 on error
         """
-        if len(cats) == 0 or len(ids) == 0:
+        if len(fromId) == 0 or len(toId) == 0:
             return 0
 
-        ret = self.digit.CopyCats(cats, ids)
+        ret = self.digit.CopyCats(fromId, toId)
 
         if ret > 0:
             self.toolbar.EnableUndo()

gui/wxpython/vdigit/cats.cpp

@@ -35,6 +35,7 @@ int Digit::InitCats()
     }
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -158,10 +159,12 @@ std::map<int, std::vector<int> > Digit::GetLineCats(int line_id)
     struct field_info *fi;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return lc;
     }
 
     if (line_id == -1 && display->selected.values->n_values < 1) {
+	GetLineCatsMsg(line_id);
 	return lc;
     }
 
@@ -171,6 +174,7 @@ std::map<int, std::vector<int> > Digit::GetLineCats(int line_id)
     }
 
     if (!Vect_line_alive(display->mapInfo, line)) {
+	DeadLineMsg(line);
 	return lc;
     }
 
@@ -178,6 +182,7 @@ std::map<int, std::vector<int> > Digit::GetLineCats(int line_id)
 
     if (Vect_read_line(display->mapInfo, NULL, Cats, line) < 0) {
 	Vect_destroy_cats_struct(Cats);
+	ReadLineMsg(line);
 	return lc;
     }
 
@@ -186,6 +191,7 @@ std::map<int, std::vector<int> > Digit::GetLineCats(int line_id)
     for (int dblink = 0; dblink < n_dblinks; dblink++) {
 	fi = Vect_get_dblink(display->mapInfo, dblink);
 	if (fi == NULL) {
+	    DblinkMsg(dblink+1);
 	    continue;
 	}
 	std::vector<int> cats;
@@ -219,10 +225,12 @@ int Digit::SetLineCats(int line_id, int layer, std::vector<int> cats, bool add)
     struct line_cats *Cats;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
     if (line_id == -1 && display->selected.values->n_values < 1) {
+	GetLineCatsMsg(line_id);
 	return -1;
     }
     
@@ -232,6 +240,7 @@ int Digit::SetLineCats(int line_id, int layer, std::vector<int> cats, bool add)
     }
      
     if (!Vect_line_alive(display->mapInfo, line)) {
+	DeadLineMsg(line);
 	return -1;
     }
 
@@ -241,6 +250,7 @@ int Digit::SetLineCats(int line_id, int layer, std::vector<int> cats, bool add)
     if (type < 0) {
 	Vect_destroy_line_struct(Points);
 	Vect_destroy_cats_struct(Cats);
+	ReadLineMsg(line);
 	return -1;
     }
 
@@ -284,15 +294,68 @@ int Digit::SetLineCats(int line_id, int layer, std::vector<int> cats, bool add)
 /**
    \brief Copy categories from one vector feature to other
 
-   \param cats  list of layer/category to be copied			       
-   \param ids   list of line ids where to copy categories
+   \param fromId list of 'from' feature ids
+   \param toId   list of 'to' feature ids
 
    \return number of modified features
    \return -1 on error
 */
-int Digit::CopyCats(std::vector<std::vector<int> > cats, std::vector<int> ids)
+int Digit::CopyCats(std::vector<int> fromId, std::vector<int> toId)
 {
-  /* TODO */
+    int fline, tline, nlines, type;
+    bool error;
+    
+    struct line_pnts *Points;
+    struct line_cats *Cats_from, *Cats_to;
+
+    Points = Vect_new_line_struct();
+    Cats_from = Vect_new_cats_struct();
+    Cats_to = Vect_new_cats_struct();
+
+    nlines = 0;
+    error = false;
+    for (std::vector<int>::const_iterator fi = fromId.begin(), fe = fromId.end();
+	 fi != fe && !error; ++fi) {
+	fline = *fi;
+	if (!Vect_line_alive(display->mapInfo, fline))
+	    continue;
+
+	type = Vect_read_line(display->mapInfo, NULL, Cats_from, fline);
+	if (type < 0) {
+	    nlines = -1;
+	    error = true;
+	}
+
+	for(std::vector<int>::const_iterator ti = toId.begin(), te = toId.end();
+	    ti != te && !error; ++ti) {
+	    tline = *ti;
+	    if (!Vect_line_alive(display->mapInfo, tline))
+		continue;
+	    type = Vect_read_line(display->mapInfo, Points, Cats_to, tline);
+	    if (type < 0) {
+		nlines = -1;
+		error = true;
+	    }
+
+	    for (int i = 0; Cats_from->n_cats; i++) {
+		if (Vect_cat_set(Cats_to, Cats_from->field[i], Cats_from->field[i]) < 1) {
+		    nlines = -1;
+		    error = true;
+		}
+	    }
+	    
+	    if (Vect_rewrite_line(display->mapInfo, tline, type, Points, Cats_to) < 0) {
+		nlines = -1;
+		error = true;
+	    }
+		
+	    nlines++;
+	}
+    }
+
+    Vect_destroy_line_struct(Points);
+    Vect_destroy_cats_struct(Cats_from);
+    Vect_destroy_cats_struct(Cats_to);
 
-  return 0;
+    return nlines;
 }

gui/wxpython/vdigit/digit.cpp

@@ -21,10 +21,12 @@
    \brief Initialize digit interface used by SWIG
 
    \param driver display driver instance
+   \param window parent window for message dialog
 */
-Digit::Digit(DisplayDriver *ddriver)
+Digit::Digit(DisplayDriver *ddriver, void *window)
 {
     display = ddriver;
+    parentWin = (wxWindow *) window;
 
     if (display->mapInfo) {
 	InitCats();
@@ -33,6 +35,8 @@ Digit::Digit(DisplayDriver *ddriver)
     changesetCurrent = -2; // initial value for undo/redo
     changesetDead = -1;
 
+    msgCaption = _("Digitization error");
+    
     // avoid GUI crash
     // Vect_set_fatal_error(GV_FATAL_PRINT);
 }

gui/wxpython/vdigit/digit.h

@@ -13,7 +13,8 @@ private:
     std::map<int, int> cats;
 
     DisplayDriver *display;
-
+    wxWindow *parentWin;
+    
     int SetCategory(int, int);
     struct Map_info** OpenBackgroundVectorMap(const char *);
 
@@ -42,8 +43,22 @@ private:
     void FreeChangeset(int);
     int RemoveActionFromChangeset(int, action_type, int);
 
+    /* message dialogs */
+    wxString msgCaption;
+    void DisplayMsg(void);
+    void Only2DMsg(void);
+    void ReadLineMsg(int);
+    void DeadLineMsg(int);
+    void WriteLineMsg(void);
+    void BackgroundMapMsg(const char *);
+    void DblinkMsg(int);
+    void DbDriverMsg(const char *);
+    void DbDatabaseMsg(const char *, const char *);
+    void DbExecuteMsg(const char *);
+    void GetLineCatsMsg(int);
+
 public:
-    Digit(DisplayDriver *);
+    Digit(DisplayDriver *, void *);
     ~Digit();
 
     int InitCats();
@@ -79,7 +94,7 @@ public:
 					double, double, double, bool,
 					int, int, double);
 
-    int CopyCats(std::vector<std::vector<int> >, std::vector<int>);
+    int CopyCats(std::vector<int>, std::vector<int>);
     int GetCategory(int);
     std::map<int, std::vector<int> > GetLineCats(int);
     int SetLineCats(int, int, std::vector<int>, bool);
@@ -92,4 +107,3 @@ public:
 };
 
 #endif /* WXVDIGIT_DIGIT_H */
-

gui/wxpython/vdigit/driver.h

@@ -20,6 +20,7 @@
 
 #include <wx/dc.h>
 #include <wx/list.h>
+#include <wx/string.h>
 
 #include <Python.h>
 #include <wx/wxPython/pseudodc.h>

gui/wxpython/vdigit/line.cpp

@@ -50,11 +50,17 @@ int Digit::AddLine(int type, std::vector<double> coords, int layer, int cat,
     int nbgmaps;             /* number of registrated background maps */
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
     npoints = coords.size() / (Vect_is_3d(display->mapInfo) ? 3 : 2);
     if (coords.size() != npoints * (Vect_is_3d(display->mapInfo) ? 3 : 2)) {
+	wxString msg;
+	msg.Printf(_("Incorrent number of points (%d)"), coords.size());
+	wxMessageDialog dlg(parentWin, msg,
+			    msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+	dlg.ShowModal();
 	return -1;
     }
 
@@ -63,6 +69,7 @@ int Digit::AddLine(int type, std::vector<double> coords, int layer, int cat,
 
     /* TODO: 3D */
     if (!(type & (GV_POINTS | GV_LINES))) {
+	Only2DMsg();
 	return -1;
     }
 
@@ -71,6 +78,7 @@ int Digit::AddLine(int type, std::vector<double> coords, int layer, int cat,
     if (bgmap && strlen(bgmap) > 0) {
 	BgMap = OpenBackgroundVectorMap(bgmap);
 	if (!BgMap) {
+	    BackgroundMapMsg(bgmap);
 	    return -1;
 	}
 	else {
@@ -121,6 +129,7 @@ int Digit::AddLine(int type, std::vector<double> coords, int layer, int cat,
 
     newline = Vect_write_line(display->mapInfo, type, Points, Cats);
     if (newline < 0) {
+	WriteLineMsg();
 	return -1;
     }
 
@@ -204,11 +213,13 @@ int Digit::RewriteLine(int line, std::vector<double> coords,
     int nbgmaps;             /* number of registrated background maps */
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
     /* line alive ? */
     if (!Vect_line_alive(display->mapInfo, line)) {
+	WriteLineMsg();
 	return -1;
     }
 
@@ -217,6 +228,7 @@ int Digit::RewriteLine(int line, std::vector<double> coords,
     if (bgmap && strlen(bgmap) > 0) {
 	BgMap = OpenBackgroundVectorMap(bgmap);
 	if (!BgMap) {
+	    BackgroundMapMsg(bgmap);
 	    return -1;
 	}
 	else {
@@ -301,6 +313,7 @@ int Digit::SplitLine(double x, double y, double z,
     struct ilist *list;
 
     if (!display->mapInfo)
+	DisplayMsg();
 	return -1;
 
     point = Vect_new_line_struct();
@@ -344,22 +357,21 @@ int Digit::DeleteLines(bool delete_records)
     // struct ilist *List;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
     n_dblinks = Vect_get_num_dblinks(display->mapInfo);
     Cats_del = NULL;
-    // List = NULL;
-
+    
     /* collect categories if needed */
     if (delete_records) {
 	Cats = Vect_new_cats_struct();
-	// List = Vect_new_list();
 	Cats_del = Vect_new_cats_struct();
 	for (int i = 0; i < display->selected.values->n_values; i++) {
 	    if (Vect_read_line(display->mapInfo, NULL, Cats, display->selected.values->value[i]) < 0) {
 		Vect_destroy_cats_struct(Cats_del);
-		//Vect_destroy_list(List);
+		ReadLineMsg(display->selected.values->value[i]);
 		return -1;
 	    }
 	    for (int j = 0; j < Cats->n_cats; j++) {
@@ -403,17 +415,20 @@ int Digit::DeleteLines(bool delete_records)
 	for (int dblink = 0; dblink < n_dblinks; dblink++) {
 	    fi = Vect_get_dblink(display->mapInfo, dblink);
 	    if (fi == NULL) {
+		DblinkMsg(dblink+1);
 		return -1;
 	    }
 
 	    driver = db_start_driver(fi->driver);
 	    if (driver == NULL) {
+		DbDriverMsg(fi->driver);
 		return -1;
 	    }
 
 	    db_init_handle (&handle);
 	    db_set_handle (&handle, fi->database, NULL);
 	    if (db_open_database(driver, &handle) != DB_OK) {
+		DbDatabaseMsg(fi->driver, fi->database);
 		return -1;
 	    }
 
@@ -437,6 +452,7 @@ int Digit::DeleteLines(bool delete_records)
 
 	    if (n_cats &&
 		db_execute_immediate (driver, &stmt) != DB_OK ) {
+		DbExecuteMsg(db_get_string(&stmt));
 		return -1;
 	    }
 	    
@@ -451,12 +467,7 @@ int Digit::DeleteLines(bool delete_records)
     if (Cats_del) {
 	Vect_destroy_cats_struct(Cats_del);
     }
-
-    /*
-    if(List) {
-	Vect_destroy_list(List);
-    }
-    */
+    
     return ret;
 }
 
@@ -481,6 +492,7 @@ int Digit::MoveLines(double move_x, double move_y, double move_z,
     int nbgmaps;             /* number of registrated background maps */
 
     if (!display->mapInfo)
+	DisplayMsg();
 	return -1;
 
     BgMap = NULL;
@@ -488,6 +500,7 @@ int Digit::MoveLines(double move_x, double move_y, double move_z,
     if (bgmap && strlen(bgmap) > 0) {
 	BgMap = OpenBackgroundVectorMap(bgmap);
 	if (!BgMap) {
+	    BackgroundMapMsg(bgmap);
 	    return -1;
 	}
 	else {
@@ -535,6 +548,7 @@ int Digit::FlipLines()
     long int nlines;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -570,6 +584,7 @@ int Digit::MergeLines()
     int ret, changeset, line;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -616,6 +631,7 @@ int Digit::BreakLines()
     int ret, changeset, line;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -663,6 +679,7 @@ int Digit::BreakLines()
 int Digit::SnapLines(double thresh)
 {
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -684,6 +701,7 @@ int Digit::ConnectLines(double thresh)
     long int nlines_diff;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -731,6 +749,7 @@ int Digit::ZBulkLabeling(double x1, double y1, double x2, double y2,
     int ret;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -760,6 +779,7 @@ int Digit::CopyLines(std::vector<int> ids, const char* bgmap_name)
     list = NULL;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -873,6 +893,7 @@ int Digit::TypeConvLines()
     int changeset, nlines_diff;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 

gui/wxpython/vdigit/message.cpp

@@ -0,0 +1,186 @@
+/**
+   \file message.cpp
+
+   \brief Error message dialogs
+
+   This program is free software under the GNU General Public
+   License (>=v2). Read the file COPYING that comes with GRASS
+   for details.
+
+   (C) 2008 by The GRASS development team
+
+   \author Martin Landa <landa.martin gmail.com>
+
+   \date 2008 
+*/
+
+#include "driver.h"
+#include "digit.h"
+
+/**
+   \brief Error message - no display driver available
+*/
+void Digit::DisplayMsg(void)
+{
+    wxMessageDialog dlg(parentWin, _("Display driver not available."),
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+
+    return;
+}
+
+/**
+   \brief Error message - cannot edit 3d features
+*/
+void Digit::Only2DMsg(void)
+{
+    wxMessageDialog dlg(parentWin, _("3D vector features are not currently supported."),
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+/**
+   \brief Error message - unable to write line
+*/
+void Digit::WriteLineMsg(void)
+{
+    wxMessageDialog dlg(parentWin, _("Unable to write new line"),
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+/**
+   \brief Error message - unable to read line
+
+   \param line line id
+*/
+void Digit::ReadLineMsg(int line)
+{
+    wxString msg;
+    msg.Printf(_("Unable to read line %d"), line);
+    wxMessageDialog dlg(parentWin, msg,
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+/**
+   \brief Error message - trying to read dead line
+
+   \param line line id
+*/
+void Digit::DeadLineMsg(int line)
+{
+    wxString msg;
+    msg.Printf(_("Unable to read line %d, line is dead"), line);
+    wxMessageDialog dlg(parentWin, msg,
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+/**
+   \brief Error message - unable to open background map
+
+   \param bgmap map name
+*/
+void Digit::BackgroundMapMsg(const char *bgmap)
+{
+    wxString msg;
+    msg.Printf(_("Unable to open background vector map <%s>. "
+		 "Please check digitizer settings."),
+	       wxString (bgmap, wxConvUTF8).c_str());
+    wxMessageDialog dlg(parentWin, msg,
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+/**
+   \brief Error message - dblink not defined
+
+   \param layer layer id
+*/
+void Digit::DblinkMsg(int layer)
+{
+    wxString msg;
+    msg.Printf(_("Database connection not defined for layer %d"), layer);
+    wxMessageDialog dlg(parentWin, msg,
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+/**
+   \brief Error message - unable to start driver
+
+   \param driver driver name
+*/
+void Digit::DbDriverMsg(const char *driver)
+{
+    wxString msg;
+    msg.Printf(_("Unable to start driver <%s>"), driver);
+    wxMessageDialog dlg(parentWin, msg,
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+/**
+   \brief Error message - unable to open database
+
+   \param driver driver name
+   \param database database name
+*/
+void Digit::DbDatabaseMsg(const char *driver, const char *database)
+{
+    wxString msg;
+    msg.Printf(_("Unable to open database <%s> by driver <%s>"),
+	       database, driver);
+    wxMessageDialog dlg(parentWin, msg,
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+/**
+   \brief Error message - unable to execute SQL command
+
+   \param sql sql command
+*/
+void Digit::DbExecuteMsg(const char *sql)
+{
+    wxString msg;
+    msg.Printf(_("Unable to execute: '%s'"), sql);
+    wxMessageDialog dlg(parentWin, msg,
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}
+
+	wxString msg;
+/**
+   \brief Error message - unable to get line categories
+
+   \param line line id
+*/
+void Digit::GetLineCatsMsg(int line)
+{
+    msg.Printf(_("Unable to get feature categories"), line);
+    wxMessageDialog dlg(parentWin, msg,
+			msgCaption, wxOK | wxICON_ERROR | wxCENTRE);
+    dlg.ShowModal();
+    
+    return;
+}

gui/wxpython/vdigit/select.cpp

@@ -49,6 +49,7 @@ std::vector<int> Digit::SelectLinesByQuery(double x1, double y1, double z1,
     struct line_pnts *bbox;
 
     if (!display->mapInfo) {
+	DisplayDriver();
 	return ids;
     }
 

gui/wxpython/vdigit/undo.cpp

@@ -163,6 +163,7 @@ int Digit::AddActionToChangeset(int changeset, Digit::action_type type, int line
     struct line_cats *Cats;
 
     if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
     }
 
@@ -171,6 +172,7 @@ int Digit::AddActionToChangeset(int changeset, Digit::action_type type, int line
 
     /* do copy */
     if (!Vect_line_alive(display->mapInfo, line))
+	DeadLineMsg(line);
 	return -1;
 
     ltype = Vect_read_line(display->mapInfo, Points, Cats, line);

gui/wxpython/vdigit/vertex.cpp

@@ -44,8 +44,10 @@ int Digit::MoveVertex(double x, double y, double z,
     struct Map_info **BgMap; /* backgroud vector maps */
     int nbgmaps;             /* number of registrated background maps */
 
-    if (!display->mapInfo)
+    if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
+    }
 
     if (display->selected.values->n_values != 1)
 	return 0;
@@ -55,6 +57,7 @@ int Digit::MoveVertex(double x, double y, double z,
     if (bgmap && strlen(bgmap) > 0) {
 	BgMap = OpenBackgroundVectorMap(bgmap);
 	if (!BgMap) {
+	    BackgroundMapMsg(bgmap);
 	    return -1;
 	}
 	else {
@@ -111,8 +114,10 @@ int Digit::ModifyLineVertex(int add, double x, double y, double z,
     int ret;
     struct line_pnts *point;
 
-    if (!display->mapInfo)
+    if (!display->mapInfo) {
+	DisplayMsg();
 	return -1;
+    }
 
     if (display->selected.values->n_values != 1)
 	return 0;

gui/wxpython/wxgui.py

@@ -962,8 +962,8 @@ class GMFrame(wx.Frame):
         Init histogram display canvas and tools
         """
         self.histogram = histogram.HistFrame(self,
-                                           id=wx.ID_ANY, pos=wx.DefaultPosition, size=(400,300),
-                                           style=wx.DEFAULT_FRAME_STYLE)
+                                             id=wx.ID_ANY, pos=wx.DefaultPosition, size=(400,300),
+                                             style=wx.DEFAULT_FRAME_STYLE)
 
         #show new display
         self.histogram.Show()