Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue 1299 Angle constraint: support of additional and complementary angles. Test...
[modules/shaper.git]
/
src
/
FeaturesPlugin
/
FeaturesPlugin_CompositeSketch.cpp
diff --git
a/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp
b/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp
index 3f95c49e857afc88cbc4d517705847699e4b2939..3b520ba9289d5c8ee9b0fb3a00ea2563a1674b4e 100644
(file)
--- 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;
if(aErrorsNum > 0) {
std::ostringstream aStringStream;
- aStringStream << "
Warning: c
ould not create solid(s) from " << aErrorsNum << " face(s).";
+ aStringStream << "
Error: C
ould not create solid(s) from " << aErrorsNum << " face(s).";
setError(aStringStream.str());
}
setError(aStringStream.str());
}
@@
-182,6
+182,7
@@
void FeaturesPlugin_CompositeSketch::loadNamingDS(std::shared_ptr<ModelAPI_Resul
std::shared_ptr<GeomAlgoAPI_MakeSweep> aSweepAlgo = std::dynamic_pointer_cast<GeomAlgoAPI_MakeSweep>(theMakeShape);
if(aSweepAlgo.get()) {
//Insert to faces
std::shared_ptr<GeomAlgoAPI_MakeSweep> aSweepAlgo = std::dynamic_pointer_cast<GeomAlgoAPI_MakeSweep>(theMakeShape);
if(aSweepAlgo.get()) {
//Insert to faces
+ int aToFaceIndex = 1;
const std::string aToName = "ToFace";
int aToTag = 2;
const ListOfShape& aToFaces = aSweepAlgo->toFaces();
const std::string aToName = "ToFace";
int aToTag = 2;
const ListOfShape& aToFaces = aSweepAlgo->toFaces();
@@
-190,10
+191,13
@@
void FeaturesPlugin_CompositeSketch::loadNamingDS(std::shared_ptr<ModelAPI_Resul
if(aDataMap->isBound(aToFace)) {
aToFace = aDataMap->find(aToFace);
}
if(aDataMap->isBound(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
}
//Insert from faces
+ int aFromFaceIndex = 1;
const std::string aFromName = "FromFace";
int aFromTag = aToTag > 10000 ? aToTag : 10000;
const ListOfShape& aFromFaces = aSweepAlgo->fromFaces();
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_ptr<ModelAPI_Resul
if(aDataMap->isBound(aFromFace)) {
aFromFace = aDataMap->find(aFromFace);
}
if(aDataMap->isBound(aFromFace)) {
aFromFace = aDataMap->find(aFromFace);
}
- theResultBody->generated(aFromFace, aFromName, aFromTag++);
+ std::ostringstream aStr;
+ aStr << aFromName << "_" << aFromFaceIndex++;
+ theResultBody->generated(aFromFace, aStr.str(), aFromTag++);
}
}
}
}
}
}