From: vsr Date: Tue, 11 Dec 2012 12:29:59 +0000 (+0000) Subject: Merge from V6_6_BR (V6_6_0rc2) 11/12/2012 X-Git-Tag: mergefrom_V6_6_BR_11Dec12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bdd445c1260e4f075efcc0e23668932cb6564ebf;p=modules%2Fvisu.git Merge from V6_6_BR (V6_6_0rc2) 11/12/2012 --- diff --git a/configure.ac b/configure.ac index 0ffd4122..10a5c003 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Modified by : Marc Tajchman (CEA) # Modified by : Mikhail Ponikarov (OCN) # -AC_INIT([Salome2 Project VISU module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeVISU]) +AC_INIT([Salome2 Project VISU module], [6.6.0], [webmaster.salome@opencascade.com], [SalomeVISU]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am index c2a28f46..83fec929 100644 --- a/src/CONVERTOR/Makefile.am +++ b/src/CONVERTOR/Makefile.am @@ -90,7 +90,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/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am index 55c0c695..62dae64a 100644 --- a/src/PIPELINE/Makefile.am +++ b/src/PIPELINE/Makefile.am @@ -133,7 +133,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/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc index 6180a586..31b14b88 100644 --- 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<<", "<GetLineWidth()<<")"<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::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::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_Result_i.cc b/src/VISU_I/VISU_Result_i.cc index 41e5347e..4ef802f8 100644 --- 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 );