Fix remarks related to the "0021709: [CEA 583] Toolbar preferences" issue.

[modules/paravis.git] / getwrapclasses.py

diff --git a/getwrapclasses.py b/getwrapclasses.py
index db2b747cc8f7a9e8d3a629ae11908e5deb92ef30..5981372c0f2fcde5319eaf497d2835e3da6ce6ef 100644 (file)
--- a/getwrapclasses.py
+++ b/getwrapclasses.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -35,6 +35,22 @@ from vtkPVServerManagerApplicationPython import *
 from vtkPVServerManagerCorePython import *
 from vtkPVServerManagerDefaultPython import *
 from vtkPVServerManagerRenderingPython import *
+try:
+    from vtkPVVTKExtensionsCorePython import *
+except:
+    pass
+try:
+    from vtkPVVTKExtensionsDefaultPython import *
+except:
+    pass
+try:
+    from vtkPVVTKExtensionsRenderingPython import *
+except:
+    pass
+try:
+    from vtkPVVTKExtensionsWebGLExporterPython import *
+except:
+    pass
 
 l1 = dir()
 for a in l1:
@@ -72,21 +88,21 @@ while len(pv_classes_new):
                     m=re.match('\s*class\s+(vtk\w+)\s*;',line)
                     if m is not None:
                         cn=m.group(1)
-                        if cn not in dic.keys() and cn not in pv_classes_new and cn in classeslistvtk:
+                        if cn not in dic.keys() and cn not in pv_classes_new and cn in classeslistvtk and issubclass(globals()[cn], vtkObjectBase):
                             pv_classes_new.append(cn)
                             continue
 
                     m=re.match('\s*struct\s+(vtk\w+)\s*;',line)
                     if m is not None:
                         cn=m.group(1)
-                        if cn not in dic.keys() and cn not in pv_classes_new and cn in classeslistvtk:
+                        if cn not in dic.keys() and cn not in pv_classes_new and cn in classeslistvtk and issubclass(globals()[cn], vtkObjectBase):
                             pv_classes_new.append(cn)
                             continue
 
                     m=re.match('\s*#include\s+"(vtk\w+)\.h"',line)
                     if m is not None:
                         cn=m.group(1)
-                        if cn not in dic.keys() and cn not in pv_classes_new and cn in classeslistvtk:
+                        if cn not in dic.keys() and cn not in pv_classes_new and cn in classeslistvtk and issubclass(globals()[cn], vtkObjectBase):
                             pv_classes_new.append(cn)
                             continue