From: nds <natalia.donis@opencascade.com>
Date: Mon, 25 May 2015 13:02:42 +0000 (+0300)
Subject: A fix for the next case:
X-Git-Tag: V_1.2.0~96
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1834431e0e067cbb4616f42679562d56af528f5e;p=modules%2Fshaper.git

A fix for the next case:

preselection of a point, start a line creation. A line is created with the second point in the origin.
The same problem is for the preselection in the translation operation.
---

diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp
index ae623079c..d688e90aa 100644
--- a/src/ModuleBase/ModuleBase_Operation.cpp
+++ b/src/ModuleBase/ModuleBase_Operation.cpp
@@ -274,11 +274,14 @@ void ModuleBase_Operation::activateByPreselection()
     aFilledWgt = aWgt;
   }*/
 
-  // 3. activate the next obligatory widget
-  myPropertyPanel->activateNextWidget(aFilledWgt);
+  // 3. a signal should be emitted before the next widget activation
+  // because, the activation of the next widget will give a focus to the widget. As a result
+  // the value of the widget is initialized. And commit may happens until the value is entered.
   if (aFilledWgt)
     emit activatedByPreselection();
 
+  // 4. activate the next obligatory widget
+  myPropertyPanel->activateNextWidget(aFilledWgt);
 }
 
 void ModuleBase_Operation::setParentFeature(CompositeFeaturePtr theParent)
diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 976972a60..6ee99f6cf 100644
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -230,7 +230,6 @@ bool ModuleBase_WidgetMultiSelector::setSelection(const QList<ModuleBase_ViewerP
   bool isDone = false;
   for (int i = thePosition; i < theValues.size(); i++) {
     ModuleBase_ViewerPrs aValue = theValues[i];
-    thePosition++;
     bool aProcessed = false;
     if (isValidSelection(aValue)) {
       aProcessed = setSelectionCustom(aValue);
@@ -240,6 +239,8 @@ bool ModuleBase_WidgetMultiSelector::setSelection(const QList<ModuleBase_ViewerP
     // when an object, which do not satisfy the validating process, stop set selection
     if (!aProcessed)
       break;
+    else
+      thePosition++;
   }
   if (isDone) {
     updateObject(myFeature);