Parcourir la source

Fail gracefully when wxnviz is not available
(merge from relbr64, https://trac.osgeo.org/grass/changeset/35430)


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

Martin Landa il y a 16 ans
Parent
commit
626388fef2
1 fichiers modifiés avec 8 ajouts et 7 suppressions
  1. 8 7
      gui/wxpython/gui_modules/nviz.py

+ 8 - 7
gui/wxpython/gui_modules/nviz.py

@@ -32,15 +32,16 @@ except ImportError, e:
 
 import globalvar
 try:
-    sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-    import grass7_wxnviz as wxnviz
+    import nviz_mapdisp
+    import nviz_tools
     haveNviz = True
 except ImportError, e:
     haveNviz = False
     errorMsg = e
 
-import nviz_mapdisp
-import nviz_tools
-
-GLWindow = nviz_mapdisp.GLWindow
-NvizToolWindow = nviz_tools.NvizToolWindow
+if haveNviz:
+    GLWindow = nviz_mapdisp.GLWindow
+    NvizToolWindow = nviz_tools.NvizToolWindow
+else:
+    GLWindow = None
+    NvizToolWindow = None