Porting to Paraview 3.98.1

diff --git a/getwrapclasses.py b/getwrapclasses.py
index db2b747cc8f7a9e8d3a629ae11908e5deb92ef30..076806d06306efcab9c44ce4a52535b561d86863 100644 (file)
--- a/getwrapclasses.py
+++ b/getwrapclasses.py
@@ -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
 

diff --git a/idl/vtkWrapIDL.c b/idl/vtkWrapIDL.c
index 784bb0728f70ed5426496c17fe5c8fde4fc4369e..9b1213980d8d7f33dd0588b35572f379d0dd927b 100644 (file)
--- a/idl/vtkWrapIDL.c
+++ b/idl/vtkWrapIDL.c
@@ -192,6 +192,10 @@ void AddCharAtomArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
   AddAtomArg(I,Type,"char","Char",Result,CurrPos);
 }
 
+void AddCharArrayArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
+  AddArrayArg(I,Type,"char",Result,CurrPos);
+}
+
 void AddStringArg(int I, char *Result, int *CurrPos) {
 #if defined(IDL_I_HH) || defined(IDL_I_CC)
   add_to_sig(Result,"char ",CurrPos);
@@ -242,11 +246,22 @@ int IsvtkIdType(ValueInfo* theType) {
 int IsShort(ValueInfo* theType) {
   //return ((Type % 0x10) == 0x4 || (Type % 0x10) == 0x5 || (Type % 0x10) == 0xA);
   int aVal = theType->Type & VTK_PARSE_BASE_TYPE;
-  return (aVal == VTK_PARSE_SHORT) || (aVal == VTK_PARSE_INT) || 
-    (aVal == VTK_PARSE_ID_TYPE) || (aVal == VTK_PARSE_UNSIGNED_INT) || (aVal == VTK_PARSE_UNSIGNED_SHORT) ||
+  return (aVal == VTK_PARSE_SHORT) || (aVal == VTK_PARSE_UNSIGNED_SHORT);
+}
+
+int IsInt(ValueInfo* theType) {
+  //return ((Type % 0x10) == 0x4 || (Type % 0x10) == 0x5 || (Type % 0x10) == 0xA);
+  int aVal = theType->Type & VTK_PARSE_BASE_TYPE;
+  return (aVal == VTK_PARSE_INT) || 
+    (aVal == VTK_PARSE_ID_TYPE) || (aVal == VTK_PARSE_UNSIGNED_INT) ||
     (aVal == VTK_PARSE_SSIZE_T) || (aVal == VTK_PARSE_SIZE_T);
 }
 
+int IsShortInt(ValueInfo* theType) {
+  //return ((Type % 0x10) == 0x4 || (Type % 0x10) == 0x5 || (Type % 0x10) == 0xA);
+  return (IsShort(theType) || IsInt(theType));
+}
+
 void AddShortAtomArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
   AddAtomArg(I,Type,"short","Short",Result,CurrPos);
 }
@@ -255,6 +270,10 @@ int IsShortArray(ValueInfo* Type) {
   return (IsShort(Type) && IsArray(Type));
 }
 
+int IsIntArray(ValueInfo* Type) {
+  return (IsInt(Type) && IsArray(Type));
+}
+
 void AddShortArrayArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
   AddArrayArg(I,Type,"short",Result,CurrPos);
 }
@@ -347,7 +366,7 @@ void AddVoidArg(int I, char *Result, int *CurrPos, ValueInfo* Type) {
 }
 
 void AddTypeArray(ValueInfo* Type, char *Result, int *CurrPos) {
-  if(IsShort(Type))
+  if(IsShortInt(Type))
     add_to_sig(Result,"short",CurrPos);
   if(IsLong(Type))
     add_to_sig(Result,"long",CurrPos);
@@ -394,7 +413,7 @@ void output_type(char* result, int *currPos, int i, ValueInfo* aType, const char
     }
   }
   
