X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Radius.cpp;h=c08d7ab9430db8523b308bc025595686ec6a360f;hb=8ebc9a7d5f87057b61b174e7568e01e44571549d;hp=a3643fe08698926dd83629401a1afe6adeeb77b6;hpb=33b3a43ad2266cb044e4232c902344842adbba7c;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Radius.cpp b/src/SketcherPrs/SketcherPrs_Radius.cpp
index a3643fe08..c08d7ab94 100644
--- a/src/SketcherPrs/SketcherPrs_Radius.cpp
+++ b/src/SketcherPrs/SketcherPrs_Radius.cpp
@@ -32,11 +32,11 @@ SketcherPrs_Radius::SketcherPrs_Radius(ModelAPI_Feature* theConstraint,
   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());
 }
 
 
@@ -83,16 +83,16 @@ void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& the
   std::shared_ptr<GeomAPI_Dir> aNormal = myPlane->norm();
 
   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());
+  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>());
   SetCustomValue(aRadius);
@@ -105,6 +105,9 @@ void SketcherPrs_Radius::ComputeSelection(const Handle(SelectMgr_Selection)& aSe
 {
   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 +117,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);
 }