X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Radius.cpp;h=0846607545204f88e73403d9734f3b077025f423;hb=f5c7bb3100ed321392da42f61c2ab505833ec61a;hp=a3643fe08698926dd83629401a1afe6adeeb77b6;hpb=f22a65689fa8bb54274a23f0f974fc538e4a22ab;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Radius.cpp b/src/SketcherPrs/SketcherPrs_Radius.cpp
index a3643fe08..084660754 100644
--- 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 <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);
@@ -27,19 +29,19 @@ SketcherPrs_Radius::SketcherPrs_Radius(ModelAPI_Feature* theConstraint,
                                        const std::shared_ptr<GeomAPI_Ax3>& thePlane)
 : AIS_RadiusDimension(MyDefCirc), myConstraint(theConstraint), myPlane(thePlane)
 {
+  // Set default values of the presentation
   myAspect = new Prs3d_DimensionAspect();
   myAspect->MakeArrows3d(false);
   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)
@@ -53,8 +55,6 @@ void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& the
   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>
@@ -64,6 +64,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;
+  // 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()));
@@ -80,31 +84,38 @@ void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& the
     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);
-  //gp_Circ aCircle(gp_Ax2(aCenter->impl<gp_Pnt>(), aNormal->impl<gp_Dir>()), aRadius);
     
-  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>());
+  std::shared_ptr<GeomAPI_Pnt> anAnchor = SketcherPrs_Tools::getAnchorPoint(myConstraint, myPlane);
+
+  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());
+  // The value of vertical aligment is sometimes changed
+  myAspect->TextAspect()->SetVerticalJustification(Graphic3d_VTA_CENTER);
+
   AIS_RadiusDimension::Compute(thePresentationManager, thePresentation, theMode);
 }
 
 void SketcherPrs_Radius::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
                                                    const Standard_Integer theMode)
 {
+  // Map the application selection modes to standard ones
   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;
@@ -114,8 +125,11 @@ void SketcherPrs_Radius::ComputeSelection(const Handle(SelectMgr_Selection)& aSe
   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);
 }