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

[modules/paravis.git] / idl / vtkWrapIDL.c

diff --git a/idl/vtkWrapIDL.c b/idl/vtkWrapIDL.c
index 784bb0728f70ed5426496c17fe5c8fde4fc4369e..60385a428c11e5f6dfe518ac80b8bcb0e9d7dbab 100644 (file)
--- a/idl/vtkWrapIDL.c
+++ b/idl/vtkWrapIDL.c
@@ -1,6 +1,6 @@
 // PARAVIS : ParaView wrapper SALOME module
 //
-// 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
@@ -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 {
@@ -1325,6 +1370,16 @@ void outputFunction2(FILE *fp, ClassInfo *data)
     fprintf(fp,"#include \"PARAVIS_Gen_%s_i.hh\"\n",data->SuperClasses[i]);
   }
 
+  //RNV: to avoid link error on windows via Visual Studio
+  //undef GetObject macro.
+  if( strcmp(data->Name, "vtkWebGLExporter") == 0 ) {
+    fprintf(fp,"#ifdef WIN32\n");
+    fprintf(fp,"  #ifdef GetObject\n");
+    fprintf(fp,"    #undef GetObject\n");
+    fprintf(fp,"  #endif\n");
+    fprintf(fp,"#endif\n");
+  }
+
   fprintf(fp,"\nclass %s;\n",data->Name);
   fprintf(fp,"\nnamespace PARAVIS\n{\n\n");
 #elif defined(IDL_I_CC)