From 95a7bfcc476455bbd5bde979da82c169831b577c Mon Sep 17 00:00:00 2001 From: Tomas Zigo Date: Sun, 12 Jun 2022 07:05:10 +0200 Subject: [PATCH] wxGUI/dbmgr: show warning message dialog if new layer table link exists --- gui/wxpython/dbmgr/base.py | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/gui/wxpython/dbmgr/base.py b/gui/wxpython/dbmgr/base.py index 83b9b878cb0..011507d275e 100644 --- a/gui/wxpython/dbmgr/base.py +++ b/gui/wxpython/dbmgr/base.py @@ -3725,29 +3725,34 @@ def OnAddLayer(self, event): table=table, key=key, layer=layer, + getErrorMsg=True, ) - # insert records into table if required - if self.addLayerWidgets["addCat"][0].IsChecked(): - RunCommand( - "v.to.db", - parent=self, - quiet=True, - map=self.mapDBInfo.map, - layer=layer, - qlayer=layer, - option="cat", - columns=key, - overwrite=True, - ) - - if ret == 0: + if ret[0] == 0 and not ret[1]: + # insert records into table if required + if self.addLayerWidgets["addCat"][0].IsChecked(): + RunCommand( + "v.to.db", + parent=self, + quiet=True, + map=self.mapDBInfo.map, + layer=layer, + qlayer=layer, + option="cat", + columns=key, + overwrite=True, + ) # update dialog (only for new layer) self.parentDialog.parentDbMgrBase.UpdateDialog(layer=layer) # update db info self.mapDBInfo = self.parentDialog.dbMgrData["mapDBInfo"] # increase layer number layerWin.SetValue(layer + 1) + elif ret[1]: + GWarning( + parent=self, + message=ret[1], + ) if len(self.mapDBInfo.layers.keys()) == 1: # first layer add --- enable previously disabled widgets