X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2FConstructionPlugin_Plane.cpp;h=549773ab7a2902a3b041d02770e09f5fc0697bbc;hb=211bdf4b80cc6bb427e75087ac76f729c3eb9ac9;hp=c206ff4d55b1a24f7aee3ba87fcf686966f10815;hpb=a731f82dccbfdb67cbf8e8d617222a4d3e32018a;p=modules%2Fshaper.git diff --git a/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp b/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp index c206ff4d5..549773ab7 100644 --- a/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp +++ b/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include @@ -32,6 +34,11 @@ void ConstructionPlugin_Plane::initAttributes() data()->addAttribute(ConstructionPlugin_Plane::B(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(ConstructionPlugin_Plane::C(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(ConstructionPlugin_Plane::D(), ModelAPI_AttributeDouble::typeId()); + + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ConstructionPlugin_Plane::A()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ConstructionPlugin_Plane::B()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ConstructionPlugin_Plane::C()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ConstructionPlugin_Plane::D()); } void ConstructionPlugin_Plane::execute() @@ -88,6 +95,10 @@ std::shared_ptr ConstructionPlugin_Plane::createPlaneByFaceAndDi double aDist = aDistAttr->value(); GeomShapePtr aShape = aFaceAttr->value(); + if (!aShape.get()) { + aShape = aFaceAttr->context()->shape(); + } + if (aShape.get() != NULL) { std::shared_ptr aPln = GeomAlgoAPI_FaceBuilder::plane(aShape); std::shared_ptr aOrig = aPln->location(); @@ -142,7 +153,7 @@ std::shared_ptr ConstructionPlugin_Plane::createPlaneByGeneralEqu std::string kDefaultPlaneSize = "200"; double aSize = Config_PropManager::integer("Sketch planes", "planes_size", kDefaultPlaneSize); aSize *= 4.; - aPlaneFace = GeomAlgoAPI_FaceBuilder::square(aPlane, aSize); + aPlaneFace = GeomAlgoAPI_FaceBuilder::square(aPlane, aSize, true); } return aPlaneFace; }