From 4310bcdf3dfdfdcae0e8b0f53c20d67bccba47ad Mon Sep 17 00:00:00 2001 From: imn Date: Wed, 4 Mar 2015 16:05:30 +0300 Subject: [PATCH] 0022377: EDF 2752 GEOM: Add a preference in order to automatically unpublished parent objects --- resources/SalomeApp.xml.in | 1 + .../AdvancedGUI_DividedDiskDlg.cxx | 11 ++++ src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h | 1 + src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx | 12 ++++ src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h | 1 + .../AdvancedGUI_SmoothingSurfaceDlg.cxx | 10 +++ .../AdvancedGUI_SmoothingSurfaceDlg.h | 1 + src/BasicGUI/BasicGUI_ArcDlg.cxx | 11 ++++ src/BasicGUI/BasicGUI_ArcDlg.h | 1 + src/BasicGUI/BasicGUI_CircleDlg.cxx | 12 ++++ src/BasicGUI/BasicGUI_CircleDlg.h | 2 +- src/BasicGUI/BasicGUI_CurveDlg.cxx | 8 +++ src/BasicGUI/BasicGUI_CurveDlg.h | 1 + src/BasicGUI/BasicGUI_EllipseDlg.cxx | 11 ++++ src/BasicGUI/BasicGUI_EllipseDlg.h | 1 + src/BasicGUI/BasicGUI_LineDlg.cxx | 11 ++++ src/BasicGUI/BasicGUI_LineDlg.h | 3 +- src/BasicGUI/BasicGUI_MarkerDlg.cxx | 10 +++ src/BasicGUI/BasicGUI_MarkerDlg.h | 63 ++++++++++--------- src/BasicGUI/BasicGUI_PlaneDlg.cxx | 12 ++++ src/BasicGUI/BasicGUI_PlaneDlg.h | 1 + src/BasicGUI/BasicGUI_PointDlg.cxx | 11 ++++ src/BasicGUI/BasicGUI_PointDlg.h | 1 + src/BasicGUI/BasicGUI_VectorDlg.cxx | 11 ++++ src/BasicGUI/BasicGUI_VectorDlg.h | 1 + src/BlocksGUI/BlocksGUI_BlockDlg.cxx | 12 ++++ src/BlocksGUI/BlocksGUI_BlockDlg.h | 1 + src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx | 12 ++++ src/BlocksGUI/BlocksGUI_ExplodeDlg.h | 1 + src/BlocksGUI/BlocksGUI_PropagateDlg.cxx | 12 ++++ src/BlocksGUI/BlocksGUI_PropagateDlg.h | 1 + src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx | 11 ++++ src/BlocksGUI/BlocksGUI_QuadFaceDlg.h | 1 + src/BlocksGUI/BlocksGUI_TrsfDlg.cxx | 12 ++++ src/BlocksGUI/BlocksGUI_TrsfDlg.h | 1 + src/BooleanGUI/BooleanGUI_Dialog.cxx | 11 ++++ src/BooleanGUI/BooleanGUI_Dialog.h | 1 + src/BuildGUI/BuildGUI_CompoundDlg.cxx | 9 +++ src/BuildGUI/BuildGUI_CompoundDlg.h | 1 + src/BuildGUI/BuildGUI_EdgeDlg.cxx | 11 ++++ src/BuildGUI/BuildGUI_EdgeDlg.h | 1 + src/BuildGUI/BuildGUI_FaceDlg.cxx | 11 ++++ src/BuildGUI/BuildGUI_FaceDlg.h | 1 + src/BuildGUI/BuildGUI_ShellDlg.cxx | 9 +++ src/BuildGUI/BuildGUI_ShellDlg.h | 1 + src/BuildGUI/BuildGUI_SolidDlg.cxx | 9 +++ src/BuildGUI/BuildGUI_SolidDlg.h | 3 +- src/BuildGUI/BuildGUI_WireDlg.cxx | 9 +++ src/BuildGUI/BuildGUI_WireDlg.h | 1 + .../EntityGUI_FeatureDetectorDlg.cxx | 11 ++++ src/EntityGUI/EntityGUI_FeatureDetectorDlg.h | 1 + src/EntityGUI/EntityGUI_FieldDlg.cxx | 12 ++++ src/EntityGUI/EntityGUI_FieldDlg.h | 1 + src/EntityGUI/EntityGUI_IsolineDlg.cxx | 11 ++++ src/EntityGUI/EntityGUI_IsolineDlg.h | 2 + src/EntityGUI/EntityGUI_PolylineDlg.cxx | 9 +++ src/EntityGUI/EntityGUI_PolylineDlg.h | 3 +- src/EntityGUI/EntityGUI_SubShapeDlg.cxx | 12 ++++ src/EntityGUI/EntityGUI_SubShapeDlg.h | 1 + src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx | 11 ++++ src/EntityGUI/EntityGUI_SurfFromFaceDlg.h | 1 + src/GEOMBase/GEOMBase_Helper.cxx | 27 ++++++++ src/GEOMBase/GEOMBase_Helper.h | 2 + src/GEOMGUI/GEOM_msg_en.ts | 4 ++ src/GEOMGUI/GEOM_msg_fr.ts | 4 ++ src/GEOMGUI/GEOM_msg_ja.ts | 4 ++ src/GEOMGUI/GeometryGUI.cxx | 3 + .../GenerationGUI_FillingDlg.cxx | 9 +++ src/GenerationGUI/GenerationGUI_FillingDlg.h | 1 + src/GenerationGUI/GenerationGUI_PipeDlg.cxx | 13 ++++ src/GenerationGUI/GenerationGUI_PipeDlg.h | 1 + .../GenerationGUI_PipePathDlg.cxx | 13 ++++ src/GenerationGUI/GenerationGUI_PipePathDlg.h | 1 + src/GenerationGUI/GenerationGUI_PrismDlg.cxx | 11 ++++ src/GenerationGUI/GenerationGUI_PrismDlg.h | 1 + src/GenerationGUI/GenerationGUI_RevolDlg.cxx | 11 ++++ src/GenerationGUI/GenerationGUI_RevolDlg.h | 1 + src/GroupGUI/GroupGUI_BooleanDlg.cxx | 18 ++++++ src/GroupGUI/GroupGUI_BooleanDlg.h | 1 + src/GroupGUI/GroupGUI_GroupDlg.cxx | 18 +++++- src/GroupGUI/GroupGUI_GroupDlg.h | 1 + src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx | 11 ++++ src/MeasureGUI/MeasureGUI_BndBoxDlg.h | 1 + src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx | 11 ++++ src/MeasureGUI/MeasureGUI_CenterMassDlg.h | 1 + src/MeasureGUI/MeasureGUI_DistanceDlg.cxx | 11 ++++ src/MeasureGUI/MeasureGUI_DistanceDlg.h | 1 + .../MeasureGUI_FastCheckIntersectionsDlg.cxx | 11 ++++ .../MeasureGUI_FastCheckIntersectionsDlg.h | 1 + src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx | 12 ++++ src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h | 1 + src/MeasureGUI/MeasureGUI_NormaleDlg.cxx | 12 ++++ src/MeasureGUI/MeasureGUI_NormaleDlg.h | 1 + .../OperationGUI_ArchimedeDlg.cxx | 12 ++++ src/OperationGUI/OperationGUI_ArchimedeDlg.h | 3 +- src/OperationGUI/OperationGUI_ChamferDlg.cxx | 12 ++++ src/OperationGUI/OperationGUI_ChamferDlg.h | 1 + .../OperationGUI_ExtrudedFeatureDlg.cxx | 11 ++++ .../OperationGUI_ExtrudedFeatureDlg.h | 1 + .../OperationGUI_Fillet1d2dDlg.cxx | 12 ++++ src/OperationGUI/OperationGUI_Fillet1d2dDlg.h | 1 + src/OperationGUI/OperationGUI_FilletDlg.cxx | 12 ++++ src/OperationGUI/OperationGUI_FilletDlg.h | 1 + .../OperationGUI_GetShapesOnShapeDlg.cxx | 12 ++++ .../OperationGUI_GetShapesOnShapeDlg.h | 1 + .../OperationGUI_GetSharedShapesDlg.cxx | 15 +++++ .../OperationGUI_GetSharedShapesDlg.h | 1 + .../OperationGUI_PartitionDlg.cxx | 26 ++++++++ src/OperationGUI/OperationGUI_PartitionDlg.h | 1 + .../OperationGUI_TransferDataDlg.cxx | 11 ++++ .../OperationGUI_TransferDataDlg.h | 1 + src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx | 11 ++++ src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h | 1 + src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx | 11 ++++ src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h | 1 + src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx | 11 ++++ src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h | 1 + src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx | 11 ++++ src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx | 11 ++++ src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h | 1 + src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx | 11 ++++ src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h | 1 + src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx | 11 ++++ src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h | 1 + .../RepairGUI_ChangeOrientationDlg.cxx | 12 ++++ .../RepairGUI_ChangeOrientationDlg.h | 1 + src/RepairGUI/RepairGUI_CloseContourDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_CloseContourDlg.h | 1 + src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_DivideEdgeDlg.h | 1 + src/RepairGUI/RepairGUI_FreeBoundDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_FreeBoundDlg.h | 3 +- src/RepairGUI/RepairGUI_FreeFacesDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_FreeFacesDlg.h | 1 + src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_FuseEdgesDlg.h | 1 + src/RepairGUI/RepairGUI_GlueDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_GlueDlg.h | 1 + src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_LimitToleranceDlg.h | 1 + .../RepairGUI_RemoveExtraEdgesDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h | 1 + src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_RemoveHolesDlg.h | 1 + src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h | 1 + src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx | 9 +++ src/RepairGUI/RepairGUI_RemoveWebsDlg.h | 1 + src/RepairGUI/RepairGUI_SewingDlg.cxx | 9 +++ src/RepairGUI/RepairGUI_SewingDlg.h | 1 + src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 15 +++++ src/RepairGUI/RepairGUI_ShapeProcessDlg.h | 1 + src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_SuppressFacesDlg.h | 1 + src/RepairGUI/RepairGUI_UnionFacesDlg.cxx | 12 ++++ src/RepairGUI/RepairGUI_UnionFacesDlg.h | 1 + .../TransformationGUI_ExtensionDlg.cxx | 11 ++++ .../TransformationGUI_ExtensionDlg.h | 1 + .../TransformationGUI_MirrorDlg.cxx | 11 ++++ .../TransformationGUI_MirrorDlg.h | 1 + .../TransformationGUI_MultiRotationDlg.cxx | 11 ++++ .../TransformationGUI_MultiRotationDlg.h | 1 + .../TransformationGUI_MultiTranslationDlg.cxx | 11 ++++ .../TransformationGUI_MultiTranslationDlg.h | 1 + .../TransformationGUI_OffsetDlg.cxx | 9 +++ .../TransformationGUI_OffsetDlg.h | 1 + .../TransformationGUI_PositionDlg.cxx | 11 ++++ .../TransformationGUI_PositionDlg.h | 1 + .../TransformationGUI_ProjectionDlg.cxx | 11 ++++ .../TransformationGUI_ProjectionDlg.h | 1 + .../TransformationGUI_RotationDlg.cxx | 11 ++++ .../TransformationGUI_RotationDlg.h | 1 + .../TransformationGUI_ScaleDlg.cxx | 11 ++++ .../TransformationGUI_ScaleDlg.h | 1 + .../TransformationGUI_TranslationDlg.cxx | 11 ++++ .../TransformationGUI_TranslationDlg.h | 1 + 177 files changed, 1147 insertions(+), 40 deletions(-) diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index ac60036f0..142a2ec38 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -67,6 +67,7 @@ + diff --git a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx index d4e529488..4da6ad710 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx @@ -458,3 +458,14 @@ bool AdvancedGUI_DividedDiskDlg::execute (ObjectList& objects) return res; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList AdvancedGUI_DividedDiskDlg::getSourceObjects() +{ + QList res; + res << myPoint << myDir; + return res; +} diff --git a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h index 50855ca2e..382525891 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h +++ b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h @@ -49,6 +49,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx index 30770df62..5999c6471 100644 --- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx @@ -1252,6 +1252,18 @@ void AdvancedGUI_PipeTShapeDlg::processPreview() erasePreview(true); } +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList AdvancedGUI_PipeTShapeDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr1(myPoint1), aGeomObjPtr2(myPoint2), aGeomObjPtr3(myPoint3); + res << aGeomObjPtr1 << aGeomObjPtr2 << aGeomObjPtr3; + return res; +} + //================================================================================= // function : AdvancedGUI_4Spin // purpose : diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h index 0f322832f..0df296194 100644 --- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h +++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h @@ -79,6 +79,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void restoreSubShapes (SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx index 5fc6b2eb8..e51ad791b 100644 --- a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx @@ -264,6 +264,16 @@ void AdvancedGUI_SmoothingSurfaceDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myPoints[i].get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList AdvancedGUI_SmoothingSurfaceDlg::getSourceObjects() +{ + return myPoints; +} + //================================================================================= // function : getNbPoints() // purpose : Returns the number of points in myPoints list. diff --git a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h index 24384efc3..5dfef3e41 100644 --- a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h +++ b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h @@ -46,6 +46,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx index b0ae625c8..37e50ea4b 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.cxx +++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx @@ -622,3 +622,14 @@ void BasicGUI_ArcDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_ArcDlg::getSourceObjects() +{ + QList res; + res << myPoint1 << myPoint2 << myPoint3; + return res; +} diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h index 0cd4f0819..d2c63c19f 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.h +++ b/src/BasicGUI/BasicGUI_ArcDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx index 65aafd0ed..21515ed32 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.cxx +++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx @@ -640,3 +640,15 @@ void BasicGUI_CircleDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_CircleDlg::getSourceObjects() +{ + QList res; + res << myPoint << myDir << myPoint1 << myPoint2 << myPoint3 + << myPoint4 << myPoint5 << myPoint6; + return res; +} diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h index 564c8c9c5..94e69cb90 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.h +++ b/src/BasicGUI/BasicGUI_CircleDlg.h @@ -50,8 +50,8 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); - virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx index 867b1f7c6..110c80c7f 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.cxx +++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx @@ -541,6 +541,14 @@ void BasicGUI_CurveDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myPoints[i].get() ); } +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_CurveDlg::getSourceObjects() +{ + return myPoints; +} //================================================================================= // function : CreationModeChanged // purpose : diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index 6a1f6e6ba..c30f2f1b8 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -57,6 +57,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx index 5f95fa277..f1e74179f 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx +++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx @@ -430,3 +430,14 @@ void BasicGUI_EllipseDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myDir.get() ); GEOMBase::PublishSubObject( myMajor.get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_EllipseDlg::getSourceObjects() +{ + QList res; + res << myPoint << myDir << myMajor; + return res; +} diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h index fe57d73d1..84b790e13 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.h +++ b/src/BasicGUI/BasicGUI_EllipseDlg.h @@ -50,6 +50,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx index e3ed12717..56a4fe041 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.cxx +++ b/src/BasicGUI/BasicGUI_LineDlg.cxx @@ -432,3 +432,14 @@ void BasicGUI_LineDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_LineDlg::getSourceObjects() +{ + QList res; + res << myPoint1 << myPoint2 << myFace1 << myFace2; + return res; +} diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h index 7d75baba1..4469845c9 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.h +++ b/src/BasicGUI/BasicGUI_LineDlg.h @@ -50,7 +50,8 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); - + virtual QList getSourceObjects(); + private: void Init(); void enterEvent( QEvent* ); diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx index 7c1fc5c66..8cb1dd447 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx +++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx @@ -609,7 +609,17 @@ void BasicGUI_MarkerDlg::addSubshapesToStudy() default: break; } +} +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_MarkerDlg::getSourceObjects() +{ + QList res; + res << myShape << myPoint << myVectorX << myVectorY; + return res; } //================================================================================= diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h index df0ef9548..ff28da6cf 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.h +++ b/src/BasicGUI/BasicGUI_MarkerDlg.h @@ -46,47 +46,48 @@ private: typedef QMap< int, SalomeApp_DoubleSpinBox* > DataMap; public: - BasicGUI_MarkerDlg( GeometryGUI*, QWidget* ); - virtual ~BasicGUI_MarkerDlg(); - void Init(); + BasicGUI_MarkerDlg( GeometryGUI*, QWidget* ); + virtual ~BasicGUI_MarkerDlg(); + void Init(); protected: - virtual GEOM::GEOM_IOperations_ptr createOperation(); - virtual bool isValid( QString& ); - virtual bool execute( ObjectList& ); - virtual void displayPreview ( const bool = false, - const bool = true, - const bool = true, - const double = -1 ); - virtual void addSubshapesToStudy(); + virtual GEOM::GEOM_IOperations_ptr createOperation(); + virtual bool isValid( QString& ); + virtual bool execute( ObjectList& ); + virtual void displayPreview ( const bool = false, + const bool = true, + const bool = true, + const double = -1 ); + virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: - void enterEvent( QEvent* ); - void onSelectionDone0(); + void enterEvent( QEvent* ); + void onSelectionDone0(); - GEOM::GeomObjPtr myShape; - GEOM::GeomObjPtr myPoint; - GEOM::GeomObjPtr myVectorX; - GEOM::GeomObjPtr myVectorY; + GEOM::GeomObjPtr myShape; + GEOM::GeomObjPtr myPoint; + GEOM::GeomObjPtr myVectorX; + GEOM::GeomObjPtr myVectorY; private slots: - void onOk(); - bool onApply(); - void onActivate(); - void onDeactivate(); - void onSelectionDone(); - void onValueChanged( double ); - void ConstructorsClicked( int ); - void SetEditCurrentArgument(); + void onOk(); + bool onApply(); + void onActivate(); + void onDeactivate(); + void onSelectionDone(); + void onValueChanged( double ); + void ConstructorsClicked( int ); + void SetEditCurrentArgument(); private: - DataMap myData; - int myConstructorId; - int myBlockPreview; + DataMap myData; + int myConstructorId; + int myBlockPreview; - QFrame* aMainGrp; - DlgRef_1Sel* Group1; - DlgRef_3Sel* Group2; + QFrame* aMainGrp; + DlgRef_1Sel* Group1; + DlgRef_3Sel* Group2; }; #endif // BASICGUI_MARKERDLG_H diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx index 7581b1b39..707a45604 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx @@ -787,3 +787,15 @@ void BasicGUI_PlaneDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_PlaneDlg::getSourceObjects() +{ + QList res; + res << myPoint << myDir << myPoint1 << myPoint2 << myPoint3 + << myFace << myVec1 << myVec2 << myLCS; + return res; +} diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h index 11bc53383..3e9ddbd05 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.h +++ b/src/BasicGUI/BasicGUI_PlaneDlg.h @@ -53,6 +53,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index 8c6c49343..84b9a7bd5 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/src/BasicGUI/BasicGUI_PointDlg.cxx @@ -933,6 +933,17 @@ void BasicGUI_PointDlg::addSubshapesToStudy() } } +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_PointDlg::getSourceObjects() +{ + QList res; + res << myRefPoint << myEdge << myLine1 << myLine2 << myFace; + return res; +} + //================================================================================= // function : ClickParamCoord() // purpose : diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h index 710feac9b..7002333db 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.h +++ b/src/BasicGUI/BasicGUI_PointDlg.h @@ -67,6 +67,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx index 6f855fa34..8b915423b 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.cxx +++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx @@ -472,3 +472,14 @@ void BasicGUI_VectorDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myPoint2.get() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BasicGUI_VectorDlg::getSourceObjects() +{ + QList res; + res << myPoint1 << myPoint2; + return res; +} diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h index 0cdc3092f..7aa5b8cda 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.h +++ b/src/BasicGUI/BasicGUI_VectorDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx index 71f73a8dd..c4b986271 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx @@ -501,3 +501,15 @@ void BlocksGUI_BlockDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BlocksGUI_BlockDlg::getSourceObjects() +{ + QList res; + res << myFace1 << myFace2 << myFace3 + << myFace4 << myFace5 << myFace6; + return res; +} diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.h b/src/BlocksGUI/BlocksGUI_BlockDlg.h index a8a9aedd4..5560ea9f9 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.h +++ b/src/BlocksGUI/BlocksGUI_BlockDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx index 38ee711f8..1f1fcda89 100644 --- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx @@ -513,3 +513,15 @@ QString BlocksGUI_ExplodeDlg::getNewObjectName (int) const { return QString::null; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BlocksGUI_ExplodeDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h index a188fbd11..9296f89e3 100644 --- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h +++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h @@ -49,6 +49,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr ); + virtual QList getSourceObjects(); virtual QString getNewObjectName (int CurrObj = -1) const; diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx index b8db6cd72..f6a95c866 100644 --- a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx @@ -282,3 +282,15 @@ GEOM::GEOM_Object_ptr BlocksGUI_PropagateDlg::getFather( GEOM::GEOM_Object_ptr ) { return myObject; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BlocksGUI_PropagateDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.h b/src/BlocksGUI/BlocksGUI_PropagateDlg.h index 934926017..90fe9fc0d 100644 --- a/src/BlocksGUI/BlocksGUI_PropagateDlg.h +++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.h @@ -49,6 +49,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr ); + virtual QList getSourceObjects(); private slots: void ClickOnOk(); diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx index 5c6a51940..b004d5c87 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx @@ -570,3 +570,14 @@ void BlocksGUI_QuadFaceDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BlocksGUI_QuadFaceDlg::getSourceObjects() +{ + QList res; + res << myShape1 << myShape2 << myShape3 << myShape4; + return res; +} diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h index 4ae22efc6..be61b2b7e 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h @@ -58,6 +58,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx index 61740a612..b441b58a8 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx @@ -619,3 +619,15 @@ bool BlocksGUI_TrsfDlg::execute (ObjectList& objects) return res; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BlocksGUI_TrsfDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myShape); + res << aGeomObjPtr; + return res; +} diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.h b/src/BlocksGUI/BlocksGUI_TrsfDlg.h index cb5d60c7d..9e6ff3c37 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.h +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.h @@ -56,6 +56,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid (QString&); virtual bool execute (ObjectList&); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx index 96b978efb..115394514 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.cxx +++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx @@ -485,3 +485,14 @@ void BooleanGUI_Dialog::addSubshapesToStudy() for ( int i = 0; i < myObjects.count(); i++ ) GEOMBase::PublishSubObject( myObjects[i].get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BooleanGUI_Dialog::getSourceObjects() +{ + QList res(myObjects); + res << myObject1; + return res; +} diff --git a/src/BooleanGUI/BooleanGUI_Dialog.h b/src/BooleanGUI/BooleanGUI_Dialog.h index 8a095a476..00c93069d 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.h +++ b/src/BooleanGUI/BooleanGUI_Dialog.h @@ -52,6 +52,7 @@ protected: virtual bool execute( ObjectList& ); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx index 1d1f50b8d..6b550a63b 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx +++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx @@ -255,3 +255,12 @@ void BuildGUI_CompoundDlg::restoreSubShapes( SALOMEDS::Study_ptr theStudy, mainFrame()->CheckBoxAddPrefix->isChecked() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BuildGUI_CompoundDlg::getSourceObjects() +{ + return myShapes; +} diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.h b/src/BuildGUI/BuildGUI_CompoundDlg.h index 2b06678e7..f7a939df0 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.h +++ b/src/BuildGUI/BuildGUI_CompoundDlg.h @@ -50,6 +50,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx index d85187194..b96feeeae 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx +++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx @@ -521,3 +521,14 @@ void BuildGUI_EdgeDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BuildGUI_EdgeDlg::getSourceObjects() +{ + QList res; + res << myPoint1 << myPoint2 << myWire << myCurve << myStartPoint; + return res; +} diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.h b/src/BuildGUI/BuildGUI_EdgeDlg.h index c81974cc0..a2f1ccb50 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.h +++ b/src/BuildGUI/BuildGUI_EdgeDlg.h @@ -52,6 +52,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx index 9c0d74bd6..1f42c752a 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.cxx +++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx @@ -698,3 +698,14 @@ void BuildGUI_FaceDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BuildGUI_FaceDlg::getSourceObjects() +{ + QList res(myWires); + res << myFace << myWire; + return res; +} diff --git a/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h index 756d37459..9c9dcd7a8 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.h +++ b/src/BuildGUI/BuildGUI_FaceDlg.h @@ -56,6 +56,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BuildGUI/BuildGUI_ShellDlg.cxx b/src/BuildGUI/BuildGUI_ShellDlg.cxx index b5f56a2f6..36ed6ad7e 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.cxx +++ b/src/BuildGUI/BuildGUI_ShellDlg.cxx @@ -276,3 +276,12 @@ bool BuildGUI_ShellDlg::execute( ObjectList& objects ) return true; } +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BuildGUI_ShellDlg::getSourceObjects() +{ + return myFacesAndShells; +} + diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h index 30c7929ff..ffdf58388 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.h +++ b/src/BuildGUI/BuildGUI_ShellDlg.h @@ -49,6 +49,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/BuildGUI/BuildGUI_SolidDlg.cxx b/src/BuildGUI/BuildGUI_SolidDlg.cxx index 7a78587e4..0382aeaee 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.cxx +++ b/src/BuildGUI/BuildGUI_SolidDlg.cxx @@ -406,3 +406,12 @@ bool BuildGUI_SolidDlg::execute( ObjectList& objects ) return true; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BuildGUI_SolidDlg::getSourceObjects() +{ + return myShells; +} diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h index 192eaee32..bd5be738e 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.h +++ b/src/BuildGUI/BuildGUI_SolidDlg.h @@ -48,7 +48,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/BuildGUI/BuildGUI_WireDlg.cxx b/src/BuildGUI/BuildGUI_WireDlg.cxx index 4da996cf5..83c7213cf 100644 --- a/src/BuildGUI/BuildGUI_WireDlg.cxx +++ b/src/BuildGUI/BuildGUI_WireDlg.cxx @@ -305,3 +305,12 @@ void BuildGUI_WireDlg::addSubshapesToStudy() for ( int i = 0; i < myEdgesAndWires.count(); i++ ) GEOMBase::PublishSubObject( myEdgesAndWires[i].get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList BuildGUI_WireDlg::getSourceObjects() +{ + return myEdgesAndWires; +} diff --git a/src/BuildGUI/BuildGUI_WireDlg.h b/src/BuildGUI/BuildGUI_WireDlg.h index b961daf52..0715e5f1f 100644 --- a/src/BuildGUI/BuildGUI_WireDlg.h +++ b/src/BuildGUI/BuildGUI_WireDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index 6e8f8f4a7..a2d7c67a2 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx @@ -948,3 +948,14 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects ) return res; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList EntityGUI_FeatureDetectorDlg::getSourceObjects() +{ + QList res; + res << myFace; + return res; +} diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h index 8553643b4..16d245cfc 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h @@ -65,6 +65,7 @@ protected: // redefined from GEOMBase_Helper virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/EntityGUI/EntityGUI_FieldDlg.cxx b/src/EntityGUI/EntityGUI_FieldDlg.cxx index c22e7654b..22806e416 100644 --- a/src/EntityGUI/EntityGUI_FieldDlg.cxx +++ b/src/EntityGUI/EntityGUI_FieldDlg.cxx @@ -1982,3 +1982,15 @@ bool EntityGUI_FieldDlg::execute() return true; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList EntityGUI_FieldDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myShape); + res << aGeomObjPtr; + return res; +} diff --git a/src/EntityGUI/EntityGUI_FieldDlg.h b/src/EntityGUI/EntityGUI_FieldDlg.h index 54179a903..b59ee2a50 100644 --- a/src/EntityGUI/EntityGUI_FieldDlg.h +++ b/src/EntityGUI/EntityGUI_FieldDlg.h @@ -70,6 +70,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid (QString&); virtual bool execute (); + virtual QList getSourceObjects(); private slots: void ClickOnOk(); diff --git a/src/EntityGUI/EntityGUI_IsolineDlg.cxx b/src/EntityGUI/EntityGUI_IsolineDlg.cxx index 853b15b90..366e425a1 100755 --- a/src/EntityGUI/EntityGUI_IsolineDlg.cxx +++ b/src/EntityGUI/EntityGUI_IsolineDlg.cxx @@ -281,3 +281,14 @@ void EntityGUI_IsolineDlg::ValueChangedInSpinBox(double newValue) { displayPreview(true); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList EntityGUI_IsolineDlg::getSourceObjects() +{ + QList res; + res << myFace; + return res; +} diff --git a/src/EntityGUI/EntityGUI_IsolineDlg.h b/src/EntityGUI/EntityGUI_IsolineDlg.h index bcfeffa5e..b177f9882 100755 --- a/src/EntityGUI/EntityGUI_IsolineDlg.h +++ b/src/EntityGUI/EntityGUI_IsolineDlg.h @@ -56,6 +56,8 @@ protected: virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); + private: void Init(); diff --git a/src/EntityGUI/EntityGUI_PolylineDlg.cxx b/src/EntityGUI/EntityGUI_PolylineDlg.cxx index 378083f52..94773a51f 100644 --- a/src/EntityGUI/EntityGUI_PolylineDlg.cxx +++ b/src/EntityGUI/EntityGUI_PolylineDlg.cxx @@ -671,3 +671,12 @@ gp_Ax3 EntityGUI_PolylineDlg::WPlaneToLCS(GEOM::GeomObjPtr theGeomObj) return aLCS; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList EntityGUI_PolylineDlg::getSourceObjects() +{ + return myWPlaneList; +} diff --git a/src/EntityGUI/EntityGUI_PolylineDlg.h b/src/EntityGUI/EntityGUI_PolylineDlg.h index 364c144ce..0c1778f7d 100644 --- a/src/EntityGUI/EntityGUI_PolylineDlg.h +++ b/src/EntityGUI/EntityGUI_PolylineDlg.h @@ -56,7 +56,8 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); - + virtual QList getSourceObjects(); + private: void Init(); diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx index 3015e6905..a6cf73cfb 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx @@ -948,3 +948,15 @@ void EntityGUI_SubShapeDlg::MeasureToggled() myGreaterFilterCombo->setEnabled(myGreaterFilterCheck->isChecked()); myApplyFilterButton->setEnabled(myLessFilterCheck->isChecked() || myGreaterFilterCheck->isChecked()); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList EntityGUI_SubShapeDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h index da4601c03..e3618ac41 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.h +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h @@ -57,6 +57,7 @@ protected: virtual bool execute (ObjectList&); virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); virtual QString getNewObjectName (int CurrObj = -1) const; + virtual QList getSourceObjects(); void closeEvent (QCloseEvent*); diff --git a/src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx b/src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx index 56eb30b17..0d37076fe 100644 --- a/src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx +++ b/src/EntityGUI/EntityGUI_SurfFromFaceDlg.cxx @@ -223,3 +223,14 @@ bool EntityGUI_SurfFromFaceDlg::ClickOnApply() return true; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList EntityGUI_SurfFromFaceDlg::getSourceObjects() +{ + QList res; + res << myFace; + return res; +} diff --git a/src/EntityGUI/EntityGUI_SurfFromFaceDlg.h b/src/EntityGUI/EntityGUI_SurfFromFaceDlg.h index 6f39d510e..809a41125 100644 --- a/src/EntityGUI/EntityGUI_SurfFromFaceDlg.h +++ b/src/EntityGUI/EntityGUI_SurfFromFaceDlg.h @@ -51,6 +51,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index d94eed0cd..1e795376c 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -860,6 +860,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b showError(); } else { + QList anObjectList = getSourceObjects( ); addSubshapesToStudy(); // add Sub-shapes if local selection const int nbObjs = objects.size(); QStringList anEntryList; @@ -921,6 +922,8 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b } anApp->putInfo( QObject::tr("GEOM_PRP_DONE") ); } + if ( anObjectList.count() > 0 ) + hideSourceObjects( anObjectList ); result = true; } else @@ -1186,6 +1189,17 @@ void GEOMBase_Helper::addSubshapesToStudy() //Impemented in Dialogs, called from Accept method } +//================================================================ +// Function : getSourceObjects +// Purpose : Virtual method to get source objects +//================================================================ +QList GEOMBase_Helper::getSourceObjects() +{ + //Impemented in Dialogs, called from Accept method + QList res; + return res; +} + //================================================================ // Function : getSelected // Purpose : Get selected object by specified type @@ -1356,6 +1370,19 @@ QList GEOMBase_Helper::getSelected( const QList theObject ) +{ + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + if ( resMgr->booleanValue( "Geometry", "hide_input_object", true) ) { + GEOM_Displayer* aDisplayer = getDisplayer(); + for ( int i = 0; i < theObject.count(); i++ ) + aDisplayer->Erase( theObject[i].get() ); + } +} //================================================================ // Function : setIsApplyAndClose diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h index 37bbbecf4..fac2d89ba 100755 --- a/src/GEOMBase/GEOMBase_Helper.h +++ b/src/GEOMBase/GEOMBase_Helper.h @@ -171,6 +171,7 @@ protected: virtual QString getObjectName(GEOM::GEOM_Object_ptr object) const; virtual bool extractPrefix() const; virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); GEOM::GEOM_Object_ptr findObjectInFather( GEOM::GEOM_Object_ptr theFather, const QString& theName ); GEOM::GEOM_Object_ptr findObjectInFather( GEOM::GEOM_Object_ptr theFather, int theIndex ); @@ -181,6 +182,7 @@ protected: QList getSelected( TopAbs_ShapeEnum type, int count, bool strict = true ); QList getSelected( const QList& types, int count, bool strict = true ); + void hideSourceObjects( QList theObjectList ); void SetIsPreview(const bool thePreview) {isPreview = thePreview;} bool IsPreview() {return isPreview;} diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 823e8e849..0734036d8 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -3400,6 +3400,10 @@ Please, select face, shell or solid and try again PREF_DIMENSIONS_SHOW_UNITS Show units of measurement + + PREF_HIDE_INPUT_OBJECT + Hide input objects from the viewer + PREF_ISOS Number of isolines diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 9a29e1f5c..37f126e6d 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -3400,6 +3400,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_DIMENSIONS_SHOW_UNITS Afficher les unités + + PREF_HIDE_INPUT_OBJECT + Hide input objects from the viewer + PREF_ISOS Nombre d'isolignes diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts index a8e0ee46a..4f6e96fe9 100644 --- a/src/GEOMGUI/GEOM_msg_ja.ts +++ b/src/GEOMGUI/GEOM_msg_ja.ts @@ -3343,6 +3343,10 @@ PREF_DIMENSIONS_SHOW_UNITS 測定単位の表示 + + PREF_HIDE_INPUT_OBJECT + Hide input objects from the viewer + PREF_ISOS 輪郭の数 diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 510abe1a5..314c4fe8f 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -2539,6 +2539,9 @@ void GeometryGUI::createPreferences() addPreference( tr( "GEOM_PREVIEW" ), operationsGroup, LightApp_Preferences::Bool, "Geometry", "geom_preview" ); + addPreference( tr( "PREF_HIDE_INPUT_OBJECT" ), operationsGroup, + LightApp_Preferences::Bool, "Geometry", "hide_input_object" ); + int DependencyViewId = addPreference( tr( "PREF_TAB_DEPENDENCY_VIEW" ) ); int treeGeneralGroup = addPreference( tr( "PREF_GROUP_GENERAL" ), DependencyViewId ); diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx index bf7224d70..e6348707f 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx @@ -404,3 +404,12 @@ void GenerationGUI_FillingDlg::addSubshapesToStudy() foreach( GEOM::GeomObjPtr o, myObjects ) GEOMBase::PublishSubObject( o.get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GenerationGUI_FillingDlg::getSourceObjects() +{ + return myObjects; +} diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.h b/src/GenerationGUI/GenerationGUI_FillingDlg.h index 19b736091..8591f1cb9 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.h +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.h @@ -50,6 +50,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx index b89849ee6..fe972a26c 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx @@ -544,3 +544,16 @@ bool GenerationGUI_PipeDlg::extractPrefix() const { return myBaseObjects.count() > 1; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GenerationGUI_PipeDlg::getSourceObjects() +{ + QList res(myBaseObjects); + res << myPath << myVec; + for (int i = 0; i < myLocations.count(); i++) + res << myLocations[i]; + return res; +} diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h index ba05b42d4..868b465af 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.h +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.h @@ -52,6 +52,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual bool extractPrefix() const; + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx index 025998853..a7889f101 100644 --- a/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx @@ -391,3 +391,16 @@ void GenerationGUI_PipePathDlg::addSubshapesToStudy() for (i = 0; i < myBase2Objects.count(); i++) GEOMBase::PublishSubObject(myBase2Objects[i].get()); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GenerationGUI_PipePathDlg::getSourceObjects() +{ + QList res(myBase1Objects); + res << myShape ; + for (int i = 0; i < myBase2Objects.count(); i++) + res << myBase2Objects[i]; + return res; +} diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.h b/src/GenerationGUI/GenerationGUI_PipePathDlg.h index b9511bdda..3e99ed643 100644 --- a/src/GenerationGUI/GenerationGUI_PipePathDlg.h +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.h @@ -49,6 +49,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx index 80173d405..3250c9db6 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx @@ -759,3 +759,14 @@ bool GenerationGUI_PrismDlg::extractPrefix() const { return myBaseObjects.count() > 1; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GenerationGUI_PrismDlg::getSourceObjects() +{ + QList res(myBaseObjects); + res << myVec << myPoint1 << myPoint2 ; + return res; +} diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h index 189f49bdb..9ab922a6b 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.h +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h @@ -54,6 +54,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual bool extractPrefix() const; + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx index 80c33d1cd..61246cf11 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx @@ -375,3 +375,14 @@ bool GenerationGUI_RevolDlg::extractPrefix() const { return myBaseObjects.count() > 1; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GenerationGUI_RevolDlg::getSourceObjects() +{ + QList res(myBaseObjects); + res << myAxis; + return res; +} diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.h b/src/GenerationGUI/GenerationGUI_RevolDlg.h index 51da70e00..3f3ef4c73 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.h +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.h @@ -51,6 +51,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual bool extractPrefix() const; + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/GroupGUI/GroupGUI_BooleanDlg.cxx b/src/GroupGUI/GroupGUI_BooleanDlg.cxx index 7503a97e9..ff4ba6205 100644 --- a/src/GroupGUI/GroupGUI_BooleanDlg.cxx +++ b/src/GroupGUI/GroupGUI_BooleanDlg.cxx @@ -319,3 +319,21 @@ GEOM::GEOM_Object_ptr GroupGUI_BooleanDlg::getFather(GEOM::GEOM_Object_ptr theOb } return aFatherObj._retn(); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GroupGUI_BooleanDlg::getSourceObjects() +{ + QList res; + for (int i = 0; i < myListShapes.length(); i++) { + GEOM::GeomObjPtr aGeomObjPtr(myListShapes[i]); + res << aGeomObjPtr; + } + for (int i = 0; i < myListTools.length(); i++) { + GEOM::GeomObjPtr aGeomObjPtr(myListTools[i]); + res << aGeomObjPtr; + } + return res; +} diff --git a/src/GroupGUI/GroupGUI_BooleanDlg.h b/src/GroupGUI/GroupGUI_BooleanDlg.h index a5b8ae33f..9ff9ca902 100644 --- a/src/GroupGUI/GroupGUI_BooleanDlg.h +++ b/src/GroupGUI/GroupGUI_BooleanDlg.h @@ -53,6 +53,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index 29e43b14a..82a51075e 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -224,10 +224,12 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg (Mode mode, GeometryGUI* theGeometryGUI, QW GroupGUI_GroupDlg::~GroupGUI_GroupDlg() { GEOM_Displayer* aDisplayer = getDisplayer(); + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + bool isHideObjects = resMgr->booleanValue( "Geometry", "hide_input_object", true); if (myWasHiddenMain) { - aDisplayer->Erase(myMainObj); myIsHiddenMain = true; - } else { + } + else if (!isHideObjects) { aDisplayer->Display(myMainObj); myIsHiddenMain = false; } @@ -1429,3 +1431,15 @@ void GroupGUI_GroupDlg::MeasureToggled() myGreaterFilterCombo->setEnabled(myGreaterFilterCheck->isChecked()); myApplyFilterButton->setEnabled(myLessFilterCheck->isChecked() || myGreaterFilterCheck->isChecked()); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GroupGUI_GroupDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr1(myMainObj), aGeomObjPtr2(myInPlaceObj); + res << aGeomObjPtr1 << aGeomObjPtr2; + return res; +} diff --git a/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h index 60db41f3c..ad8f4e159 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.h +++ b/src/GroupGUI/GroupGUI_GroupDlg.h @@ -65,6 +65,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); + virtual QList getSourceObjects(); void closeEvent (QCloseEvent*); diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx index 3625c0f16..9a3567ce9 100644 --- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx @@ -352,3 +352,14 @@ void MeasureGUI_BndBoxDlg::addSubshapesToStudy() { GEOMBase::PublishSubObject( myObj.get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList MeasureGUI_BndBoxDlg::getSourceObjects() +{ + QList res; + res << myObj; + return res; +} diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h index e5c9889c5..500de9eaa 100644 --- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h +++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h @@ -52,6 +52,7 @@ protected: void redisplayPreview(); virtual void processObject(); virtual SALOME_Prs* buildPrs(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx index 773ebc63c..c2f5f92c1 100644 --- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx @@ -349,3 +349,14 @@ void MeasureGUI_CenterMassDlg::addSubshapesToStudy() { GEOMBase::PublishSubObject( myObj.get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList MeasureGUI_CenterMassDlg::getSourceObjects() +{ + QList res; + res << myObj; + return res; +} diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h index 05d2ae208..85b7fea05 100644 --- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h +++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h @@ -49,6 +49,7 @@ protected: virtual bool isValid( QString& ); virtual void addSubshapesToStudy(); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private slots: void ClickOnOk(); diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx index d51f62618..e92d45590 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx @@ -546,6 +546,17 @@ void MeasureGUI_DistanceDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myObj2.get() ); } +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList MeasureGUI_DistanceDlg::getSourceObjects() +{ + QList res; + res << myObj1 << myObj2; + return res; +} + //================================================================================= // function : MeasureGUI_DistanceGroup // purpose : diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.h b/src/MeasureGUI/MeasureGUI_DistanceDlg.h index 2b3bbe7f9..0ce5d2138 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.h +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.h @@ -101,6 +101,7 @@ protected: virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); virtual QString getNewObjectName (int CurrObj = -1) const; + virtual QList getSourceObjects(); void redisplayPreview(); virtual void processObject(); diff --git a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx index db5319d86..a12434301 100644 --- a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx @@ -677,3 +677,14 @@ double MeasureGUI_FastCheckIntersectionsDlg::getTolerance() return 0.0; return aVal; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList MeasureGUI_FastCheckIntersectionsDlg::getSourceObjects() +{ + QList res; + res << myObj1 << myObj2; + return res; +} diff --git a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.h b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.h index e91c267f5..b07af285d 100644 --- a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.h +++ b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.h @@ -50,6 +50,7 @@ protected: virtual bool isValid(QString &); virtual bool execute(ObjectList &); virtual bool extractPrefix() const; + virtual QList getSourceObjects(); private slots: diff --git a/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx index 815f2529f..8b292cf02 100644 --- a/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx @@ -333,3 +333,15 @@ GEOM::GEOM_Object_ptr MeasureGUI_GetNonBlocksDlg::getFather (GEOM::GEOM_Object_p { return myObj; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList MeasureGUI_GetNonBlocksDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObj); + res << aGeomObjPtr; + return res; +} diff --git a/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h index 12c2966b1..399ab7072 100644 --- a/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h +++ b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h @@ -52,6 +52,7 @@ protected: virtual bool isValid (QString &msg); virtual bool execute (ObjectList&); virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); + virtual QList getSourceObjects(); private slots: void ClickOnOk(); diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx index 53e08433b..03619dc03 100644 --- a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx @@ -360,3 +360,15 @@ bool MeasureGUI_NormaleDlg::execute (ObjectList& objects) return true; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList MeasureGUI_NormaleDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr1(myFace), aGeomObjPtr2(myPoint); + res << aGeomObjPtr1 << aGeomObjPtr2; + return res; +} diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.h b/src/MeasureGUI/MeasureGUI_NormaleDlg.h index 0c3ec3ea1..21fc640dc 100644 --- a/src/MeasureGUI/MeasureGUI_NormaleDlg.h +++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.h @@ -45,6 +45,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx index f818de8fb..7464b0541 100644 --- a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx +++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx @@ -306,3 +306,15 @@ void OperationGUI_ArchimedeDlg::ValueChangedInSpinBox(double newValue) { processPreview(); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_ArchimedeDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myShape); + res << aGeomObjPtr; + return res; +} diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.h b/src/OperationGUI/OperationGUI_ArchimedeDlg.h index 0d9957203..9e08d32f2 100644 --- a/src/OperationGUI/OperationGUI_ArchimedeDlg.h +++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.h @@ -47,7 +47,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_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx index 8b16e06d3..8be967e9a 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx +++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx @@ -966,3 +966,15 @@ void OperationGUI_ChamferDlg::RadioButtonPressed() processPreview(); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_ChamferDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myShape); + res << aGeomObjPtr; + return res; +} diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.h b/src/OperationGUI/OperationGUI_ChamferDlg.h index a2222fa7d..0b3c4b970 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.h +++ b/src/OperationGUI/OperationGUI_ChamferDlg.h @@ -66,6 +66,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private slots: void ClickOnOk(); diff --git a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx index 102e7d5d8..d8d36b167 100644 --- a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx +++ b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx @@ -395,3 +395,14 @@ bool OperationGUI_ExtrudedFeatureDlg::execute (ObjectList& objects) // { // GEOMBase::PublishSubObject( myObject2.get() ); // } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_ExtrudedFeatureDlg::getSourceObjects() +{ + QList res; + res << myObject1 << myObject2; + return res; +} diff --git a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h index 8de639a30..fdbd59edd 100644 --- a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h +++ b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h @@ -62,6 +62,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); // virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx index f40c12c2a..dbbae0297 100644 --- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx +++ b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx @@ -425,3 +425,15 @@ double OperationGUI_Fillet1d2dDlg::getRadius() const { return GroupVertexes->SpinBox_DX->value(); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_Fillet1d2dDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myShape); + res << aGeomObjPtr; + return res; +} diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h index 6738a650d..07454eafc 100644 --- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h +++ b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h @@ -47,6 +47,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private slots: void ClickOnOk(); diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx index 6b1e5da52..c3170d914 100644 --- a/src/OperationGUI/OperationGUI_FilletDlg.cxx +++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx @@ -754,3 +754,15 @@ void OperationGUI_FilletDlg::RadioButtonClicked() processPreview(); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_FilletDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myShape); + res << aGeomObjPtr; + return res; +} diff --git a/src/OperationGUI/OperationGUI_FilletDlg.h b/src/OperationGUI/OperationGUI_FilletDlg.h index 7f7a18812..9f1790633 100644 --- a/src/OperationGUI/OperationGUI_FilletDlg.h +++ b/src/OperationGUI/OperationGUI_FilletDlg.h @@ -51,6 +51,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private slots: void ClickOnOk(); diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx index d92cb5a61..f120c3a54 100644 --- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx +++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx @@ -353,3 +353,15 @@ void OperationGUI_GetShapesOnShapeDlg::ComboTextChanged() //bool IsEnabled = GroupPoints->ComboBox1->currentIndex() < 3; processPreview(); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_GetShapesOnShapeDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr1(myObject1), aGeomObjPtr2(myObject2); + res << aGeomObjPtr1 << aGeomObjPtr2; + return res; +} diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h index 462318ce2..e5e57b3f9 100644 --- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h +++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h @@ -46,6 +46,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx index 9e39f1f7a..9ca2d5ab3 100644 --- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx +++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx @@ -403,3 +403,18 @@ QString OperationGUI_GetSharedShapesDlg::getPrefixByType () const return aPref; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_GetSharedShapesDlg::getSourceObjects() +{ + QList res; + GEOM::ListOfGO aListPtr(myListShapes); + for (int i = 0; i < aListPtr.length(); i++) { + GEOM::GeomObjPtr aGeomObjPtr(aListPtr[i]); + res << aGeomObjPtr; + } + return res; +} diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h index 25f4197de..c23ea6ba7 100644 --- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h +++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h @@ -48,6 +48,7 @@ protected: virtual bool execute (ObjectList&); virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); QString getPrefixByType() const; + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx index 1ffd9570d..879682388 100644 --- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx +++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx @@ -553,3 +553,29 @@ int OperationGUI_PartitionDlg::GetLimit() const return aLimit; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_PartitionDlg::getSourceObjects() +{ + QList res; + for (int i = 0; i < myListShapes.length(); i++) { + GEOM::GeomObjPtr aGeomObjPtr(myListShapes[i]); + res << aGeomObjPtr; + } + for (int i = 0; i < myListTools.length(); i++) { + GEOM::GeomObjPtr aGeomObjPtr(myListTools[i]); + res << aGeomObjPtr; + } + for (int i = 0; i < myListRemoveInside.length(); i++) { + GEOM::GeomObjPtr aGeomObjPtr(myListRemoveInside[i]); + res << aGeomObjPtr; + } + for (int i = 0; i < myListKeepInside.length(); i++) { + GEOM::GeomObjPtr aGeomObjPtr(myListKeepInside[i]); + res << aGeomObjPtr; + } + return res; +} diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.h b/src/OperationGUI/OperationGUI_PartitionDlg.h index 03bb873d1..a505165be 100644 --- a/src/OperationGUI/OperationGUI_PartitionDlg.h +++ b/src/OperationGUI/OperationGUI_PartitionDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/OperationGUI/OperationGUI_TransferDataDlg.cxx b/src/OperationGUI/OperationGUI_TransferDataDlg.cxx index bc4eab9b5..576b36773 100755 --- a/src/OperationGUI/OperationGUI_TransferDataDlg.cxx +++ b/src/OperationGUI/OperationGUI_TransferDataDlg.cxx @@ -329,3 +329,14 @@ bool OperationGUI_TransferDataDlg::execute (ObjectList& objects) return isOK; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList OperationGUI_TransferDataDlg::getSourceObjects() +{ + QList res; + res << myObject1 << myObject2; + return res; +} diff --git a/src/OperationGUI/OperationGUI_TransferDataDlg.h b/src/OperationGUI/OperationGUI_TransferDataDlg.h index bae305394..924745747 100644 --- a/src/OperationGUI/OperationGUI_TransferDataDlg.h +++ b/src/OperationGUI/OperationGUI_TransferDataDlg.h @@ -44,6 +44,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx index fd8973113..7ee734a7b 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx @@ -439,3 +439,14 @@ void PrimitiveGUI_BoxDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myPoint2.get() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList PrimitiveGUI_BoxDlg::getSourceObjects() +{ + QList res; + res << myPoint1 << myPoint2; + return res; +} diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h index edddf0cae..df3d1050b 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx index bf1cd9c44..a3c86ed62 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx @@ -498,3 +498,14 @@ void PrimitiveGUI_ConeDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myDir.get() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList PrimitiveGUI_ConeDlg::getSourceObjects() +{ + QList res; + res << myPoint << myDir; + return res; +} diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h index 152c95f5d..6859fa0db 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx index 42ef56cef..9149eee9f 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx @@ -550,6 +550,17 @@ void PrimitiveGUI_CylinderDlg::addSubshapesToStudy() } } +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList PrimitiveGUI_CylinderDlg::getSourceObjects() +{ + QList res; + res << myPoint << myDir; + return res; +} + //================================================================================= // function : ActivateAngle() // purpose : enable the diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h index ae214d87a..c257ae901 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx index 7f631ebcb..4101be272 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx @@ -562,3 +562,14 @@ void PrimitiveGUI_DiskDlg::addSubshapesToStudy() break; } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList PrimitiveGUI_DiskDlg::getSourceObjects() +{ + QList res; + res << myPoint << myDir << myPoint1 << myPoint2 << myPoint3; + return res; +} diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h index 6e480f2ed..2a99edf1b 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h @@ -49,8 +49,8 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); - virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx index 4fbf3d5b0..6f6d17912 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx @@ -490,3 +490,14 @@ void PrimitiveGUI_FaceDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myFace.get() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList PrimitiveGUI_FaceDlg::getSourceObjects() +{ + QList res; + res << myEdge << myFace; + return res; +} diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h index 226f724c8..f4cade400 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h @@ -49,6 +49,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx index d2e05b104..ddd615ef9 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx @@ -415,3 +415,14 @@ void PrimitiveGUI_SphereDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myPoint.get() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList PrimitiveGUI_SphereDlg::getSourceObjects() +{ + QList res; + res << myPoint; + return res; +} diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h index b9fe512b5..b905e234f 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx index aa42252c4..3cc46d8e5 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx @@ -467,3 +467,14 @@ void PrimitiveGUI_TorusDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myDir.get() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList PrimitiveGUI_TorusDlg::getSourceObjects() +{ + QList res; + res << myPoint << myDir; + return res; +} diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h index bd6710030..ff1c66fac 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx index 04da51b10..d077f8352 100644 --- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx +++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx @@ -299,3 +299,15 @@ void RepairGUI_ChangeOrientationDlg::CreateCopyModeChanged( bool isCreateCopy ) { mainFrame()->GroupBoxName->setEnabled( isCreateCopy ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_ChangeOrientationDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h index 773826d29..2ee96bf4c 100644 --- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h +++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h @@ -48,6 +48,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx index c401ea5a8..19fd78bcc 100644 --- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx +++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx @@ -369,3 +369,15 @@ void RepairGUI_CloseContourDlg::initSelection() connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_CloseContourDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.h b/src/RepairGUI/RepairGUI_CloseContourDlg.h index 118dd7aed..7b97f3451 100644 --- a/src/RepairGUI/RepairGUI_CloseContourDlg.h +++ b/src/RepairGUI/RepairGUI_CloseContourDlg.h @@ -49,6 +49,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx index b980caf81..086874a90 100644 --- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx +++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx @@ -567,3 +567,15 @@ void RepairGUI_DivideEdgeDlg::addSubshapesToStudy() for ( int i = 0; i < myPoints.count(); ++i ) GEOMBase::PublishSubObject( myPoints[i].get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_DivideEdgeDlg::getSourceObjects() +{ + QList res(myPoints); + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h index f66c1429c..32a62b832 100644 --- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h +++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx index a27073cad..4babd1b75 100644 --- a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx +++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx @@ -307,3 +307,15 @@ GEOM::GEOM_Object_ptr RepairGUI_FreeBoundDlg::getFather (GEOM::GEOM_Object_ptr) { return myObj; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_FreeBoundDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObj); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.h b/src/RepairGUI/RepairGUI_FreeBoundDlg.h index f4126c267..9261bb0c2 100644 --- a/src/RepairGUI/RepairGUI_FreeBoundDlg.h +++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.h @@ -53,7 +53,8 @@ protected: virtual bool execute (ObjectList&); virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); virtual QString getNewObjectName (int CurrObj = -1) const; - + virtual QList getSourceObjects(); + private: void Init(); void enterEvent (QEvent*); diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx index e564b4cce..bc7aa61a8 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx +++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx @@ -377,3 +377,15 @@ GEOM::GEOM_Object_ptr RepairGUI_FreeFacesDlg::getFather (GEOM::GEOM_Object_ptr) { return myObj; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_FreeFacesDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObj); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.h b/src/RepairGUI/RepairGUI_FreeFacesDlg.h index 743217d4c..06641d041 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.h +++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx b/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx index 517186ce2..ac1372811 100644 --- a/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx +++ b/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx @@ -346,3 +346,15 @@ void RepairGUI_FuseEdgesDlg::addSubshapesToStudy() for (int i = 0; i < myPoints.count(); i++) GEOMBase::PublishSubObject(myPoints[i].get()); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_FuseEdgesDlg::getSourceObjects() +{ + QList res(myPoints); + GEOM::GeomObjPtr aGeomObjPtr(myShape); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_FuseEdgesDlg.h b/src/RepairGUI/RepairGUI_FuseEdgesDlg.h index 3fc671da5..2c4bc6496 100644 --- a/src/RepairGUI/RepairGUI_FuseEdgesDlg.h +++ b/src/RepairGUI/RepairGUI_FuseEdgesDlg.h @@ -44,6 +44,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private slots: void ClickOnOk(); diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index 20055ae98..3d9c5cc1d 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx @@ -843,3 +843,15 @@ void RepairGUI_GlueDlg::ClickOnCancel() clearTemporary(); GEOMBase_Skeleton::ClickOnCancel(); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_GlueDlg::getSourceObjects() +{ + QList res(myObjects); + for (int i = 0; i < myTmpObjs.count(); i++) + res << myTmpObjs[i]; + return res; +} diff --git a/src/RepairGUI/RepairGUI_GlueDlg.h b/src/RepairGUI/RepairGUI_GlueDlg.h index e087acbd1..e3a4d47ba 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.h +++ b/src/RepairGUI/RepairGUI_GlueDlg.h @@ -56,6 +56,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void restoreSubShapes (SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx index 6ab7e1407..ae2ea4718 100644 --- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx +++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx @@ -443,3 +443,15 @@ void RepairGUI_LimitToleranceDlg::restoreSubShapes(SALOMEDS::Study_ptr theStud mainFrame()->CheckBoxAddPrefix->isChecked()); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_LimitToleranceDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.h b/src/RepairGUI/RepairGUI_LimitToleranceDlg.h index 64436adab..aff6f62ba 100644 --- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.h +++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.h @@ -49,6 +49,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void restoreSubShapes (SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx index fedc6be51..a0deeec02 100644 --- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx +++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx @@ -314,3 +314,15 @@ void RepairGUI_RemoveExtraEdgesDlg::restoreSubShapes( SALOMEDS::Study_ptr theS mainFrame()->CheckBoxAddPrefix->isChecked() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_RemoveExtraEdgesDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h index bf43210a4..dd0a0f8b8 100644 --- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h @@ -46,6 +46,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx index c5ab07465..38b1f8934 100644 --- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx +++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx @@ -422,3 +422,15 @@ void RepairGUI_RemoveHolesDlg::onDetect() msg = tr("GEOM_FREE_BOUNDS_ERROR"); SUIT_MessageBox::information(this, tr("GEOM_FREE_BOUNDS_TLT"), msg); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_RemoveHolesDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h index fc0247a38..75c02245e 100644 --- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h @@ -49,6 +49,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx index c900c2a9a..f09bd8204 100644 --- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx +++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx @@ -362,3 +362,15 @@ void RepairGUI_RemoveIntWiresDlg::initSelection() connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_RemoveIntWiresDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h index c7520422e..e26484cf1 100644 --- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h @@ -48,6 +48,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx b/src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx index 79639f3a5..72d55a6de 100755 --- a/src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx +++ b/src/RepairGUI/RepairGUI_RemoveWebsDlg.cxx @@ -283,3 +283,12 @@ void RepairGUI_RemoveWebsDlg::restoreSubShapes (SALOMEDS::Study_ptr theStudy, mainFrame()->CheckBoxAddPrefix->isChecked()); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_RemoveWebsDlg::getSourceObjects() +{ + return myObjects; +} diff --git a/src/RepairGUI/RepairGUI_RemoveWebsDlg.h b/src/RepairGUI/RepairGUI_RemoveWebsDlg.h index 7b13dcbc5..69c9785e1 100755 --- a/src/RepairGUI/RepairGUI_RemoveWebsDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveWebsDlg.h @@ -45,6 +45,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void restoreSubShapes (SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx index 55df80c32..597a1f707 100644 --- a/src/RepairGUI/RepairGUI_SewingDlg.cxx +++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx @@ -358,3 +358,12 @@ void RepairGUI_SewingDlg::onDetect() msg = tr( "GEOM_FREE_BOUNDS_ERROR" ); SUIT_MessageBox::information( this, tr( "GEOM_FREE_BOUNDS_TLT" ), msg ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_SewingDlg::getSourceObjects() +{ + return myObjects; +} diff --git a/src/RepairGUI/RepairGUI_SewingDlg.h b/src/RepairGUI/RepairGUI_SewingDlg.h index a51b77098..fd3d6a797 100644 --- a/src/RepairGUI/RepairGUI_SewingDlg.h +++ b/src/RepairGUI/RepairGUI_SewingDlg.h @@ -51,6 +51,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index f1ac35604..0ad89b708 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -990,3 +990,18 @@ void RepairGUI_ShapeProcessDlg::onSelectAll( int state ) } myOpList->blockSignals( false ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_ShapeProcessDlg::getSourceObjects() +{ + QList res; + GEOM::ListOfGO aListPtr(myObjects); + for (int i = 0; i < aListPtr.length(); i++) { + GEOM::GeomObjPtr aGeomObjPtr(aListPtr[i]); + res << aGeomObjPtr; + } + return res; +} diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h index 59b5d4dde..7c0409561 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h @@ -57,6 +57,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void init(); diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx index eca0b20d0..4326405d3 100644 --- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx +++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx @@ -425,3 +425,15 @@ void RepairGUI_SuppressFacesDlg::restoreSubShapes (SALOMEDS::Study_ptr theStud mainFrame()->CheckBoxAddPrefix->isChecked()); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_SuppressFacesDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h index 53b26791e..e2a494c20 100644 --- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h +++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h @@ -49,6 +49,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/RepairGUI/RepairGUI_UnionFacesDlg.cxx b/src/RepairGUI/RepairGUI_UnionFacesDlg.cxx index ad9da5d6e..96abd2686 100755 --- a/src/RepairGUI/RepairGUI_UnionFacesDlg.cxx +++ b/src/RepairGUI/RepairGUI_UnionFacesDlg.cxx @@ -305,3 +305,15 @@ void RepairGUI_UnionFacesDlg::restoreSubShapes( SALOMEDS::Study_ptr theStudy, mainFrame()->CheckBoxAddPrefix->isChecked() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList RepairGUI_UnionFacesDlg::getSourceObjects() +{ + QList res; + GEOM::GeomObjPtr aGeomObjPtr(myObject); + res << aGeomObjPtr; + return res; +} diff --git a/src/RepairGUI/RepairGUI_UnionFacesDlg.h b/src/RepairGUI/RepairGUI_UnionFacesDlg.h index 38b7fff79..e45ad5ef8 100755 --- a/src/RepairGUI/RepairGUI_UnionFacesDlg.h +++ b/src/RepairGUI/RepairGUI_UnionFacesDlg.h @@ -46,6 +46,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx b/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx index 6a71bc235..41f453063 100644 --- a/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx @@ -409,3 +409,14 @@ bool TransformationGUI_ExtensionDlg::execute(ObjectList& objects) return res; } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_ExtensionDlg::getSourceObjects() +{ + QList res; + res << myBase; + return res; +} diff --git a/src/TransformationGUI/TransformationGUI_ExtensionDlg.h b/src/TransformationGUI/TransformationGUI_ExtensionDlg.h index c1f6b7e72..188428003 100644 --- a/src/TransformationGUI/TransformationGUI_ExtensionDlg.h +++ b/src/TransformationGUI/TransformationGUI_ExtensionDlg.h @@ -49,6 +49,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx index 55d91b352..ce56c6265 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx @@ -454,3 +454,14 @@ void TransformationGUI_MirrorDlg::addSubshapesToStudy() } } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_MirrorDlg::getSourceObjects() +{ + QList res(myObjects); + res << myArgument; + return res; +} diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.h b/src/TransformationGUI/TransformationGUI_MirrorDlg.h index e9ba7b302..4ccae5231 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.h +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.h @@ -52,6 +52,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx index fd999a60f..b3f04d0a0 100644 --- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx @@ -550,6 +550,17 @@ void TransformationGUI_MultiRotationDlg::addSubshapesToStudy() } } +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_MultiRotationDlg::getSourceObjects() +{ + QList res; + res << myBase << myVector; + return res; +} + //================================================================================= // function : restoreSubShapes // purpose : diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h index 30f20a9f6..56b2be284 100644 --- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h +++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h @@ -98,6 +98,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx index f354b8f92..da234f210 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx @@ -713,6 +713,17 @@ void TransformationGUI_MultiTranslationDlg::addSubshapesToStudy() } } +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_MultiTranslationDlg::getSourceObjects() +{ + QList res; + res << myBase << myVectorU << myVectorV; + return res; +} + //================================================================================= // function : restoreSubShapes // purpose : diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h index a2b669dee..b0f6bb03d 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h @@ -53,6 +53,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx index 501068300..487aed5ab 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx @@ -328,3 +328,12 @@ void TransformationGUI_OffsetDlg::CreateCopyModeChanged() { mainFrame()->GroupBoxName->setEnabled( GroupPoints->CheckButton1->isChecked() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_OffsetDlg::getSourceObjects() +{ + return myObjects; +} diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.h b/src/TransformationGUI/TransformationGUI_OffsetDlg.h index d48ae4828..556836696 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.h +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.h @@ -51,6 +51,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx index 907e8686e..007817644 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx @@ -608,3 +608,14 @@ void TransformationGUI_PositionDlg::addSubshapesToStudy() if ( getConstructorId() == 2 ) GEOMBase::PublishSubObject( myPath.get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_PositionDlg::getSourceObjects() +{ + QList res(myObjects); + res << myStartLCS << myEndLCS << myPath; + return res; +} diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.h b/src/TransformationGUI/TransformationGUI_PositionDlg.h index bae26851b..fb1c29bc7 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.h +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.h @@ -52,6 +52,7 @@ protected: virtual bool execute( ObjectList& ); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_ProjectionDlg.cxx b/src/TransformationGUI/TransformationGUI_ProjectionDlg.cxx index 33488e7e6..2e91fc3da 100644 --- a/src/TransformationGUI/TransformationGUI_ProjectionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ProjectionDlg.cxx @@ -372,3 +372,14 @@ void TransformationGUI_ProjectionDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myObject1.get() ); GEOMBase::PublishSubObject( myObject2.get() ); } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_ProjectionDlg::getSourceObjects() +{ + QList res; + res << myObject1 << myObject2; + return res; +} diff --git a/src/TransformationGUI/TransformationGUI_ProjectionDlg.h b/src/TransformationGUI/TransformationGUI_ProjectionDlg.h index 788fcbb17..505c28396 100644 --- a/src/TransformationGUI/TransformationGUI_ProjectionDlg.h +++ b/src/TransformationGUI/TransformationGUI_ProjectionDlg.h @@ -50,6 +50,7 @@ protected: virtual bool isValid (QString&); virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx index e88ba0ab6..adb8767df 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx @@ -616,3 +616,14 @@ void TransformationGUI_RotationDlg::addSubshapesToStudy() } } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_RotationDlg::getSourceObjects() +{ + QList res(myObjects); + res << myAxis << myCentPoint << myPoint1 << myPoint2; + return res; +} diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.h b/src/TransformationGUI/TransformationGUI_RotationDlg.h index 795f1c883..929fa4345 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.h +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.h @@ -52,6 +52,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index 8cbf3495c..0e3767ef3 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -533,3 +533,14 @@ void TransformationGUI_ScaleDlg::addSubshapesToStudy() GEOMBase::PublishSubObject( myPoint.get() ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_ScaleDlg::getSourceObjects() +{ + QList res(myObjects); + res << myPoint; + return res; +} diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.h b/src/TransformationGUI/TransformationGUI_ScaleDlg.h index a30005ac5..ea14f8e47 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.h +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.h @@ -57,6 +57,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init(); diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx index 7b6f42a39..71b5cb062 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx @@ -687,3 +687,14 @@ void TransformationGUI_TranslationDlg::createPathPreview ( GEOM::GEOM_Object_ptr GEOMBase_Helper::displayPreview( aPrs, false, true ); } } + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList TransformationGUI_TranslationDlg::getSourceObjects() +{ + QList res(myObjects); + res << myVector << myPoint1 << myPoint2; + return res; +} diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.h b/src/TransformationGUI/TransformationGUI_TranslationDlg.h index c5aad3daa..4653726e5 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.h +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.h @@ -52,6 +52,7 @@ protected: virtual bool execute( ObjectList& ); virtual void addSubshapesToStudy(); virtual void restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr ); + virtual QList getSourceObjects(); private: void Init();