From d825897be72e14d10378080d8c3a8d3f33097717 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 26 Oct 2012 14:44:53 +0000 Subject: [PATCH] IPAL 0051560: wrong dump of visual parameters for displayed curves is generated for python script --- src/VISU_I/VISU_DumpPython.cc | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) 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) { -- 2.39.2