INT PAL 0052666: Presentation disappears from the 3D Viewer after that as an operation is applied to the object

This commit is contained in:
imn 2015-04-06 14:07:27 +03:00
parent 5b935c9b4f
commit 4ca9a3e8ad
7 changed files with 30 additions and 12 deletions

View File

@ -307,7 +307,9 @@ void RepairGUI_ChangeOrientationDlg::CreateCopyModeChanged( bool isCreateCopy )
QList<GEOM::GeomObjPtr> RepairGUI_ChangeOrientationDlg::getSourceObjects() QList<GEOM::GeomObjPtr> RepairGUI_ChangeOrientationDlg::getSourceObjects()
{ {
QList<GEOM::GeomObjPtr> res; QList<GEOM::GeomObjPtr> res;
GEOM::GeomObjPtr aGeomObjPtr(myObject); if ( GroupPoints->CheckButton1->isChecked() ) {
res << aGeomObjPtr; GEOM::GeomObjPtr aGeomObjPtr(myObject);
res << aGeomObjPtr;
}
return res; return res;
} }

View File

@ -461,7 +461,10 @@ void TransformationGUI_MirrorDlg::addSubshapesToStudy()
//================================================================================= //=================================================================================
QList<GEOM::GeomObjPtr> TransformationGUI_MirrorDlg::getSourceObjects() QList<GEOM::GeomObjPtr> TransformationGUI_MirrorDlg::getSourceObjects()
{ {
QList<GEOM::GeomObjPtr> res(myObjects); QList<GEOM::GeomObjPtr> res;
res << myArgument; if ( GroupPoints->CheckButton1->isChecked() ) {
res.append(myObjects);
res << myArgument;
}
return res; return res;
} }

View File

@ -335,5 +335,8 @@ void TransformationGUI_OffsetDlg::CreateCopyModeChanged()
//================================================================================= //=================================================================================
QList<GEOM::GeomObjPtr> TransformationGUI_OffsetDlg::getSourceObjects() QList<GEOM::GeomObjPtr> TransformationGUI_OffsetDlg::getSourceObjects()
{ {
return myObjects; QList<GEOM::GeomObjPtr> res;
if ( GroupPoints->CheckButton1->isChecked() )
res.append( myObjects );
return res;
} }

View File

@ -615,7 +615,10 @@ void TransformationGUI_PositionDlg::addSubshapesToStudy()
//================================================================================= //=================================================================================
QList<GEOM::GeomObjPtr> TransformationGUI_PositionDlg::getSourceObjects() QList<GEOM::GeomObjPtr> TransformationGUI_PositionDlg::getSourceObjects()
{ {
QList<GEOM::GeomObjPtr> res(myObjects); QList<GEOM::GeomObjPtr> res;
res << myStartLCS << myEndLCS << myPath; if ( Group1->CheckButton1->isChecked() ) {
res.append(myObjects);
res << myStartLCS << myEndLCS << myPath;
}
return res; return res;
} }

View File

@ -623,7 +623,10 @@ void TransformationGUI_RotationDlg::addSubshapesToStudy()
//================================================================================= //=================================================================================
QList<GEOM::GeomObjPtr> TransformationGUI_RotationDlg::getSourceObjects() QList<GEOM::GeomObjPtr> TransformationGUI_RotationDlg::getSourceObjects()
{ {
QList<GEOM::GeomObjPtr> res(myObjects); QList<GEOM::GeomObjPtr> res;
res << myAxis << myCentPoint << myPoint1 << myPoint2; if ( GroupPoints->CheckButton1->isChecked() ) {
res.append(myObjects);
res << myAxis << myCentPoint << myPoint1 << myPoint2;
}
return res; return res;
} }

View File

@ -541,6 +541,7 @@ void TransformationGUI_ScaleDlg::addSubshapesToStudy()
QList<GEOM::GeomObjPtr> TransformationGUI_ScaleDlg::getSourceObjects() QList<GEOM::GeomObjPtr> TransformationGUI_ScaleDlg::getSourceObjects()
{ {
QList<GEOM::GeomObjPtr> res(myObjects); QList<GEOM::GeomObjPtr> res(myObjects);
res << myPoint; if ( CheckBoxCopy->isChecked() )
res << myPoint;
return res; return res;
} }

View File

@ -694,7 +694,10 @@ void TransformationGUI_TranslationDlg::createPathPreview ( GEOM::GEOM_Object_ptr
//================================================================================= //=================================================================================
QList<GEOM::GeomObjPtr> TransformationGUI_TranslationDlg::getSourceObjects() QList<GEOM::GeomObjPtr> TransformationGUI_TranslationDlg::getSourceObjects()
{ {
QList<GEOM::GeomObjPtr> res(myObjects); QList<GEOM::GeomObjPtr> res;
res << myVector << myPoint1 << myPoint2; if ( GroupPoints->CheckBox2->isChecked() ) {
res.append(myObjects);
res << myVector << myPoint1 << myPoint2;
}
return res; return res;
} }