-  if(IsShort(aType)) {
+  if(IsShortInt(aType)) {
     if(IsArray(aType)) {
       if (IsUnsigned(aType))
         add_to_sig(result,"unsigned ",currPos);
@@ -427,7 +446,13 @@ void output_type(char* result, int *currPos, int i, ValueInfo* aType, const char
       add_to_sig(result,"char",currPos);
     }
   } else if(IsChar(aType)) {
-    add_to_sig(result,"CORBA::Char",currPos);      
+    if(IsArray(aType)) {
+      if (IsUnsigned(aType))
+        add_to_sig(result,"unsigned ",currPos);
+      add_to_sig(result,"char",currPos);
+    } else {
+      add_to_sig(result,"CORBA::Char",currPos);            
+    }
   }
   
   if(IsBoolean(aType)) {
@@ -503,8 +528,8 @@ void output_temp(char* result, int *currPos, int i, ValueInfo* aType, const char
     }
   }
 
-  if(IsShort(aType)) {
-    if(IsShortArray(aType)) {
+  if(IsShortInt(aType)) {
+    if(IsArray(aType)) {
       AddShortArrayArg(i,aType,result,currPos);
     } else {
       AddShortAtomArg(i,aType,result,currPos);
@@ -523,7 +548,11 @@ void output_temp(char* result, int *currPos, int i, ValueInfo* aType, const char
     if(IsString(aType)) {
       AddStringArg(i,result,currPos);
     } else {
-      AddCharAtomArg(i,aType,result,currPos);
+      if(IsCharArray(aType)) {
+       AddCharArrayArg(i,aType,result,currPos);
+      } else {
+       AddCharAtomArg(i,aType,result,currPos);
+      }
     }
   } else if (IsString(aType)) //!!! VSV
     AddStringArg(i,result,currPos);
@@ -862,7 +891,7 @@ void get_signature(const char* num, ClassInfo *data)
     if(IsClass(aArgVal) && IsPtr(aArgVal)) {
       add_to_sig(result,"*",&currPos);  
     }
-    if (IsString(aArgVal) && IsConst(aArgVal))
+    if (IsString(aArgVal) && IsConst(aArgVal) && strcmp(aArgVal->Class, "vtkStdString") != 0)
       sprintf(buf,"checkNullStr(myParam%d)",i);
     else
       sprintf(buf,"myParam%d",i);
@@ -939,12 +968,18 @@ void get_signature(const char* num, ClassInfo *data)
       if(IsDouble(aArgVal))
         add_to_sig(result,"double",&currPos);
       
+      if(IsChar(aArgVal)) {
+       if (IsUnsigned(aArgVal))
+         add_to_sig(result,"unsigned ",&currPos);
+        add_to_sig(result,"char",&currPos);
+      }
+
       if(IsvtkIdType(aArgVal)) {
         if (IsUnsigned(aArgVal))
           add_to_sig(result,"unsigned ",&currPos);
         add_to_sig(result,"vtkIdType",&currPos);
       } else {
-        if(IsShort(aArgVal)) {
+        if(IsShortInt(aArgVal)) {
           if (IsUnsigned(aArgVal))
             add_to_sig(result,"unsigned ",&currPos);
           add_to_sig(result,"int",&currPos);
@@ -965,12 +1000,18 @@ void get_signature(const char* num, ClassInfo *data)
       if(IsDouble(aArgVal))
         add_to_sig(result,"double",&currPos);
       
+      if(IsChar(aArgVal)) {
+       if (IsUnsigned(aArgVal))
+         add_to_sig(result,"unsigned ",&currPos);
+        add_to_sig(result,"char",&currPos);
+      }
+
       if(IsvtkIdType(aArgVal)) {
         if (IsUnsigned(aArgVal))
           add_to_sig(result,"unsigned ",&currPos);
         add_to_sig(result,"vtkIdType",&currPos);
       } else {
-        if(IsShort(aArgVal)) {
+        if(IsShortInt(aArgVal)) {
           if (IsUnsigned(aArgVal))
             add_to_sig(result,"unsigned ",&currPos);
           add_to_sig(result,"int",&currPos);
@@ -1042,12 +1083,16 @@ void get_signature(const char* num, ClassInfo *data)
     }
   }
   
-  if(IsShort(aRetVal)) {
+  if(IsShortInt(aRetVal)) {
     if(IsArray(aRetVal)) {
       if(IsvtkIdType(aRetVal)) {
         add_to_sig(result,"vtkIdType",&currPos);
       } else {
-        add_to_sig(result,"int",&currPos);
+       if(IsShort(aRetVal)) {
+         add_to_sig(result,"short",&currPos);
+       } else {
+         add_to_sig(result,"int",&currPos);
+       }
       }
       add_to_sig(result,"* a_ret = ",&currPos);
     } else {

diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
index 548982eb98804300a047879b500a58e073cba027..fa3cfb7ebd0884bcad05ac4bfe58f3d22551c033 100644 (file)
--- a/src/PVGUI/PVGUI_Module.cxx
+++ b/src/PVGUI/PVGUI_Module.cxx
@@ -417,6 +417,9 @@ void PVGUI_Module::initialize( CAM_Application* app )
     pvCreateToolBars();
     pvCreateMenus();
 
+    QList<QDockWidget*> activeDocks = aDesktop->findChildren<QDockWidget*>();
+    QList<QMenu*> activeMenus = aDesktop->findChildren<QMenu*>();
+
     // new pqParaViewBehaviors(anApp->desktop(), this);
     // Has to be replaced in order to exclude using of pqQtMessageHandlerBehaviour
     //  Start pqParaViewBehaviors
@@ -465,6 +468,24 @@ void PVGUI_Module::initialize( CAM_Application* app )
       pqApplicationCore::instance(), SLOT(quickLaunch()));
     //  End pqParaViewBehaviors
 
+    // Find Plugin Dock Widgets
+    QList<QDockWidget*> currentDocks = aDesktop->findChildren<QDockWidget*>();
+    QList<QDockWidget*>::iterator i;
+    for (i = currentDocks.begin(); i != currentDocks.end(); ++i) {
+      if(!activeDocks.contains(*i)) {
+       myDockWidgets[*i] = false; // hidden by default
+       (*i)->hide();
+      }
+    }
+
+    // Find Plugin Menus
+    QList<QMenu*> currentMenus = aDesktop->findChildren<QMenu*>();
+    QList<QMenu*>::iterator im;
+    for (im = currentMenus.begin(); im != currentMenus.end(); ++im) {
+      if(!activeMenus.contains(*im)) {
+       myMenus.append(*im);
+      }
+    }
 
     SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
     QString aPath = resMgr->stringValue("resources", "PARAVIS", QString());
@@ -848,15 +869,22 @@ bool PVGUI_Module::activateModule( SUIT_Study* study )
 
   restoreDockWidgetsState();
 
-   QMenu* aMenu = menuMgr()->findMenu( myRecentMenuId );
-   if(aMenu) {
-      QList<QAction*> anActns = aMenu->actions();
-      for (int i = 0; i < anActns.size(); ++i) {
-             QAction* a = anActns.at(i);
-        if(a)
-           a->setVisible(true);
-      }
+  QMenu* aMenu = menuMgr()->findMenu( myRecentMenuId );
+  if(aMenu) {
+    QList<QAction*> anActns = aMenu->actions();
+    for (int i = 0; i < anActns.size(); ++i) {
+      QAction* a = anActns.at(i);
+      if(a)
+       a->setVisible(true);
     }
+  }
+
+  QList<QMenu*>::iterator it;
+  for (it = myMenus.begin(); it != myMenus.end(); ++it) {
+    QAction* a = (*it)->menuAction();
+    if(a)
+      a->setVisible(true);
+  }
 
   if ( myRecentMenuId != -1 ) menuMgr()->show(myRecentMenuId);
 
@@ -874,15 +902,22 @@ bool PVGUI_Module::activateModule( SUIT_Study* study )
 */
 bool PVGUI_Module::deactivateModule( SUIT_Study* study )
 {
-   QMenu* aMenu = menuMgr()->findMenu( myRecentMenuId );
-   if(aMenu) {
-      QList<QAction*> anActns = aMenu->actions();
-      for (int i = 0; i < anActns.size(); ++i) {
-             QAction* a = anActns.at(i);
-        if(a)
-          a->setVisible(false);
-      }
+  QMenu* aMenu = menuMgr()->findMenu( myRecentMenuId );
+  if(aMenu) {
+    QList<QAction*> anActns = aMenu->actions();
+    for (int i = 0; i < anActns.size(); ++i) {
+      QAction* a = anActns.at(i);
+      if(a)
+       a->setVisible(false);
     }
+  }
+
+  QList<QMenu*>::iterator it;
+  for (it = myMenus.begin(); it != myMenus.end(); ++it) {
+    QAction* a = (*it)->menuAction();
+    if(a)
+      a->setVisible(false);
+  }
 
   QList<QDockWidget*> aStreamingViews = application()->desktop()->findChildren<QDockWidget*>("pqStreamingControls");
   foreach(QDockWidget* aView, aStreamingViews) {

diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h
index 7fe0bf3a043f6494bcf197cc85f603ef123a0ddf..cece9bbf8bf343184a03c0dad663281e650463ae 100644 (file)
--- a/src/PVGUI/PVGUI_Module.h
+++ b/src/PVGUI/PVGUI_Module.h
@@ -269,6 +269,7 @@ private:
   WgMap                  myDockWidgets;
   WgMap                  myToolbars;
   WgMap                  myToolbarBreaks;
+  QList<QMenu*>          myMenus;
 
   QStringList            myTemporaryFiles;
 

diff --git a/test/VisuPrs/Animation/C8.py b/test/VisuPrs/Animation/C8.py
index 00c53e4b96fb3c379d6699cb363e11cc5fb53561..d92d97dcc5efff42adbb4458bec38caf5eea9ad2 100644 (file)
--- a/test/VisuPrs/Animation/C8.py
+++ b/test/VisuPrs/Animation/C8.py
@@ -53,7 +53,7 @@ if aView is None : print "Error"
 else : print "OK"
 
 # Gauss Points  creation
-prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 1 ,  theMultiplier=0.01)
+prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 1 ,  multiplier=0.01)
 prs.Visibility=1
 aView.ResetCamera()
 print "Creating an Animation.....................",

diff --git a/test/VisuPrs/Animation/D1.py b/test/VisuPrs/Animation/D1.py
index d7e40b5624cc2eacc018be1199247a1adde60484..88748a04a2b2dd2326506726b6dd9e462f267699 100644 (file)
--- a/test/VisuPrs/Animation/D1.py
+++ b/test/VisuPrs/Animation/D1.py
@@ -54,7 +54,7 @@ if aView is None : print "Error"
 else : print "OK"
 
 # Gauss Points  creation
-prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 2,  theMultiplier=0.01)
+prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 2,  multiplier=0.01)
 prs.Visibility=1
 aView.ResetCamera()
 print "Creating an Animation.....................",

diff --git a/test/VisuPrs/Animation/D2.py b/test/VisuPrs/Animation/D2.py
index e67b6bdfa56f6f59c974407aaa7d36fdd4f93c48..d7f5bd438ef5cb56cf9fb7d7938b0a19f3662166 100644 (file)
--- a/test/VisuPrs/Animation/D2.py
+++ b/test/VisuPrs/Animation/D2.py
@@ -53,7 +53,7 @@ if aView is None : print "Error"
 else : print "OK"
 
 # Gauss Points  creation
-prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 2,  theMultiplier=0.01)
+prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 2,  multiplier=0.01)
 prs.Visibility=1
 aView.ResetCamera()
 print "Creating an Animation.....................",

diff --git a/test/VisuPrs/Util/paravistesthelper.py b/test/VisuPrs/Util/paravistesthelper.py
index 14fa7c8ca1a5e00c8184b9d32283f07d11712e2a..67611a4b66db282cc153a8e3bb256fb6b4425eb5 100644 (file)
--- a/test/VisuPrs/Util/paravistesthelper.py
+++ b/test/VisuPrs/Util/paravistesthelper.py
@@ -2,6 +2,7 @@ import searchFreePort
 import subprocess
 import sys
 import signal
+import killSalomeWithPort
 
 args = {}
 searchFreePort.searchFreePort(args)
@@ -9,10 +10,18 @@ port = args['port']
 
 def timeout_handler(signum, frame):
     print "FAILED : timeout(" + sys.argv[1] + ") is reached"
-    import killSalomeWithPort
     killSalomeWithPort.killMyPort(port)
+    exit(1)
 
 signal.alarm(abs(int(sys.argv[1])-10))
 signal.signal(signal.SIGALRM, timeout_handler)
 
-subprocess.check_call([sys.executable]+sys.argv[2:])
+res = 1
+try:
+    res = subprocess.check_call([sys.executable]+sys.argv[2:])
+except:
+    pass
+
+killSalomeWithPort.killMyPort(port)
+
+exit(res)