Merge from V6_main 13/12/2012

diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am
index 105565a7aa847429e613ef4066acb3833a733cce..d10fed3ea42bdbffa07b9d1cdad011586adb839d 100644 (file)
--- a/src/CONVERTOR/Makefile.am
+++ b/src/CONVERTOR/Makefile.am
@@ -89,7 +89,7 @@ libVisuConvertor_la_CPPFLAGS= \
 
 
 libVisuConvertor_la_LDFLAGS= \
-       $(MED3_LIBS) \
+       $(MED3_LIBS_C_ONLY) \
        $(BOOST_LIB_THREAD) \
        $(BOOST_LIB_DATE_TIME) \
        $(VTK_LIBS) \

diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc
index 7c7d8c67405123ad438d2b6e5c11362b4d878487..d8027799c49c3d9b6928b76dc06a745fc2907b64 100644 (file)
--- a/src/ENGINE/VISU_Engine_i.cc
+++ b/src/ENGINE/VISU_Engine_i.cc
@@ -561,4 +561,10 @@ namespace VISU{
   {
     return myVisuGen->LoadTexture(theTextureFile);
   }
+
+  /* Version information */
+  char* VISU_Gen_i::getVersion()
+  {
+    return myVisuGen->getVersion();
+  }
 };

diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh
index fa1371bda872e6f91446b4c6ed7c905fcc6e3ddb..77db49de64fafc3d2c24cf9bf87b59b0b9ff87dc 100644 (file)
--- a/src/ENGINE/VISU_Engine_i.hh
+++ b/src/ENGINE/VISU_Engine_i.hh
@@ -246,6 +246,8 @@ namespace VISU
                                         CORBA::Boolean theIsMultiFile,
                                         CORBA::Boolean& theIsValidScript);   
 
+    virtual char* getVersion();
+
     virtual
     VISU::ColoredPrs3dCache_ptr
     GetColoredPrs3dCache(SALOMEDS::Study_ptr theStudy);

diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index ce8589246cab233ccdae4257b7733e5f8074fd89..6b2cf35f29934b36c287f6de2b7df68a25f7d20a 100644 (file)
--- a/src/PIPELINE/Makefile.am
+++ b/src/PIPELINE/Makefile.am
@@ -132,7 +132,7 @@ libVisuPipeLine_la_LDFLAGS= \
        $(GUI_LDFLAGS) -lqtx -lsuit -lvtkTools \
        $(MED_LDFLAGS) \
        ../CONVERTOR/libVisuConvertor.la \
-       $(MED3_LIBS) \
+       $(MED3_LIBS_C_ONLY) \
        $(QT_LIBS) \
        $(OGL_LIBS)
 

diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts
index 40bcbdbb0de2049f03c23fb1492d55e651cc8d4b..792a7f3d2545dd557730c786162aa579aa76cf1d 100644 (file)
--- a/src/VISUGUI/VISU_msg_en.ts
+++ b/src/VISUGUI/VISU_msg_en.ts
@@ -673,7 +673,7 @@ Input value precision can be adjusted using
     </message>
     <message>
         <source>FLT_MED_FILES</source>
-        <translation>MED Files (*.med)</translation>
+        <translation>MED Files (*.*med)</translation>
     </message>
     <message>
         <source>FLT_SAUV_FILES</source>
@@ -1263,7 +1263,7 @@ Input value precision can be adjusted using
     </message>
     <message>
         <source>FLT_MED_FILES</source>
-        <translation>MED Files (*.med)</translation>
+        <translation>MED Files (*.*med)</translation>
     </message>
     <message>
         <source>FLT_SAUV_FILES</source>

diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am
index 851b7e5620ac6f21e986a3e1274ec70b846b3dec..f23aac5557b14db5e92ed46657d863176a667183 100644 (file)
--- a/src/VISU_I/Makefile.am
+++ b/src/VISU_I/Makefile.am
@@ -132,7 +132,8 @@ libVISUEngineImpl_la_CPPFLAGS= \
        -I$(srcdir)/../CONVERTOR \
        -I$(srcdir)/../PIPELINE \
        -I$(srcdir)/../OBJECT \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libVISUEngineImpl_la_LDFLAGS= \
        $(KERNEL_LDFLAGS) \

diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index 6180a5865747ddcb437cdafb43fc85784e826232..31b14b88ddf089adaf0a661ffaac1223cb329bb2 100644 (file)
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -1593,7 +1593,7 @@ namespace VISU
               bool withZ = aServant->GetZRow()>0;
               bool isV2 = aServant->GetIsV2();
               
-              theStr << thePrefix << "aName2ObjectMap['" << aName << "'] = visu.CreateCurve";
+              theStr << thePrefix << aName << " = visu.CreateCurve";
               if( isV2 )
                 theStr << "WithZExt";
               else if( withZ )
@@ -1636,6 +1636,8 @@ namespace VISU
                 case Curve::DASHDOTDOTLINE: aParam = "VISU.Curve.DASHDOTDOTLINE"; break;
               }
               theStr<<", "<<aParam<<", "<<aServant->GetLineWidth()<<")"<<endl; // line type,width
+             // Add to Name->Object map
+             theStr << thePrefix << "aName2ObjectMap['" << aName << "'] = " << aName << endl;
             }
             return;
           case VISU::TTABLE:
@@ -2427,33 +2429,31 @@ namespace VISU
                                 aStr,
                                 aPrefix);
     
-  if (theIsPublished)
-  {
-    SALOMEDS::AttributeParameter_var ap = aStudy->GetModuleParameters("Interface Applicative", "Post-Pro", -1);
-       if(!CORBA::is_nil(ap)) {
-      std::map<std::string,std::string>::iterator it = aEntry2NameMap.begin();
-      for( ;it != aEntry2NameMap.end(); it++ ) {
-        //1. Encode entry
-        if ( ((*it).first).length() < 7 ) continue;
-           std::string tail( (*it).first, 6, ((*it).first).length()-1 );
-           std::string newEntry(ComponentDataType());
-           newEntry+=("_"+tail);
-       
-           CORBA::String_var anEntry = CORBA::string_dup(newEntry.c_str());
+    if (theIsPublished) {
+      SALOMEDS::AttributeParameter_var ap = aStudy->GetModuleParameters("Interface Applicative", "Post-Pro", -1);
+      if (!CORBA::is_nil(ap)) {
+       std::map<std::string,std::string>::iterator it = aEntry2NameMap.begin();
+       for ( ;it != aEntry2NameMap.end(); it++ ) {
+         //1. Encode entry
+         if ( ((*it).first).length() < 7 ) continue;
+         std::string tail( (*it).first, 6 );
+         std::string newEntry(ComponentDataType());
+         newEntry = newEntry + "_" + tail;
+         
+         CORBA::String_var anEntry = CORBA::string_dup( newEntry.c_str() );
 
-        if( ap->IsSet(anEntry, 6) ) { //6 Means string array, see SALOMEDS_Attributes.idl AttributeParameter interface
-             std::string idCommand = std::string("visu.getObjectID(") + (*it).second + std::string(")");
-             SALOMEDS::StringSeq_var aSeq= ap->GetStrArray(anEntry);
-             int oldLenght = aSeq->length();   
-             aSeq->length(oldLenght+2);
-             aSeq[oldLenght] = CORBA::string_dup("_PT_OBJECT_ID_");
-             aSeq[oldLenght + 1] = CORBA::string_dup(idCommand.c_str());
-             ap->SetStrArray( anEntry, aSeq );
-           }
+         if ( ap->IsSet( anEntry.in(), 6 ) ) { //6 Means string array, see SALOMEDS_Attributes.idl AttributeParameter interface
+           std::string idCommand = std::string("visu.getObjectID(") + (*it).second + std::string(")");
+           SALOMEDS::StringSeq_var aSeq= ap->GetStrArray(anEntry);
+           int oldLenght = aSeq->length();     
+           aSeq->length(oldLenght+2);
+           aSeq[oldLenght] = CORBA::string_dup("_PT_OBJECT_ID_");
+           aSeq[oldLenght + 1] = CORBA::string_dup(idCommand.c_str());
+           ap->SetStrArray( anEntry, aSeq );
          }
        }
-  }
-    
+      }
+    }
     
     //Output the script that sets up the visul parameters.
     if(theIsPublished) {

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 8c2223024eca0236484a2177ecf9c18fe6e71340..c93ba092feac2368eea34c552ac65a4be5b80f70 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -25,6 +25,7 @@
 //  Author : Alexey PETROV
 //  Module : VISU
 
+#include "VISU_version.h"
 #include "VISU_Gen_i.hh"
 #include "VISU_Result_i.hh"
 #include "VISU_PrsObject_i.hh"
@@ -1876,4 +1877,14 @@ namespace VISU
 
     return aMarkerId;
   }
+
+  // Version information
+  char* VISU_Gen_i::getVersion()
+  {
+#if VISU_DEVELOPMENT
+    return CORBA::string_dup( VISU_VERSION_STR"dev" );
+#else
+    return CORBA::string_dup( VISU_VERSION_STR );
+#endif
+  }
 }

diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh
index 7513387d14f4d29e81c4d7c7fc84464479e8cad6..5d3f39d72f5db336dbb6b4b40ba95f99cbc13dcd 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.hh
+++ b/src/VISU_I/VISU_Gen_i.hh
@@ -394,6 +394,9 @@ namespace VISU
              CORBA::Long theObjectID,
              SALOMEDS::SObject_ptr theObject);
 
