IPAL21437 Multi-selection is not impossible in transformation dialogs.

[modules/geom.git] / src / TransformationGUI / TransformationGUI_RotationDlg.cxx

diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
index c56fd9c9b935de0f116db7ae06fd9121793e570c..1ff6844600cacf66b782ad79f948fa1953a3204c 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
@@ -263,6 +263,7 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
   LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
   SALOME_ListIO aSelList;
   aSelMgr->selectedObjects(aSelList);
+  GEOM::GEOM_Object_var aSelectedObject;
 
   QString aName;
 
@@ -274,8 +275,6 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
     GEOMBase::ConvertListOfIOInListOfGO(aSelList, myObjects);
     if (!myObjects.length())
       return;
-    else
-      myEditCurrentArgument->setText(aName);
   }
   else {
     if (aSelList.Extent() != 1)
@@ -283,7 +282,7 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
 
     // nbSel == 1
     Standard_Boolean testResult = Standard_False;
-    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
     if (!testResult || CORBA::is_nil(aSelectedObject))
       return;
@@ -328,36 +327,43 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
         }
       }
     }
+  }
+  
+  myEditCurrentArgument->setText(aName);
 
-    myEditCurrentArgument->setText(aName);
-
-    if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0) {
-      myAxis = aSelectedObject;
-      if (!myAxis->_is_nil() && !myObjects.length())
-        GroupPoints->PushButton1->click();
-    }
-    else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1) {
-      myCentPoint = aSelectedObject;
-      if (!myCentPoint->_is_nil() && myPoint1->_is_nil())
-        GroupPoints->PushButton4->click();
-    }
-    else if (myEditCurrentArgument == GroupPoints->LineEdit4) {
-      myPoint1 = aSelectedObject;
-      if (!myPoint1->_is_nil() && myPoint2->_is_nil())
-        GroupPoints->PushButton5->click();
-    }
-    else if (myEditCurrentArgument == GroupPoints->LineEdit5) {
-      myPoint2 = aSelectedObject;
-      if (!myPoint2->_is_nil() && !myObjects.length())
-        GroupPoints->PushButton1->click();
-    }
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    /*    if (myObjects.length()) {
+      if (getConstructorId() == 0 && myAxis->_is_nil() || getConstructorId() == 1 && myCentPoint->_is_nil() )
+       GroupPoints->PushButton2->click();
+        }*/   // here commented, because multiple objects can be selected IPAL 21437
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0) {
+    myAxis = aSelectedObject;
+    if (!myAxis->_is_nil() && !myObjects.length())
+      GroupPoints->PushButton1->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1) {
+    myCentPoint = aSelectedObject;
+    if (!myCentPoint->_is_nil() && myPoint1->_is_nil())
+      GroupPoints->PushButton4->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit4) {
+    myPoint1 = aSelectedObject;
+    if (!myPoint1->_is_nil() && myPoint2->_is_nil())
+      GroupPoints->PushButton5->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit5) {
+    myPoint2 = aSelectedObject;
+    if (!myPoint2->_is_nil() && !myObjects.length())
+      GroupPoints->PushButton1->click();
   }
 
   // clear selection
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  /*  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   myGeomGUI->getApp()->selectionMgr()->clearSelected();
   connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  this, SLOT(SelectionIntoArgument()));*/
+  // here commented, because multiple objects can be selected IPAL 21437
 
   displayPreview();
 }
@@ -377,7 +383,11 @@ void TransformationGUI_RotationDlg::SetEditCurrentArgument()
     myEditCurrentArgument = GroupPoints->LineEdit1;
 
     GroupPoints->PushButton2->setDown(false);
+    GroupPoints->PushButton4->setDown(false);
+    GroupPoints->PushButton5->setDown(false);
     GroupPoints->LineEdit2->setEnabled(false);
+    GroupPoints->LineEdit4->setEnabled(false);
+    GroupPoints->LineEdit5->setEnabled(false);
   }
   else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
@@ -528,6 +538,8 @@ bool TransformationGUI_RotationDlg::execute (ObjectList& objects)
 
   GEOM::GEOM_Object_var anObj;
 
+  GEOM::GEOM_ITransformOperations_var anOper = GEOM::GEOM_ITransformOperations::_narrow(getOperation());
+
   switch (getConstructorId()) {
   case 0:
     {
@@ -536,11 +548,10 @@ bool TransformationGUI_RotationDlg::execute (ObjectList& objects)
       if (toCreateCopy) {
         for (int i = 0; i < myObjects.length(); i++) {
           myCurrObject = myObjects[i];
-          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
-            RotateCopy(myObjects[i], myAxis, GetAngle() * PI180);
+          anObj = anOper->RotateCopy(myObjects[i], myAxis, GetAngle() * PI180);
           if (!anObj->_is_nil()) {
             if(!IsPreview()) {
-              anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+              anObj->SetParameters(aParameters.join(":").toLatin1().constData());
             }
             objects.push_back(anObj._retn());
           }
@@ -549,11 +560,10 @@ bool TransformationGUI_RotationDlg::execute (ObjectList& objects)
       else {
         for (int i = 0; i < myObjects.length(); i++) {
           myCurrObject = myObjects[i];
-          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
-            Rotate(myObjects[i], myAxis, GetAngle() * PI180);
+          anObj = anOper->Rotate(myObjects[i], myAxis, GetAngle() * PI180);
           if (!anObj->_is_nil()) {
             if(!IsPreview()) {
-              anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+              anObj->SetParameters(aParameters.join(":").toLatin1().constData());
              updateAttributes(anObj, aParameters);
            }
             objects.push_back(anObj._retn());
@@ -568,8 +578,7 @@ bool TransformationGUI_RotationDlg::execute (ObjectList& objects)
       if (toCreateCopy) {
         for (int i = 0; i < myObjects.length(); i++) {
           myCurrObject = myObjects[i];
-          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
-            RotateThreePointsCopy(myObjects[i], myCentPoint, myPoint1, myPoint2);
+          anObj = anOper->RotateThreePointsCopy(myObjects[i], myCentPoint, myPoint1, myPoint2);
           if (!anObj->_is_nil())
             objects.push_back(anObj._retn());
         }
@@ -577,8 +586,7 @@ bool TransformationGUI_RotationDlg::execute (ObjectList& objects)
       else {
         for (int i = 0; i < myObjects.length(); i++) {
           myCurrObject = myObjects[i];
-          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
-            RotateThreePoints(myObjects[i], myCentPoint, myPoint1, myPoint2);
+          anObj = anOper->RotateThreePoints(myObjects[i], myCentPoint, myPoint1, myPoint2);
           if (!anObj->_is_nil())
             objects.push_back(anObj._retn());
         }