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
Fix for the issue #1928
[modules/shaper.git]
/
src
/
FeaturesPlugin
/
FeaturesPlugin_Rotation.cpp
diff --git
a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
index 422a4d3347c3648a1e55552c0b0ee9251f7aecc7..9ba830b83b603144021b4cbe62eee553cd8b3cc6 100755
(executable)
--- a/
src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
+++ b/
src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
@@
-8,14
+8,14
@@
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_AttributeSelectionList.h>
-#include <ModelAPI_BodyBuilder.h>
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_ResultBody.h>
-#include <ModelAPI_Session.h>
#include <ModelAPI_ResultPart.h>
#include <GeomAPI_Edge.h>
#include <GeomAPI_Lin.h>
#include <ModelAPI_ResultPart.h>
#include <GeomAPI_Edge.h>
#include <GeomAPI_Lin.h>
+#include <FeaturesPlugin_Tools.h>
+
//=================================================================================================
FeaturesPlugin_Rotation::FeaturesPlugin_Rotation()
{
//=================================================================================================
FeaturesPlugin_Rotation::FeaturesPlugin_Rotation()
{
@@
-24,13
+24,12
@@
FeaturesPlugin_Rotation::FeaturesPlugin_Rotation()
//=================================================================================================
void FeaturesPlugin_Rotation::initAttributes()
{
//=================================================================================================
void FeaturesPlugin_Rotation::initAttributes()
{
- AttributeSelectionListPtr aSelection =
+ AttributeSelectionListPtr aSelection =
std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(data()->addAttribute(
FeaturesPlugin_Rotation::OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()));
std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(data()->addAttribute(
FeaturesPlugin_Rotation::OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()));
- // revolution works with faces always
- aSelection->setSelectionType("SOLID");
- data()->addAttribute(FeaturesPlugin_Rotation::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
+ data()->addAttribute(FeaturesPlugin_Rotation::AXIS_OBJECT_ID(),
+ ModelAPI_AttributeSelection::typeId());
data()->addAttribute(FeaturesPlugin_Rotation::ANGLE_ID(), ModelAPI_AttributeDouble::typeId());
}
data()->addAttribute(FeaturesPlugin_Rotation::ANGLE_ID(), ModelAPI_AttributeDouble::typeId());
}
@@
-40,12
+39,14
@@
void FeaturesPlugin_Rotation::execute()
// Getting objects.
ListOfShape anObjects;
std::list<ResultPtr> aContextes;
// Getting objects.
ListOfShape anObjects;
std::list<ResultPtr> aContextes;
- AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID());
+ AttributeSelectionListPtr anObjectsSelList =
+ selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID());
if (anObjectsSelList->size() == 0) {
return;
}
for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
if (anObjectsSelList->size() == 0) {
return;
}
for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
- std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = anObjectsSelList->value(anObjectsIndex);
+ std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr =
+ anObjectsSelList->value(anObjectsIndex);
std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
if(!anObject.get()) {
return;
std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
if(!anObject.get()) {
return;
@@
-57,15
+58,17
@@
void FeaturesPlugin_Rotation::execute()
//Getting axis.
std::shared_ptr<GeomAPI_Ax1> anAxis;
std::shared_ptr<GeomAPI_Edge> anEdge;
//Getting axis.
std::shared_ptr<GeomAPI_Ax1> anAxis;
std::shared_ptr<GeomAPI_Edge> anEdge;
- std::shared_ptr<ModelAPI_AttributeSelection> anObjRef = selection(FeaturesPlugin_Rotation::AXIS_OBJECT_ID());
+ std::shared_ptr<ModelAPI_AttributeSelection> anObjRef =
+ selection(FeaturesPlugin_Rotation::AXIS_OBJECT_ID());
if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) {
anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->value()));
if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) {
anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->value()));
- } else if (anObjRef && !anObjRef->value() && anObjRef->context() &&
+ } else if (anObjRef && !anObjRef->value() && anObjRef->context() &&
anObjRef->context()->shape() && anObjRef->context()->shape()->isEdge()) {
anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->context()->shape()));
}
if(anEdge) {
anObjRef->context()->shape() && anObjRef->context()->shape()->isEdge()) {
anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->context()->shape()));
}
if(anEdge) {
- anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction()));
+ anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(),
+ anEdge->line()->direction()));
}
// Getting angle.
}
// Getting angle.
@@
-74,7
+77,7
@@
void FeaturesPlugin_Rotation::execute()
// Rotating each object.
int aResultIndex = 0;
std::list<ResultPtr>::iterator aContext = aContextes.begin();
// Rotating each object.
int aResultIndex = 0;
std::list<ResultPtr>::iterator aContext = aContextes.begin();
- for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
+ for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
anObjectsIt++, aContext++) {
std::shared_ptr<GeomAPI_Shape> aBaseShape = *anObjectsIt;
bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group();
anObjectsIt++, aContext++) {
std::shared_ptr<GeomAPI_Shape> aBaseShape = *anObjectsIt;
bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group();
@@
-86,29
+89,29
@@
void FeaturesPlugin_Rotation::execute()
ResultPartPtr anOrigin = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aContext);
ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex);
aResultPart->setTrsf(*aContext, aTrsf);
ResultPartPtr anOrigin = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aContext);
ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex);
aResultPart->setTrsf(*aContext, aTrsf);
- setResult(aResultPart);
+ setResult(aResultPart
, aResultIndex
);
} else {
GeomAlgoAPI_Rotation aRotationAlgo(aBaseShape, anAxis, anAngle);
// Checking that the algorithm worked properly.
if(!aRotationAlgo.isDone()) {
} else {
GeomAlgoAPI_Rotation aRotationAlgo(aBaseShape, anAxis, anAngle);
// Checking that the algorithm worked properly.
if(!aRotationAlgo.isDone()) {
- static const std::string aFeatureError = "
Rotation algorithm failed
";
+ static const std::string aFeatureError = "
Error: Rotation algorithm failed.
";
setError(aFeatureError);
break;
}
if(aRotationAlgo.shape()->isNull()) {
setError(aFeatureError);
break;
}
if(aRotationAlgo.shape()->isNull()) {
- static const std::string aShapeError = "
Resulting shape is Null
";
+ static const std::string aShapeError = "
Error: Resulting shape is Null.
";
setError(aShapeError);
break;
}
if(!aRotationAlgo.isValid()) {
setError(aShapeError);
break;
}
if(!aRotationAlgo.isValid()) {
- std::string aFeatureError = "
Warning: resulting shape is not valid
";
+ std::string aFeatureError = "
Error: Resulting shape is not valid.
";
setError(aFeatureError);
break;
}
ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
setError(aFeatureError);
break;
}
ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-
L
oadNamingDS(aRotationAlgo, aResultBody, aBaseShape);
+
l
oadNamingDS(aRotationAlgo, aResultBody, aBaseShape);
setResult(aResultBody, aResultIndex);
}
aResultIndex++;
setResult(aResultBody, aResultIndex);
}
aResultIndex++;
@@
-118,19
+121,18
@@
void FeaturesPlugin_Rotation::execute()
removeResults(aResultIndex);
}
removeResults(aResultIndex);
}
-void FeaturesPlugin_Rotation::
LoadNamingDS(const
GeomAlgoAPI_Rotation& theRotaionAlgo,
+void FeaturesPlugin_Rotation::
loadNamingDS(
GeomAlgoAPI_Rotation& theRotaionAlgo,
std::shared_ptr<ModelAPI_ResultBody> theResultBody,
std::shared_ptr<GeomAPI_Shape> theBaseShape)
{
// Store result.
theResultBody->storeModified(theBaseShape, theRotaionAlgo.shape());
std::shared_ptr<ModelAPI_ResultBody> theResultBody,
std::shared_ptr<GeomAPI_Shape> theBaseShape)
{
// Store result.
theResultBody->storeModified(theBaseShape, theRotaionAlgo.shape());
- std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theRotaionAlgo.mapOfShapes();
-
int aRotatedTag = 1;
std::string aRotatedName = "Rotated";
int aRotatedTag = 1;
std::string aRotatedName = "Rotated";
- theResultBody->loadAndOrientModifiedShapes(theRotaionAlgo.makeShape().get(),
- theBaseShape, GeomAPI_Shape::FACE,
- aRotatedTag, aRotatedName, *aSubShapes.get());
+ std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theRotaionAlgo.mapOfSubShapes();
+ FeaturesPlugin_Tools::storeModifiedShapes(theRotaionAlgo, theResultBody,
+ theBaseShape, aRotatedTag, aRotatedName,
+ *aSubShapes.get());
}
}