Merge with PAL/SALOME 2.1.0d

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

diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
index 7279d5b9ebbabd90d3ded9130b1bb086ba55a152..441abea0a72eb3c804abfbd11fc0d3c133826f97 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
@@ -176,7 +176,7 @@ void TransformationGUI_MultiRotationDlg::ConstructorsClicked(int constructorId)
   myStep = 50.0;
   myNbTimes1 = myNbTimes2 = 2;
   
-  globalSelection();
+  globalSelection( GEOM_ALLSHAPES );
 
   switch (constructorId)
     {
@@ -275,7 +275,7 @@ void TransformationGUI_MultiRotationDlg::SelectionIntoArgument()
   Standard_Boolean testResult = Standard_False;;
   GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), testResult );
 
-  if (!testResult || CORBA::is_nil( aSelectedObject ))
+  if ( !testResult || CORBA::is_nil( aSelectedObject ) || !GEOMBase::IsShape( aSelectedObject ) )
     return;
 
 
@@ -300,7 +300,7 @@ void TransformationGUI_MultiRotationDlg::SetEditCurrentArgument()
   
   if(send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
-    globalSelection();
+    globalSelection( GEOM_ALLSHAPES );
   }
   else if(send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
@@ -308,7 +308,7 @@ void TransformationGUI_MultiRotationDlg::SetEditCurrentArgument()
   }
   else if(send == GroupDimensions->PushButton1) {
     myEditCurrentArgument = GroupDimensions->LineEdit1;
-    globalSelection();
+    globalSelection( GEOM_ALLSHAPES );
   }
   else if(send == GroupDimensions->PushButton2) {
     myEditCurrentArgument = GroupDimensions->LineEdit2;