Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
803af3d
)
Fix for a crash: Create sketch, circle, Radius constraint with 0 value.
author
nds
<nds@opencascade.com>
Thu, 3 Sep 2015 04:39:09 +0000
(07:39 +0300)
committer
nds
<nds@opencascade.com>
Thu, 3 Sep 2015 04:39:35 +0000
(07:39 +0300)
src/SketcherPrs/SketcherPrs_Radius.cpp
patch
|
blob
|
history
diff --git
a/src/SketcherPrs/SketcherPrs_Radius.cpp
b/src/SketcherPrs/SketcherPrs_Radius.cpp
index 6fc31d0d588ad8636d920cdd120e0b4a0ee370a6..011555ffae0a6d237e35dca44dc8d750e6594928 100644
(file)
--- a/
src/SketcherPrs/SketcherPrs_Radius.cpp
+++ b/
src/SketcherPrs/SketcherPrs_Radius.cpp
@@
-18,6
+18,8
@@
#include <GeomAPI_XYZ.h>
#include <ModelAPI_AttributeDouble.h>
#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);
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);
@@
-39,7
+41,6
@@
SketcherPrs_Radius::SketcherPrs_Radius(ModelAPI_Feature* theConstraint,
SetSelToleranceForText2d(SketcherPrs_Tools::getDefaultTextHeight());
}
SetSelToleranceForText2d(SketcherPrs_Tools::getDefaultTextHeight());
}
-
void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode)
void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode)
@@
-62,6
+63,10
@@
void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& the
std::shared_ptr<ModelAPI_Feature> aCyrcFeature = ModelAPI_Feature::feature(anAttr->object());
double aRadius = 1;
std::shared_ptr<GeomDataAPI_Point2D> aCenterAttr;
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()));
if (aCyrcFeature->getKind() == SketchPlugin_Circle::ID()) { // circle
aCenterAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aCyrcFeature->data()->attribute(SketchPlugin_Circle::CENTER_ID()));
@@
-84,7
+89,13
@@
void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& the
std::shared_ptr<GeomAPI_Pnt> anAnchor = SketcherPrs_Tools::getAnchorPoint(myConstraint, myPlane);
std::shared_ptr<GeomAPI_Pnt> anAnchor = SketcherPrs_Tools::getAnchorPoint(myConstraint, myPlane);
- 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());
SetCustomValue(aRadius);
myAspect->SetExtensionSize(myAspect->ArrowAspect()->Length());