Merge branch 'hydro/imps_2015' into V7_dev

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

diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
index dea5972458b155c360227261e812ecf2767f37f5..fd0283e1407e314f4dd75efd98b715ad7b803a75 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -259,7 +259,7 @@ void TransformationGUI_PositionDlg::ConstructorsClicked (int constructorId)
 void TransformationGUI_PositionDlg::SelectionTypeButtonClicked()
 {
   if ( Group1->CheckButton2->isChecked() ) {
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    localSelection( TopAbs_EDGE );
   } else {
     TColStd_MapOfInteger aMap;
     aMap.Add(GEOM_WIRE);
@@ -332,7 +332,7 @@ void TransformationGUI_PositionDlg::SelectionIntoArgument()
       myEditCurrentArgument->setText( aName );
       myPath = aSelectedObject;
       if ( myObjects.isEmpty() )
-       Group1->PushButton1->click();
+        Group1->PushButton1->click();
     }
     else {
       myPath.nullify();
@@ -345,25 +345,25 @@ void TransformationGUI_PositionDlg::SelectionIntoArgument()
       QString aName = GEOMBase::GetName( aSelectedObject.get() );
       myEditCurrentArgument->setText( aName );
       if ( myEditCurrentArgument == Group1->LineEdit2 ) {
-       myStartLCS = aSelectedObject;
-       if ( !myEndLCS )
-         Group1->PushButton4->click();
-       else if ( myObjects.isEmpty() )
-         Group1->PushButton1->click();
+        myStartLCS = aSelectedObject;
+        if ( !myEndLCS )
+          Group1->PushButton4->click();
+        else if ( myObjects.isEmpty() )
+          Group1->PushButton1->click();
       }
       else if ( myEditCurrentArgument == Group1->LineEdit4 ) {
-       myEndLCS = aSelectedObject;
-       if ( myObjects.isEmpty() )
-         Group1->PushButton1->click();
-       else if ( getConstructorId() == 1 && !myStartLCS )
-         Group1->PushButton2->click();
+        myEndLCS = aSelectedObject;
+        if ( myObjects.isEmpty() )
+          Group1->PushButton1->click();
+        else if ( getConstructorId() == 1 && !myStartLCS )
+          Group1->PushButton2->click();
       }
     }
     else {
       if ( myEditCurrentArgument == Group1->LineEdit2 )
-       myStartLCS.nullify();
+        myStartLCS.nullify();
       else if ( myEditCurrentArgument == Group1->LineEdit4 )
-       myEndLCS.nullify();
+        myEndLCS.nullify();
     }
   }
 
@@ -433,7 +433,7 @@ void TransformationGUI_PositionDlg::SetEditCurrentArgument()
     Group1->CheckButton2->setEnabled(true);
 
     if ( Group1->CheckButton2->isChecked() ) {
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+      localSelection( TopAbs_EDGE );
     } else {
       TColStd_MapOfInteger aMap;
       aMap.Add(GEOM_WIRE);
@@ -608,3 +608,17 @@ void TransformationGUI_PositionDlg::addSubshapesToStudy()
   if ( getConstructorId() == 2 )
     GEOMBase::PublishSubObject( myPath.get() );
 }
+
+//=================================================================================
+// function : getSourceObjects
+// purpose  : virtual method to get source objects
+//=================================================================================
+QList<GEOM::GeomObjPtr> TransformationGUI_PositionDlg::getSourceObjects()
+{
+  QList<GEOM::GeomObjPtr> res;
+  if ( Group1->CheckButton1->isChecked() ) {
+    res.append(myObjects);
+    res << myStartLCS << myEndLCS << myPath;
+  }
+  return res;
+}