Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

diff --git a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp
index 99cd15c37b176b488c3c403f855ccad6bff2ca53..9a4509794036c4cfdca5447d6441b4b3b27b54d8 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp
+++ b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp
@@ -160,6 +160,9 @@ void SketcherPrs_LengthDimension::ComputeSelection(const Handle(SelectMgr_Select
 {
   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;
@@ -169,8 +172,11 @@ void SketcherPrs_LengthDimension::ComputeSelection(const Handle(SelectMgr_Select
   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_LengthDimension::ComputeSelection(aSelection, aMode);
 }

diff --git a/src/SketcherPrs/SketcherPrs_Radius.cpp b/src/SketcherPrs/SketcherPrs_Radius.cpp
index 5d7135e063f274502802d781487822bb1efcab9c..11eec07340e2788aa3b20507f56205dd15da8cc7 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Radius.cpp
+++ b/src/SketcherPrs/SketcherPrs_Radius.cpp
@@ -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);
 }