From 5e134179fa8262d09f2f282da7a6db753c1095f0 Mon Sep 17 00:00:00 2001 From: vsr Date: Sat, 13 Nov 2010 11:11:54 +0000 Subject: [PATCH] Merge from BR_WIN_INDUS_514 13/11/2010 --- src/CONVERTOR/VISU_MedConvertor.cxx | 5 ++++- src/CONVERTOR/VISU_Structures_impl.cxx | 3 ++- src/CONVERTOR/VISU_Structures_impl.hxx | 1 + src/VISU_I/VISU_Result_i.cc | 7 +++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx index 5b03e784..060e6e35 100644 --- a/src/CONVERTOR/VISU_MedConvertor.cxx +++ b/src/CONVERTOR/VISU_MedConvertor.cxx @@ -3034,11 +3034,13 @@ FillValForTime(MED::SharedPtr theTimeStampValue, VISU::PMEDValForTime theValForTime, VISU::PMEDField theField) { + if(theValForTime->myIsFilled) + return; theField->myDataSize = 0; TInt aNbComp = theField->myNbComp; VISU::TGeom2SubProfile::const_iterator anIter = theGeom2SubProfile.begin(); - for(; anIter != theGeom2SubProfile.end(); anIter++){ + for(; anIter != theGeom2SubProfile.end(); anIter++) { VISU::EGeometry aEGeom = anIter->first; VISU::PMEDSubProfile aSubProfile(anIter->second); @@ -3066,6 +3068,7 @@ FillValForTime(MED::SharedPtr theTimeStampValue, aVMeshValue.reset(aMeshValue); } } + theValForTime->myIsFilled = true; } //--------------------------------------------------------------- diff --git a/src/CONVERTOR/VISU_Structures_impl.cxx b/src/CONVERTOR/VISU_Structures_impl.cxx index 6830003f..a9416fd0 100644 --- a/src/CONVERTOR/VISU_Structures_impl.cxx +++ b/src/CONVERTOR/VISU_Structures_impl.cxx @@ -1522,7 +1522,8 @@ namespace VISU TValForTimeImpl ::TValForTimeImpl(): myGaussPtsIDFilter(new TGaussPtsIDFilter()), - myUnstructuredGridIDMapper(new TUnstructuredGridIDMapperImpl()) + myUnstructuredGridIDMapper(new TUnstructuredGridIDMapperImpl()), + myIsFilled(false) {} const PMeshValue& diff --git a/src/CONVERTOR/VISU_Structures_impl.hxx b/src/CONVERTOR/VISU_Structures_impl.hxx index e465ef26..5ae6a2f5 100644 --- a/src/CONVERTOR/VISU_Structures_impl.hxx +++ b/src/CONVERTOR/VISU_Structures_impl.hxx @@ -875,6 +875,7 @@ namespace VISU PUnstructuredGridIDMapperImpl myUnstructuredGridIDMapper; //!< Keep VTK representation for ordinary mesh and data TGeom2Value myGeom2Value; //!< Keep value that is assigned to the mesh TGeom2NbGauss myGeom2NbGauss; //!< Keep number of Gauss Points + bool myIsFilled; //!< Keep the status of the TValForTime (true - already filled, false - not filled); TValForTimeImpl(); diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc index a0315f5c..d2da6f15 100644 --- a/src/VISU_I/VISU_Result_i.cc +++ b/src/VISU_I/VISU_Result_i.cc @@ -769,6 +769,13 @@ VISU::Result_i try { myFileName = VISU::Storable::FindValue(theMap, "myName").toLatin1().data(); +#ifdef WIN32 + for (int i = 0; i < myFileName.length(); i++) + { + if (myFileName[i] == ':') + myFileName[i] = '_'; + } +#endif SetInitFileName(VISU::Storable::FindValue(theMap, "myInitFileName").toLatin1().data()); SALOMEDS::SObject_var aRefSObj, aTargetRefSObj; -- 2.39.2