wxGUI/vnet: fix removing notebook page, wx layout assert error, missi…

…ng giface (#1822)
OSGeo · Aug 25, 2021 · b84fbc1 · b84fbc1
1 parent 17f047a
commit b84fbc1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/gui/wxpython/dbmgr/base.py b/gui/wxpython/dbmgr/base.py
@@ -1384,14 +1384,18 @@ def OnSqlQuerySize(self, event, layer):
 
         if sqlReduce:
             self.layerPage[layer]["sqlIsReduced"] = True
-            sqlSimpleSizer.AddGrowableCol(0)
-            sqlSimpleSizer.RemoveGrowableCol(1)
+            if not sqlSimpleSizer.IsColGrowable(0):
+                sqlSimpleSizer.AddGrowableCol(0)
+            if sqlSimpleSizer.IsColGrowable(1):
+                sqlSimpleSizer.RemoveGrowableCol(1)
             sqlSimpleSizer.SetItemPosition(wherePanel, (1, 0))
             sqlSimpleSizer.SetItemPosition(btnApply, (1, 1))
         else:
             self.layerPage[layer]["sqlIsReduced"] = False
-            sqlSimpleSizer.AddGrowableCol(1)
-            sqlSimpleSizer.RemoveGrowableCol(0)
+            if not sqlSimpleSizer.IsColGrowable(1):
+                sqlSimpleSizer.AddGrowableCol(1)
+            if sqlSimpleSizer.IsColGrowable(0):
+                sqlSimpleSizer.RemoveGrowableCol(0)
             sqlSimpleSizer.SetItemPosition(wherePanel, (0, 1))
             sqlSimpleSizer.SetItemPosition(btnApply, (0, 2))
 

diff --git a/gui/wxpython/vnet/dialogs.py b/gui/wxpython/vnet/dialogs.py
@@ -582,9 +582,9 @@ def _updateResultDbMgrPage(self):
                 name="resultDbMgr",
             )
         elif not haveDbMgr:
-            self.notebook.RemovePage(
-                page=self.notebook.GetPageIndexByName("resultDbMgr")
-            )
+            page = self.notebook.GetPageIndexByName("resultDbMgr")
+            if page != -1:
+                self.notebook.RemovePage(page=page)
 
     def OnPageChanged(self, event):
         """Tab switched"""

diff --git a/gui/wxpython/vnet/vnet_core.py b/gui/wxpython/vnet/vnet_core.py
@@ -47,7 +47,7 @@ def __init__(self, guiparent, giface):
         self.giface = giface
         self.mapWin = giface.GetMapWindow()
 
-        self.goutput = GConsole(guiparent=guiparent)
+        self.goutput = GConsole(guiparent=guiparent, giface=self.giface)
 
         self.vnet_data = VNETData(guiparent=guiparent, mapWin=self.mapWin)