#include <GeomAPI_XYZ.h>
#include <ModelAPI_AttributeDouble.h>
+#include <gp_Circ.hxx>
+
static const gp_Circ MyDefCirc(gp_Ax2(gp_Pnt(0,0,0), gp_Dir(0,0,1)), 1);
IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Radius, AIS_RadiusDimension);
myAspect->MakeText3d(false);
myAspect->MakeTextShaded(false);
myAspect->MakeUnitsDisplayed(false);
- myAspect->TextAspect()->SetHeight(MyTextHeight);
+ myAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getDefaultTextHeight());
myAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize());
SetDimensionAspect(myAspect);
- SetSelToleranceForText2d(MyTextHeight);
+ SetSelToleranceForText2d(SketcherPrs_Tools::getDefaultTextHeight());
}
-
void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode)
if (!aFlyoutAttr->isInitialized())
return; // can not create a good presentation
- std::shared_ptr<GeomAPI_Pnt> aFlyoutPnt = myPlane->to3D(aFlyoutAttr->x(), aFlyoutAttr->y());
-
// Get circle
std::shared_ptr<ModelAPI_AttributeRefAttr> anAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>
std::shared_ptr<ModelAPI_Feature> aCyrcFeature = ModelAPI_Feature::feature(anAttr->object());
double aRadius = 1;
std::shared_ptr<GeomDataAPI_Point2D> aCenterAttr;
+ // it is possible that circle result becomes zero, in this case the presentation should disappear
+ // for example, it happens when circle radius is set to zero
+ if (!aCyrcFeature)
+ return;
if (aCyrcFeature->getKind() == SketchPlugin_Circle::ID()) { // circle
aCenterAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aCyrcFeature->data()->attribute(SketchPlugin_Circle::CENTER_ID()));
aRadius = aCenterAttr->pnt()->distance(aStartAttr->pnt());
}
std::shared_ptr<GeomAPI_Pnt> aCenter = myPlane->to3D(aCenterAttr->x(), aCenterAttr->y());
- std::shared_ptr<GeomAPI_Dir> aNormal = myPlane->norm();
+ std::shared_ptr<GeomAPI_Dir> aNormal = myPlane->normal();
GeomAPI_Circ aCircle(aCenter, aNormal, aRadius);
std::shared_ptr<GeomAPI_Pnt> anAnchor = SketcherPrs_Tools::getAnchorPoint(myConstraint, myPlane);
- //std::shared_ptr<GeomAPI_Pnt> anAnchor = aCircle.project(aFlyoutPnt);
- //std::shared_ptr<GeomAPI_XYZ> anAnchorXYZ = anAnchor->xyz();
- //anAnchorXYZ = anAnchorXYZ->decreased(aCenter->xyz());
- //std::shared_ptr<GeomAPI_Dir> aDeltaDir(new GeomAPI_Dir(anAnchorXYZ));
- //const double aDelta = 1e-3;
- //anAnchor->setX(anAnchor->x() + aDelta * aDeltaDir->x());
- //anAnchor->setY(anAnchor->y() + aDelta * aDeltaDir->y());
- //anAnchor->setZ(anAnchor->z() + aDelta * aDeltaDir->z());
-
- SetMeasuredGeometry(aCircle.impl<gp_Circ>(), anAnchor->impl<gp_Pnt>());
+
+ gp_Circ aCirc = aCircle.impl<gp_Circ>();
+ gp_Pnt anAncorPnt = anAnchor->impl<gp_Pnt>();
+ // anchor point should not coincide to the location point of the circle
+ // OCCT does not process this case.
+ if (anAncorPnt.Distance(aCirc.Location()) < 1e-7)
+ return;
+ SetMeasuredGeometry(aCirc, anAncorPnt);
SetCustomValue(aRadius);
+ myAspect->SetExtensionSize(myAspect->ArrowAspect()->Length());
+ myAspect->SetArrowTailSize(myAspect->ArrowAspect()->Length());
+
AIS_RadiusDimension::Compute(thePresentationManager, thePresentation, theMode);
}
{
Standard_Integer aMode;
switch (theMode) {
+ case 0: // we should use selection of all objects
+ aMode = 0;
+ break;
case SketcherPrs_Tools::Sel_Dimension_All:
aMode = 0;
break;
case SketcherPrs_Tools::Sel_Dimension_Text:
aMode = 2;
break;
- default:
- aMode = theMode;
+ default: {
+ // there are own selection modes, so the others should be ignored
+ // otherwise, the text selection appears in the viewer
+ return;
+ }
}
AIS_RadiusDimension::ComputeSelection(aSelection, aMode);
}