X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Factory.cpp;h=553ea9cf95011c965d13048ee4bc2989cb0fbbaa;hb=449259f5540f1e1d7e5e0595e10f80e18a15e038;hp=ebbe5b6bf3390df85755b6930d30212609fe47fd;hpb=c4eab94a20a0d93100549a210582d46409fec1cc;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Factory.cpp b/src/SketcherPrs/SketcherPrs_Factory.cpp index ebbe5b6bf..553ea9cf9 100644 --- a/src/SketcherPrs/SketcherPrs_Factory.cpp +++ b/src/SketcherPrs/SketcherPrs_Factory.cpp @@ -63,31 +63,9 @@ CONSTRAINT_PRS_IMPL(tangentConstraint, SketcherPrs_Tangent); CONSTRAINT_PRS_IMPL(middleConstraint, SketcherPrs_Middle); CONSTRAINT_PRS_IMPL(mirrorConstraint, SketcherPrs_Mirror); CONSTRAINT_PRS_IMPL(coincidentConstraint, SketcherPrs_Coincident); - - - -#define CONSTRAINT2_PRS_IMPL(NAME, CLASS) \ -AISObjectPtr SketcherPrs_Factory::NAME(ModelAPI_Feature* theConstraint, \ - const std::shared_ptr& thePlane, \ - AISObjectPtr thePrevious) \ -{ \ - std::shared_ptr anAISObj; \ - if (CLASS::IsReadyToDisplay(theConstraint, thePlane)) { \ - if (thePrevious.get()) \ - anAISObj = thePrevious; \ - else { \ - anAISObj = AISObjectPtr(new GeomAPI_AISObject()); \ - Handle(CLASS) aPrs = new CLASS(theConstraint, thePlane); \ - anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs)); \ - } \ - } \ - return anAISObj; \ -} - - -CONSTRAINT2_PRS_IMPL(angleConstraint, SketcherPrs_Angle); -CONSTRAINT2_PRS_IMPL(radiusConstraint, SketcherPrs_Radius); -CONSTRAINT2_PRS_IMPL(lengthDimensionConstraint, SketcherPrs_LengthDimension); +CONSTRAINT_PRS_IMPL(lengthDimensionConstraint, SketcherPrs_LengthDimension); +CONSTRAINT_PRS_IMPL(angleConstraint, SketcherPrs_Angle); +CONSTRAINT_PRS_IMPL(radiusConstraint, SketcherPrs_Radius); // Non-standard constraints definition AISObjectPtr SketcherPrs_Factory::horisontalConstraint(ModelAPI_Feature* theConstraint,