X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Placement.cpp;h=43b25be205b2270e3e0eec2bb0c5ce5d840f75c8;hb=658fccce59f75b0cfa7c3f3d45f1ffb295ed24be;hp=1fcfa7618e3d27a44f9e9f4f65b400ca9ad2f7f0;hpb=9ba045c054ba0c390261989e9cc543c878254299;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp index 1fcfa7618..43b25be20 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp @@ -55,7 +55,8 @@ void FeaturesPlugin_Placement::execute() for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) { std::shared_ptr anObjectAttr = anObjectsSelList->value(anObjectsIndex); std::shared_ptr anObject = anObjectAttr->value(); - if(!anObject.get()) { + if(!anObject.get()) { // may be for not-activated parts + eraseResults(); return; } anObjects.push_back(anObject); @@ -69,7 +70,7 @@ void FeaturesPlugin_Placement::execute() } std::shared_ptr aStartShape = anObjRef->value(); if(!aStartShape) { - static const std::string aSelectionError = "The start shape selection is bad"; + static const std::string aSelectionError = "Error: The start shape selection is bad."; setError(aSelectionError); return; } @@ -81,7 +82,7 @@ void FeaturesPlugin_Placement::execute() aStartShapeContext = aContextRes->shape(); } if(!aStartShapeContext.get()) { - static const std::string aContextError = "The start shape selection context is bad"; + static const std::string aContextError = "Error: The start shape selection context is bad."; setError(aContextError); return; } @@ -90,7 +91,7 @@ void FeaturesPlugin_Placement::execute() anObjRef = selection(END_SHAPE_ID()); std::shared_ptr anEndShape = anObjRef->value(); if(!anEndShape) { - static const std::string aSelectionError = "The end shape selection is bad"; + static const std::string aSelectionError = "Error: The end shape selection is bad."; setError(aSelectionError); return; } @@ -101,7 +102,7 @@ void FeaturesPlugin_Placement::execute() anEndShapeContext = aContextRes->shape(); } if(!anEndShapeContext.get()) { - static const std::string aContextError = "The end shape selection context is bad"; + static const std::string aContextError = "Error: The end shape selection context is bad."; setError(aContextError); return; } @@ -112,7 +113,7 @@ void FeaturesPlugin_Placement::execute() if (aShapes[i]->isFace()) { std::shared_ptr aFace(new GeomAPI_Face(aShapes[i])); if (!aFace->isPlanar()) { - static const std::string aPlanarityError = "One of selected faces is not planar"; + static const std::string aPlanarityError = "Error: One of selected faces is not planar."; setError(aPlanarityError); return; } @@ -120,7 +121,7 @@ void FeaturesPlugin_Placement::execute() else if (aShapes[i]->isEdge()) { std::shared_ptr anEdge(new GeomAPI_Edge(aShapes[i])); if (!anEdge->isLine()) { - static const std::string aLinearityError = "One of selected endges is not linear"; + static const std::string aLinearityError = "Error: One of selected endges is not linear."; setError(aLinearityError); return; } @@ -135,7 +136,7 @@ void FeaturesPlugin_Placement::execute() GeomAlgoAPI_Placement aPlacementAlgo( aStartShapeContext, anEndShapeContext, aStartShape, anEndShape, isReverse, isCentering, true); if(!aPlacementAlgo.isDone()) { - static const std::string aFeatureError = "Placement algorithm failed"; + static const std::string aFeatureError = "Error: Placement algorithm failed."; setError(aFeatureError); return; } @@ -158,17 +159,17 @@ void FeaturesPlugin_Placement::execute() // Checking that the algorithm worked properly. if(!aTransformAlgo.isDone()) { - static const std::string aFeatureError = "Transform algorithm failed"; + static const std::string aFeatureError = "Error: Transform algorithm failed."; setError(aFeatureError); break; } if(aTransformAlgo.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(!aTransformAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); break; } @@ -193,11 +194,11 @@ void FeaturesPlugin_Placement::LoadNamingDS(GeomAlgoAPI_Transform& theTransformA //load result theResultBody->storeModified(theSlaveObject, theTransformAlgo.shape()); // the initial Slave, the resulting Slave - std::shared_ptr aSubShapes = theTransformAlgo.mapOfShapes(); + std::shared_ptr aSubShapes = theTransformAlgo.mapOfSubShapes(); // put modifed faces in DF std::string aModName = "Modified"; - theResultBody->loadAndOrientModifiedShapes(theTransformAlgo.makeShape().get(), - theSlaveObject, _FACE, - _MODIFIEDF_TAG, aModName, *aSubShapes.get()); + theResultBody->loadAndOrientModifiedShapes(&theTransformAlgo, + theSlaveObject, _FACE, + _MODIFIEDF_TAG, aModName, *aSubShapes.get()); }