Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial implementation of geometrical naming in the selector.
[modules/shaper.git]
/
src
/
SketchPlugin
/
SketchPlugin_Projection.cpp
diff --git
a/src/SketchPlugin/SketchPlugin_Projection.cpp
b/src/SketchPlugin/SketchPlugin_Projection.cpp
index 4c6dfefc27e9a96a90a55682564c45b52db64f43..91b45643c5b46e6cf5848b9f9d4fc059d6b5a264 100644
(file)
--- a/
src/SketchPlugin/SketchPlugin_Projection.cpp
+++ b/
src/SketchPlugin/SketchPlugin_Projection.cpp
@@
-204,6
+204,10
@@
void SketchPlugin_Projection::computeProjection(const std::string& theID)
std::shared_ptr<GeomAPI_Circ> aCircle = anEdge->circle();
double aRadius = aCircle->radius();
std::shared_ptr<GeomAPI_Circ> aCircle = anEdge->circle();
double aRadius = aCircle->radius();
+ double aNormalsDot = aCircle->normal()->dot(aSketchPlane->direction());
+ if (fabs(fabs(aNormalsDot) - 1.0) > tolerance)
+ return; // circle is not in the plane, parallel to the sketch plane
+
std::shared_ptr<GeomAPI_Pnt> aCenter = aSketchPlane->project(aCircle->center());
std::shared_ptr<GeomAPI_Pnt2d> aCenterInSketch = sketch()->to2D(aCenter);
std::shared_ptr<GeomAPI_Pnt> aCenter = aSketchPlane->project(aCircle->center());
std::shared_ptr<GeomAPI_Pnt2d> aCenterInSketch = sketch()->to2D(aCenter);
@@
-227,7
+231,11
@@
void SketchPlugin_Projection::computeProjection(const std::string& theID)
std::shared_ptr<GeomAPI_Pnt> aCenter = aSketchPlane->project(aCircle->center());
std::shared_ptr<GeomAPI_Pnt2d> aCenterInSketch = sketch()->to2D(aCenter);
std::shared_ptr<GeomAPI_Pnt> aCenter = aSketchPlane->project(aCircle->center());
std::shared_ptr<GeomAPI_Pnt2d> aCenterInSketch = sketch()->to2D(aCenter);
- bool isInversed = aCircle->normal()->dot(aSketchPlane->direction()) < 0.;
+ double aNormalsDot = aCircle->normal()->dot(aSketchPlane->direction());
+ if (fabs(fabs(aNormalsDot) - 1.0) > tolerance)
+ return; // arc is not in the plane, parallel to the sketch plane
+
+ bool isInversed = aNormalsDot < 0.;
if (!hasPrevProj)
aProjection = sketch()->addFeature(SketchPlugin_Arc::ID());
if (!hasPrevProj)
aProjection = sketch()->addFeature(SketchPlugin_Arc::ID());
@@
-249,7
+257,7
@@
void SketchPlugin_Projection::computeProjection(const std::string& theID)
aCenterPnt->setValue(aCenterInSketch);
aProjection->boolean(SketchPlugin_Arc::REVERSED_ID())->setValue(isInversed);
aCenterPnt->setValue(aCenterInSketch);
aProjection->boolean(SketchPlugin_Arc::REVERSED_ID())->setValue(isInversed);
- aProjection->data()->blockSendAttributeUpdated(aWasBlocked
, false
);
+ aProjection->data()->blockSendAttributeUpdated(aWasBlocked);
} else
return;
} else
return;