From 4ca9a3e8ad7d51cca077aa417b30f5f94108bd7a Mon Sep 17 00:00:00 2001 From: imn Date: Mon, 6 Apr 2015 14:07:27 +0300 Subject: [PATCH] INT PAL 0052666: Presentation disappears from the 3D Viewer after that as an operation is applied to the object --- src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx | 6 ++++-- src/TransformationGUI/TransformationGUI_MirrorDlg.cxx | 7 +++++-- src/TransformationGUI/TransformationGUI_OffsetDlg.cxx | 5 ++++- src/TransformationGUI/TransformationGUI_PositionDlg.cxx | 7 +++++-- src/TransformationGUI/TransformationGUI_RotationDlg.cxx | 7 +++++-- src/TransformationGUI/TransformationGUI_ScaleDlg.cxx | 3 ++- src/TransformationGUI/TransformationGUI_TranslationDlg.cxx | 7 +++++-- 7 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx index d077f8352..8a038ec3c 100644 --- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx +++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx @@ -307,7 +307,9 @@ void RepairGUI_ChangeOrientationDlg::CreateCopyModeChanged( bool isCreateCopy ) QList RepairGUI_ChangeOrientationDlg::getSourceObjects() { QList res; - GEOM::GeomObjPtr aGeomObjPtr(myObject); - res << aGeomObjPtr; + if ( GroupPoints->CheckButton1->isChecked() ) { + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + } return res; } diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx index ce56c6265..133d181d6 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx @@ -461,7 +461,10 @@ void TransformationGUI_MirrorDlg::addSubshapesToStudy() //================================================================================= QList TransformationGUI_MirrorDlg::getSourceObjects() { - QList res(myObjects); - res << myArgument; + QList res; + if ( GroupPoints->CheckButton1->isChecked() ) { + res.append(myObjects); + res << myArgument; + } return res; } diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx index 487aed5ab..8affede00 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx @@ -335,5 +335,8 @@ void TransformationGUI_OffsetDlg::CreateCopyModeChanged() //================================================================================= QList TransformationGUI_OffsetDlg::getSourceObjects() { - return myObjects; + QList res; + if ( GroupPoints->CheckButton1->isChecked() ) + res.append( myObjects ); + return res; } diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx index 007817644..87d155511 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx @@ -615,7 +615,10 @@ void TransformationGUI_PositionDlg::addSubshapesToStudy() //================================================================================= QList TransformationGUI_PositionDlg::getSourceObjects() { - QList res(myObjects); - res << myStartLCS << myEndLCS << myPath; + QList res; + if ( Group1->CheckButton1->isChecked() ) { + res.append(myObjects); + res << myStartLCS << myEndLCS << myPath; + } return res; } diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx index adb8767df..03ce4cecb 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx @@ -623,7 +623,10 @@ void TransformationGUI_RotationDlg::addSubshapesToStudy() //================================================================================= QList TransformationGUI_RotationDlg::getSourceObjects() { - QList res(myObjects); - res << myAxis << myCentPoint << myPoint1 << myPoint2; + QList res; + if ( GroupPoints->CheckButton1->isChecked() ) { + res.append(myObjects); + res << myAxis << myCentPoint << myPoint1 << myPoint2; + } return res; } diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index 0e3767ef3..e43169ba3 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -541,6 +541,7 @@ void TransformationGUI_ScaleDlg::addSubshapesToStudy() QList TransformationGUI_ScaleDlg::getSourceObjects() { QList res(myObjects); - res << myPoint; + if ( CheckBoxCopy->isChecked() ) + res << myPoint; return res; } diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx index 71b5cb062..f5622c716 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx @@ -694,7 +694,10 @@ void TransformationGUI_TranslationDlg::createPathPreview ( GEOM::GEOM_Object_ptr //================================================================================= QList TransformationGUI_TranslationDlg::getSourceObjects() { - QList res(myObjects); - res << myVector << myPoint1 << myPoint2; + QList res; + if ( GroupPoints->CheckBox2->isChecked() ) { + res.append(myObjects); + res << myVector << myPoint1 << myPoint2; + } return res; }