X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_CompositeSketch.cpp;h=3b520ba9289d5c8ee9b0fb3a00ea2563a1674b4e;hb=01a8a031b214d727e075a90ccdba0667a24db853;hp=3f95c49e857afc88cbc4d517705847699e4b2939;hpb=ea4d65430ad05a8f47f4c2d95c4b09260d6ed3ab;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp b/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp index 3f95c49e8..3b520ba92 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp @@ -157,7 +157,7 @@ void FeaturesPlugin_CompositeSketch::execute() if(aErrorsNum > 0) { std::ostringstream aStringStream; - aStringStream << "Warning: could not create solid(s) from " << aErrorsNum << " face(s)."; + aStringStream << "Error: Could not create solid(s) from " << aErrorsNum << " face(s)."; setError(aStringStream.str()); } @@ -182,6 +182,7 @@ void FeaturesPlugin_CompositeSketch::loadNamingDS(std::shared_ptr aSweepAlgo = std::dynamic_pointer_cast(theMakeShape); if(aSweepAlgo.get()) { //Insert to faces + int aToFaceIndex = 1; const std::string aToName = "ToFace"; int aToTag = 2; const ListOfShape& aToFaces = aSweepAlgo->toFaces(); @@ -190,10 +191,13 @@ void FeaturesPlugin_CompositeSketch::loadNamingDS(std::shared_ptrisBound(aToFace)) { aToFace = aDataMap->find(aToFace); } - theResultBody->generated(aToFace, aToName, aToTag++); + std::ostringstream aStr; + aStr << aToName << "_" << aToFaceIndex++; + theResultBody->generated(aToFace, aStr.str(), aToTag++); } //Insert from faces + int aFromFaceIndex = 1; const std::string aFromName = "FromFace"; int aFromTag = aToTag > 10000 ? aToTag : 10000; const ListOfShape& aFromFaces = aSweepAlgo->fromFaces(); @@ -202,7 +206,9 @@ void FeaturesPlugin_CompositeSketch::loadNamingDS(std::shared_ptrisBound(aFromFace)) { aFromFace = aDataMap->find(aFromFace); } - theResultBody->generated(aFromFace, aFromName, aFromTag++); + std::ostringstream aStr; + aStr << aFromName << "_" << aFromFaceIndex++; + theResultBody->generated(aFromFace, aStr.str(), aFromTag++); } } }