From 45783147f099fd7b236292f99f721cca30a5c96c Mon Sep 17 00:00:00 2001 From: dmv Date: Thu, 7 Oct 2010 12:09:43 +0000 Subject: [PATCH] IPAL22046 TC 5.1.5: Modify the Location - impossible to select the same Path object after Apply --- src/TransformationGUI/TransformationGUI_MirrorDlg.cxx | 5 +++++ src/TransformationGUI/TransformationGUI_PositionDlg.cxx | 9 +++++++-- src/TransformationGUI/TransformationGUI_RotationDlg.cxx | 5 +++++ src/TransformationGUI/TransformationGUI_ScaleDlg.cxx | 8 ++++++++ .../TransformationGUI_TranslationDlg.cxx | 5 +++++ 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx index e8dcf3148..bead55015 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx @@ -197,6 +197,11 @@ bool TransformationGUI_MirrorDlg::ClickOnApply() return false; initName(); + + myObjects.length(0); + myEditCurrentArgument = GroupPoints->LineEdit1; + myEditCurrentArgument->setText(""); + // activate selection and connect selection manager ConstructorsClicked(getConstructorId()); return true; diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx index feac8ab91..ccbc45ab3 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx @@ -300,6 +300,11 @@ bool TransformationGUI_PositionDlg::ClickOnApply() return false; initName(); + + myObjects.length(0); + myEditCurrentArgument = Group1->LineEdit1; + myEditCurrentArgument->setText(""); + // activate selection and connect selection manager ConstructorsClicked(getConstructorId()); return true; @@ -340,8 +345,8 @@ void TransformationGUI_PositionDlg::SelectionIntoArgument() else myEditCurrentArgument->setText(aName); - if (getConstructorId() == 2) - Group1->PushButton5->click(); + /* if (getConstructorId() == 2) + Group1->PushButton5->click();*/ } else if (myEditCurrentArgument == Group1->LineEdit2) { if (aSelList.Extent() != 1) diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx index 1b9183a83..e33e32d51 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx @@ -236,6 +236,11 @@ bool TransformationGUI_RotationDlg::ClickOnApply() return false; initName(); + + myObjects.length(0); + myEditCurrentArgument = GroupPoints->LineEdit1; + myEditCurrentArgument->setText(""); + // activate selection and connect selection manager ConstructorsClicked(getConstructorId()); return true; diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index dab7b7ca4..d8f4d08b2 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -202,6 +202,9 @@ void TransformationGUI_ScaleDlg::ConstructorsClicked (int constructorId) { disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); + myPoint = GEOM::GEOM_Object::_nil(); + LineEdit2->clear(); + switch (constructorId) { case 0: // translation an object by dx, dy, dz TextLabel3->setText(tr("GEOM_SCALE_FACTOR")); @@ -258,6 +261,11 @@ bool TransformationGUI_ScaleDlg::ClickOnApply() return false; initName(tr("GEOM_SCALE")); + + myObjects.length(0); + myEditCurrentArgument = LineEdit1; + myEditCurrentArgument->setText(""); + // activate selection and connect selection manager ConstructorsClicked(getConstructorId()); return true; diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx index df10e06e1..a5f7c4d97 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx @@ -272,6 +272,11 @@ bool TransformationGUI_TranslationDlg::ClickOnApply() return false; initName(); + + myObjects.length(0); + myEditCurrentArgument = GroupPoints->LineEdit1; + myEditCurrentArgument->setText(""); + // activate selection and connect selection manager ConstructorsClicked(getConstructorId()); return true; -- 2.39.2