From 2960cb21649c1029e1e062f22702fd8f7273e423 Mon Sep 17 00:00:00 2001 From: imn Date: Wed, 8 Apr 2015 12:33:26 +0300 Subject: [PATCH] INT PAL 0052666: Presentation disappears from the 3D Viewer after that as an operation is applied to the object(some fix) --- src/EntityGUI/EntityGUI_FieldDlg.cxx | 2 +- src/GenerationGUI/GenerationGUI_ThicknessDlg.cxx | 11 +++++++++++ src/GenerationGUI/GenerationGUI_ThicknessDlg.h | 3 ++- src/OperationGUI/OperationGUI_TransferDataDlg.cxx | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/EntityGUI/EntityGUI_FieldDlg.cxx b/src/EntityGUI/EntityGUI_FieldDlg.cxx index 22806e416..6e887f941 100644 --- a/src/EntityGUI/EntityGUI_FieldDlg.cxx +++ b/src/EntityGUI/EntityGUI_FieldDlg.cxx @@ -1990,7 +1990,7 @@ bool EntityGUI_FieldDlg::execute() QList EntityGUI_FieldDlg::getSourceObjects() { QList res; - GEOM::GeomObjPtr aGeomObjPtr(myShape); + GEOM::GeomObjPtr aGeomObjPtr(myField->GetShape()); res << aGeomObjPtr; return res; } diff --git a/src/GenerationGUI/GenerationGUI_ThicknessDlg.cxx b/src/GenerationGUI/GenerationGUI_ThicknessDlg.cxx index 650024b3d..3c6bd003e 100644 --- a/src/GenerationGUI/GenerationGUI_ThicknessDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_ThicknessDlg.cxx @@ -467,3 +467,14 @@ bool GenerationGUI_ThicknessDlg::execute (ObjectList& objects) return true; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GenerationGUI_ThicknessDlg::getSourceObjects() +{ + QList res(myFaces); + res << myObject; + return res; +} diff --git a/src/GenerationGUI/GenerationGUI_ThicknessDlg.h b/src/GenerationGUI/GenerationGUI_ThicknessDlg.h index b05d9f51b..347376098 100644 --- a/src/GenerationGUI/GenerationGUI_ThicknessDlg.h +++ b/src/GenerationGUI/GenerationGUI_ThicknessDlg.h @@ -49,7 +49,8 @@ protected: // redefined from GEOMBase_Helper virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); - virtual bool execute( ObjectList& ); + virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/OperationGUI/OperationGUI_TransferDataDlg.cxx b/src/OperationGUI/OperationGUI_TransferDataDlg.cxx index 576b36773..6420e28c6 100755 --- a/src/OperationGUI/OperationGUI_TransferDataDlg.cxx +++ b/src/OperationGUI/OperationGUI_TransferDataDlg.cxx @@ -337,6 +337,6 @@ bool OperationGUI_TransferDataDlg::execute (ObjectList& objects) QList OperationGUI_TransferDataDlg::getSourceObjects() { QList res; - res << myObject1 << myObject2; + res << myObject1; return res; } -- 2.39.2