+
+    char* getVersion();
+
     virtual
     VISU::ColoredPrs3dCache_ptr
     GetColoredPrs3dCache(SALOMEDS::Study_ptr theStudy);

diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index 41e5347ef967f02458dfa6a28efde34a97654d29..4ef802f8feae0776132df1f738b198f4b077715d 100644 (file)
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -752,7 +752,7 @@ VISU::Result_i
 
   static QString aCommand;
   std::string aFilePath =  theTmpDir + aFileName;
-  aCommand.sprintf(" %s %s", GetFileInfo().filePath().toLatin1().data(), aFilePath.c_str());
+  aCommand.sprintf(" \"%s\" \"%s\"", GetFileInfo().filePath().toLatin1().data(), aFilePath.c_str());
   aCommand = QDir::convertSeparators( aCommand );
   aCommand.prepend( COPY_COMMAND );
 
@@ -859,7 +859,7 @@ VISU::Result_i
         
         if (theIsMultiFile) { // set this file as new - temporary
           static QString aCommand;
-          aCommand.sprintf(" %s %s%s",aHDFFileName, aResultPath, myFileInfo.baseName().toLatin1().data());
+          aCommand.sprintf(" \"%s\" \"%s%s\"",aHDFFileName, aResultPath, myFileInfo.baseName().toLatin1().data());
           aCommand = QDir::convertSeparators( aCommand );
           aCommand.prepend( MOVE_COMMAND );
         
@@ -872,7 +872,7 @@ VISU::Result_i
           myFileInfo.setFile(QString(aResultPath) + myFileInfo.baseName());
         } else { // change current temporary file to the new: with hdf-format
           static QString aCommand;
-          aCommand.sprintf(" %s %s\0",aHDFFileName, myFileInfo.filePath().toLatin1().data());
+          aCommand.sprintf(" \"%s\" \"%s\"\0",aHDFFileName, myFileInfo.filePath().toLatin1().data());
           aCommand = QDir::convertSeparators( aCommand );
           aCommand.prepend( MOVE_COMMAND );
         
@@ -1449,7 +1449,7 @@ VISU::Result_i
 {
   static QString aCommand;
   const char* aTempFileName = myFileInfo.absoluteFilePath().toLatin1();
-  aCommand.sprintf(" %s %s", aTempFileName, theTargetFileName);
+  aCommand.sprintf(" \"%s\" \"%s\"", aTempFileName, theTargetFileName);
   aCommand = QDir::convertSeparators( aCommand );
   aCommand.prepend( COPY_COMMAND );