From: nds <natalia.donis@opencascade.com>
Date: Wed, 24 Jun 2015 13:11:03 +0000 (+0300)
Subject: SALOME porting: highlight should be cleared in the viewer
X-Git-Tag: V_1.3.0~193
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c61f2ec302cd6027a7c06a1472fd0032d2a40d68;p=modules%2Fshaper.git

SALOME porting: highlight should be cleared in the viewer

Multi selection crash remove.
---

diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp
index 60b2573e7..fbce745f6 100644
--- a/src/PartSet/PartSet_WidgetMultiSelector.cpp
+++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp
@@ -109,9 +109,9 @@ void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& t
     }
     if (aShape.get() != NULL && !aShape->isNull()) {
       if (myIsInVaildate)
-        theObject = myExternalObjectMgr->externalObjectValidated(theObject, theShape, sketch());
+        theObject = myExternalObjectMgr->externalObjectValidated(theObject, aShape, sketch());
       else
-        theObject = myExternalObjectMgr->externalObject(theObject, theShape, sketch());
+        theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch());
     }
   }
 }
diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
index adc71b67b..77b40fc8b 100644
--- a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
+++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
@@ -379,7 +379,7 @@ void SketcherPrs_SymbolPrs::Compute(const Handle(PrsMgr_PresentationManager3d)&
 void SketcherPrs_SymbolPrs::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
                                             const Standard_Integer aMode)
 {
-  //ClearSelected();
+  ClearSelected();
   if ((aMode == 0) || (aMode == SketcherPrs_Tools::Sel_Constraint)) {
     for (int i = 1; i <= mySPoints.Length(); i++)
       aSelection->Add(mySPoints.Value(i));