X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Middle.cpp;h=df7590a1c37e377752ab42cedbdca0f1cce5ebf5;hb=b5893b0a30fac08134c24de4565cb513a43affa6;hp=8e2ed6816ba94c20ec4dd0f8aa4b47e81df488e9;hpb=63f80d9837b4dcb16e9fafc3b07fac36f6f7b00d;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Middle.cpp b/src/SketcherPrs/SketcherPrs_Middle.cpp index 8e2ed6816..df7590a1c 100755 --- a/src/SketcherPrs/SketcherPrs_Middle.cpp +++ b/src/SketcherPrs/SketcherPrs_Middle.cpp @@ -14,13 +14,12 @@ #include -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Middle, SketcherPrs_SymbolPrs); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Middle, SketcherPrs_SymbolPrs); static Handle(Image_AlienPixMap) MyPixMap; -SketcherPrs_Middle::SketcherPrs_Middle(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane) +SketcherPrs_Middle::SketcherPrs_Middle(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) : SketcherPrs_SymbolPrs(theConstraint, thePlane) { } @@ -30,9 +29,9 @@ bool SketcherPrs_Middle::IsReadyToDisplay(ModelAPI_Feature* theConstraint, { bool aReadyToDisplay = false; - ObjectPtr aObj1 = + ObjectPtr aObj1 = SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A()); - ObjectPtr aObj2 = + ObjectPtr aObj2 = SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_B()); // one object is a feature Line, other object is a point result. We check shape of point result @@ -43,24 +42,25 @@ bool SketcherPrs_Middle::IsReadyToDisplay(ModelAPI_Feature* theConstraint, return aReadyToDisplay; } -bool SketcherPrs_Middle::updateIfReadyToDisplay(double theStep) const +bool SketcherPrs_Middle::updateIfReadyToDisplay(double theStep, bool withColor) const { if (!IsReadyToDisplay(myConstraint, myPlane)) return false; ObjectPtr aPointObject; // find a line result to set middle symbol near it - AttributePtr anAttribute = + myPntArray = new Graphic3d_ArrayOfPoints(1, withColor); + AttributePtr anAttribute = SketcherPrs_Tools::getAttribute(myConstraint, SketchPlugin_Constraint::ENTITY_A()); if (!anAttribute.get()) { - ObjectPtr aObj = + ObjectPtr aObj = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); std::shared_ptr aShape = SketcherPrs_Tools::getShape(aObj); if (aShape.get() && aShape->isEdge()) aPointObject = aObj; } if (!aPointObject.get()) { - ObjectPtr aObj = + ObjectPtr aObj = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B()); std::shared_ptr aShape = SketcherPrs_Tools::getShape(aObj); if (aShape.get() && aShape->isEdge()) @@ -77,17 +77,17 @@ bool SketcherPrs_Middle::updateIfReadyToDisplay(double theStep) const return true; } -void SketcherPrs_Middle::drawLines(const Handle(Prs3d_Presentation)& thePrs, +void SketcherPrs_Middle::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const { Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs); - Handle(Graphic3d_AspectLine3d) aLineAspect = + Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2); aGroup->SetPrimitivesAspect(aLineAspect); // Draw objects - ObjectPtr aObject = + ObjectPtr aObject = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); drawLine(thePrs, theColor, aObject);