X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2FConstructionPlugin_Plane.cpp;h=dc305d29ee3a8c3889ce4c45e3004800d845fdfe;hb=aef9c1a87bc7ca357d8dfe47c56ac5edc9935d35;hp=40529c0c9e23998ced6a4851620ddf7422091af6;hpb=24e5375957ba83cea9bf9fbe9bff030df996914a;p=modules%2Fshaper.git diff --git a/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp b/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp index 40529c0c9..dc305d29e 100644 --- a/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp +++ b/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp @@ -9,18 +9,24 @@ #include #include +#include #include +#include #include +#include +#include #include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -28,6 +34,9 @@ static GeomShapePtr faceByThreeVertices(const std::shared_ptr theV1, const std::shared_ptr theV2, const std::shared_ptr theV3); +static std::shared_ptr makeRectangularFace( + const std::shared_ptr theFace, + const std::shared_ptr thePln); //================================================================================================== ConstructionPlugin_Plane::ConstructionPlugin_Plane() @@ -37,8 +46,11 @@ ConstructionPlugin_Plane::ConstructionPlugin_Plane() //================================================================================================== void ConstructionPlugin_Plane::initAttributes() { - data()->addAttribute(ConstructionPlugin_Plane::CREATION_METHOD(), ModelAPI_AttributeString::typeId()); + data()->addAttribute(ConstructionPlugin_Plane::CREATION_METHOD(), + ModelAPI_AttributeString::typeId()); + data()->addAttribute(PLANE(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(DISTANCE(), ModelAPI_AttributeDouble::typeId()); // By general equation. data()->addAttribute(A(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(B(), ModelAPI_AttributeDouble::typeId()); @@ -57,11 +69,18 @@ void ConstructionPlugin_Plane::initAttributes() // By line and point. data()->addAttribute(LINE(), ModelAPI_AttributeSelection::typeId()); data()->addAttribute(POINT(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(PERPENDICULAR(), ModelAPI_AttributeBoolean::typeId()); // By other plane. data()->addAttribute(CREATION_METHOD_BY_OTHER_PLANE_OPTION(), ModelAPI_AttributeString::typeId()); - data()->addAttribute(PLANE(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(DISTANCE(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(REVERSE(), ModelAPI_AttributeBoolean::typeId()); + data()->addAttribute(COINCIDENT_POINT(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(AXIS(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(ANGLE(), ModelAPI_AttributeDouble::typeId()); + + // By two parallel planes. + data()->addAttribute(PLANE1(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(PLANE2(), ModelAPI_AttributeSelection::typeId()); } //================================================================================================== @@ -70,7 +89,8 @@ void ConstructionPlugin_Plane::execute() GeomShapePtr aShape; std::string aCreationMethod = string(CREATION_METHOD())->value(); - if(aCreationMethod == CREATION_METHOD_BY_GENERAL_EQUATION()) { + if(aCreationMethod == CREATION_METHOD_BY_GENERAL_EQUATION() || + aCreationMethod == "PlaneByGeneralEquation") { aShape = createByGeneralEquation(); } else if(aCreationMethod == CREATION_METHOD_BY_THREE_POINTS()) { aShape = createByThreePoints(); @@ -80,11 +100,20 @@ void ConstructionPlugin_Plane::execute() std::string aCreationMethodOption = string(CREATION_METHOD_BY_OTHER_PLANE_OPTION())->value(); if(aCreationMethodOption == CREATION_METHOD_BY_DISTANCE_FROM_OTHER()) { aShape = createByDistanceFromOther(); + } else if(aCreationMethodOption == CREATION_METHOD_BY_COINCIDENT_TO_POINT()) { + aShape = createByCoincidentPoint(); + } else if(aCreationMethodOption == CREATION_METHOD_BY_ROTATION()) { + aShape = createByRotation(); } + } else if(aCreationMethod == CREATION_METHOD_BY_TWO_PARALLEL_PLANES()) { + aShape = createByTwoParallelPlanes(); + } else { + setError("Error: Plane creation method \"" + aCreationMethod + "\" not supported."); + return; } - if(!aShape.get()) { + setError("Error: Could not create a plane."); return; } @@ -96,11 +125,12 @@ void ConstructionPlugin_Plane::execute() //================================================================================================== bool ConstructionPlugin_Plane::customisePresentation(ResultPtr theResult, AISObjectPtr thePrs, - std::shared_ptr theDefaultPrs) + std::shared_ptr theDefaultPrs) { std::vector aColor; // get color from the attribute of the result - if (theResult.get() != NULL && theResult->data()->attribute(ModelAPI_Result::COLOR_ID()).get() != NULL) { + if (theResult.get() != NULL && + theResult->data()->attribute(ModelAPI_Result::COLOR_ID()).get() != NULL) { AttributeIntArrayPtr aColorAttr = theResult->data()->intArray(ModelAPI_Result::COLOR_ID()); if (aColorAttr.get() && aColorAttr->size()) { aColor.push_back(aColorAttr->value(0)); @@ -109,8 +139,7 @@ bool ConstructionPlugin_Plane::customisePresentation(ResultPtr theResult, AISObj } } if (aColor.empty()) - aColor = Config_PropManager::color("Visualization", "construction_plane_color", - ConstructionPlugin_Plane::DEFAULT_COLOR()); + aColor = Config_PropManager::color("Visualization", "construction_plane_color"); bool isCustomized = false; if (aColor.size() == 3) @@ -135,10 +164,9 @@ std::shared_ptr ConstructionPlugin_Plane::createByGeneralEquation anAttrC->isInitialized() && anAttrD->isInitialized() ) { double aA = anAttrA->value(), aB = anAttrB->value(), aC = anAttrC->value(), aD = anAttrD->value(); - std::shared_ptr aPlane = + std::shared_ptr aPlane = std::shared_ptr(new GeomAPI_Pln(aA, aB, aC, aD)); - std::string kDefaultPlaneSize = "200"; - double aSize = Config_PropManager::integer("Sketch planes", "planes_size", kDefaultPlaneSize); + double aSize = Config_PropManager::integer(SKETCH_TAB_NAME, "planes_size"); aSize *= 4.; aPlaneFace = GeomAlgoAPI_FaceBuilder::squareFace(aPlane, aSize); } @@ -187,9 +215,6 @@ std::shared_ptr ConstructionPlugin_Plane::createByLineAndPoint() aLineShape = anEdgeSelection->context()->shape(); } std::shared_ptr anEdge(new GeomAPI_Edge(aLineShape)); - std::shared_ptr aV1, aV2; - GeomAlgoAPI_ShapeTools::findBounds(anEdge, aV1, aV2); - // Get point. AttributeSelectionPtr aPointSelection = selection(POINT()); @@ -199,13 +224,30 @@ std::shared_ptr ConstructionPlugin_Plane::createByLineAndPoint() } std::shared_ptr aVertex(new GeomAPI_Vertex(aPointShape)); - GeomShapePtr aRes = faceByThreeVertices(aV1, aV2, aVertex); + // Get perpendicular flag. + bool anIsPerpendicular= boolean(PERPENDICULAR())->value(); + + GeomShapePtr aRes; + if(anIsPerpendicular) { + std::shared_ptr aLin = anEdge->line(); + std::shared_ptr aPnt = aVertex->point(); + std::shared_ptr aNewPln(new GeomAPI_Pln(aPnt, aLin->direction())); + double aSize = aLin->distance(aPnt) * 2; + // point may belong to line, so for the face size use maximum distance between point and line + // and the line size (distance between the start and end point) + double aDistance = anEdge->firstPoint()->distance(anEdge->lastPoint()); + aRes = GeomAlgoAPI_FaceBuilder::squareFace(aNewPln, aSize > aDistance ? aSize : aDistance); + } else { + std::shared_ptr aV1, aV2; + GeomAlgoAPI_ShapeTools::findBounds(anEdge, aV1, aV2); + aRes = faceByThreeVertices(aV1, aV2, aVertex); + } return aRes; } //================================================================================================== -std::shared_ptr ConstructionPlugin_Plane::createByDistanceFromOther() +std::shared_ptr ConstructionPlugin_Plane::createByDistanceFromOther() { AttributeSelectionPtr aFaceAttr = data()->selection(ConstructionPlugin_Plane::PLANE()); AttributeDoublePtr aDistAttr = data()->real(ConstructionPlugin_Plane::DISTANCE()); @@ -215,6 +257,8 @@ std::shared_ptr ConstructionPlugin_Plane::createByDistanceFromOt aFaceAttr->isInitialized() && aDistAttr->isInitialized()) { double aDist = aDistAttr->value(); + bool anIsReverse = boolean(REVERSE())->value(); + if(anIsReverse) aDist = -aDist; GeomShapePtr aShape = aFaceAttr->value(); if (!aShape.get()) { aShape = aFaceAttr->context()->shape(); @@ -226,61 +270,176 @@ std::shared_ptr ConstructionPlugin_Plane::createByDistanceFromOt std::shared_ptr aFace(new GeomAPI_Face(aShape)); - std::shared_ptr aPln = GeomAlgoAPI_FaceBuilder::plane(aFace); + std::shared_ptr aPln = aFace->getPlane(); std::shared_ptr aOrig = aPln->location(); std::shared_ptr aDir = aPln->direction(); aOrig->translate(aDir, aDist); std::shared_ptr aNewPln(new GeomAPI_Pln(aOrig, aDir)); - // Create rectangular face close to the selected - double aXmin, aYmin, Zmin, aXmax, aYmax, Zmax; - aFace->computeSize(aXmin, aYmin, Zmin, aXmax, aYmax, Zmax); - - // use all 8 points of the bounding box to find the 2D bounds - bool isFirst = true; - double aMinX2d, aMaxX2d, aMinY2d, aMaxY2d; - for(int aXIsMin = 0; aXIsMin < 2; aXIsMin++) { - for(int aYIsMin = 0; aYIsMin < 2; aYIsMin++) { - for(int aZIsMin = 0; aZIsMin < 2; aZIsMin++) { - std::shared_ptr aPnt(new GeomAPI_Pnt( - aXIsMin ? aXmin : aXmax, aYIsMin ? aYmin : aYmax, aZIsMin ? Zmin : Zmax)); - std::shared_ptr aPnt2d = aPnt->to2D(aNewPln); - if (isFirst || aPnt2d->x() < aMinX2d) - aMinX2d = aPnt2d->x(); - if (isFirst || aPnt2d->y() < aMinY2d) - aMinY2d = aPnt2d->y(); - if (isFirst || aPnt2d->x() > aMaxX2d) - aMaxX2d = aPnt2d->x(); - if (isFirst || aPnt2d->y() > aMaxY2d) - aMaxY2d = aPnt2d->y(); - if (isFirst) - isFirst = !isFirst; - } - } - } - double aWgap = (aMaxX2d - aMinX2d) * 0.1; - double aHgap = (aMaxY2d - aMinY2d) * 0.1; - aPlane = GeomAlgoAPI_FaceBuilder::planarFace(aNewPln, - aMinX2d - aWgap, aMinY2d - aHgap, aMaxX2d - aMinX2d + 2. * aWgap, aMaxY2d - aMinY2d + 2. * aHgap); - + aPlane = makeRectangularFace(aFace, aNewPln); } return aPlane; } +//================================================================================================== +std::shared_ptr ConstructionPlugin_Plane::createByCoincidentPoint() +{ + // Get face. + AttributeSelectionPtr aFaceSelection = selection(PLANE()); + GeomShapePtr aFaceShape = aFaceSelection->value(); + if(!aFaceShape.get()) { + aFaceShape = aFaceSelection->context()->shape(); + } + std::shared_ptr aFace(new GeomAPI_Face(aFaceShape)); + + // Get point. + AttributeSelectionPtr aPointSelection = selection(COINCIDENT_POINT()); + GeomShapePtr aPointShape = aPointSelection->value(); + if(!aPointShape.get()) { + aPointShape = aPointSelection->context()->shape(); + } + std::shared_ptr aVertex(new GeomAPI_Vertex(aPointShape)); + + std::shared_ptr anOrig = aVertex->point(); + std::shared_ptr aPln = aFace->getPlane(); + std::shared_ptr aDir = aPln->direction(); + + std::shared_ptr aNewPln(new GeomAPI_Pln(anOrig, aDir)); + + return makeRectangularFace(aFace, aNewPln); +} + +//================================================================================================== +std::shared_ptr ConstructionPlugin_Plane::createByRotation() +{ + // Get face. + AttributeSelectionPtr aFaceSelection = selection(PLANE()); + GeomShapePtr aFaceShape = aFaceSelection->value(); + if(!aFaceShape.get()) { + aFaceShape = aFaceSelection->context()->shape(); + } + std::shared_ptr aFace(new GeomAPI_Face(aFaceShape)); + aFace = makeRectangularFace(aFace, aFace->getPlane()); + + // Get axis. + AttributeSelectionPtr anAxisSelection = selection(AXIS()); + GeomShapePtr anAxisShape = anAxisSelection->value(); + if(!anAxisShape.get()) { + anAxisShape = anAxisSelection->context()->shape(); + } + std::shared_ptr anEdge(new GeomAPI_Edge(anAxisShape)); + + std::shared_ptr anAxis = + std::shared_ptr(new GeomAPI_Ax1(anEdge->line()->location(), + anEdge->line()->direction())); + + // Getting angle. + double anAngle = real(ANGLE())->value(); + + GeomAlgoAPI_Rotation aRotationAlgo(aFace, anAxis, anAngle); + if (!aRotationAlgo.check()) { + setError(aRotationAlgo.getError()); + return GeomShapePtr(); + } + aRotationAlgo.build(); + if (!aRotationAlgo.isDone()) { + setError("Error: Failed to rotate plane"); + return GeomShapePtr(); + } + + std::shared_ptr aRes(new GeomAPI_Face(aRotationAlgo.shape())); + return aRes; +} + +//================================================================================================== +std::shared_ptr ConstructionPlugin_Plane::createByTwoParallelPlanes() +{ + // Get plane 1. + AttributeSelectionPtr aFaceSelection1 = selection(PLANE1()); + GeomShapePtr aFaceShape1 = aFaceSelection1->value(); + if(!aFaceShape1.get()) { + aFaceShape1 = aFaceSelection1->context()->shape(); + } + std::shared_ptr aFace1(new GeomAPI_Face(aFaceShape1)); + std::shared_ptr aPln1 = aFace1->getPlane(); + + // Get plane 2. + AttributeSelectionPtr aFaceSelection2 = selection(PLANE2()); + GeomShapePtr aFaceShape2 = aFaceSelection2->value(); + if(!aFaceShape2.get()) { + aFaceShape2 = aFaceSelection2->context()->shape(); + } + std::shared_ptr aFace2(new GeomAPI_Face(aFaceShape2)); + std::shared_ptr aPln2 = aFace2->getPlane(); + + std::shared_ptr anOrig1 = aPln1->location(); + std::shared_ptr aPntOnPln2 = aPln2->project(anOrig1); + + std::shared_ptr aNewOrig(new GeomAPI_Pnt(anOrig1->xyz()->added( + aPntOnPln2->xyz())->multiplied(0.5))); + + std::shared_ptr aNewPln(new GeomAPI_Pln(aNewOrig, aPln1->direction())); + + std::shared_ptr aRes = makeRectangularFace(aFace1, aNewPln); + + return aRes; +} + //================================================================================================== GeomShapePtr faceByThreeVertices(const std::shared_ptr theV1, const std::shared_ptr theV2, const std::shared_ptr theV3) { - std::shared_ptr aFace = GeomAlgoAPI_FaceBuilder::planarFaceByThreeVertices(theV1, theV2, theV3); + std::shared_ptr aFace = + GeomAlgoAPI_FaceBuilder::planarFaceByThreeVertices(theV1, theV2, theV3); ListOfShape anObjects; anObjects.push_back(theV1); anObjects.push_back(theV2); anObjects.push_back(theV3); - std::list > aBoundingPoints = GeomAlgoAPI_ShapeTools::getBoundingBox(anObjects, 1.0); + std::list > aBoundingPoints = + GeomAlgoAPI_ShapeTools::getBoundingBox(anObjects, 1.0); GeomShapePtr aRes = GeomAlgoAPI_ShapeTools::fitPlaneToBox(aFace, aBoundingPoints); return aRes; } + +//================================================================================================== +std::shared_ptr makeRectangularFace(const std::shared_ptr theFace, + const std::shared_ptr thePln) +{ + // Create rectangular face close to the selected + double aXmin, aYmin, Zmin, aXmax, aYmax, Zmax; + theFace->computeSize(aXmin, aYmin, Zmin, aXmax, aYmax, Zmax); + + // use all 8 points of the bounding box to find the 2D bounds + bool isFirst = true; + double aMinX2d, aMaxX2d, aMinY2d, aMaxY2d; + for(int aXIsMin = 0; aXIsMin < 2; aXIsMin++) { + for(int aYIsMin = 0; aYIsMin < 2; aYIsMin++) { + for(int aZIsMin = 0; aZIsMin < 2; aZIsMin++) { + std::shared_ptr aPnt(new GeomAPI_Pnt( + aXIsMin ? aXmin : aXmax, aYIsMin ? aYmin : aYmax, aZIsMin ? Zmin : Zmax)); + std::shared_ptr aPnt2d = aPnt->to2D(thePln); + if (isFirst || aPnt2d->x() < aMinX2d) + aMinX2d = aPnt2d->x(); + if (isFirst || aPnt2d->y() < aMinY2d) + aMinY2d = aPnt2d->y(); + if (isFirst || aPnt2d->x() > aMaxX2d) + aMaxX2d = aPnt2d->x(); + if (isFirst || aPnt2d->y() > aMaxY2d) + aMaxY2d = aPnt2d->y(); + if (isFirst) + isFirst = !isFirst; + } + } + } + double aWgap = (aMaxX2d - aMinX2d) * 0.1; + double aHgap = (aMaxY2d - aMinY2d) * 0.1; + std::shared_ptr aResFace = GeomAlgoAPI_FaceBuilder::planarFace(thePln, + aMinX2d - aWgap, aMinY2d - aHgap, aMaxX2d - aMinX2d + 2. * aWgap, + aMaxY2d - aMinY2d + 2. * aHgap); + + return aResFace; +}