X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_RotationDlg.h;h=f6e84eca5df697e8423e3ea79638b840d6a7b21b;hp=a4e6b4af244b4899be68af4c8551597ad7ee9d22;hb=44d75c1021a72e6c0880f70c26348d021fdf699d;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6 diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.h b/src/SMESHGUI/SMESHGUI_RotationDlg.h index a4e6b4af2..f6e84eca5 100644 --- a/src/SMESHGUI/SMESHGUI_RotationDlg.h +++ b/src/SMESHGUI/SMESHGUI_RotationDlg.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -56,7 +56,7 @@ class SMESH_LogicalFilter; // class : SMESHGUI_RotationDlg // purpose : //================================================================================= -class SMESHGUI_EXPORT SMESHGUI_RotationDlg : public SMESHGUI_PreviewDlg +class SMESHGUI_EXPORT SMESHGUI_RotationDlg : public SMESHGUI_MultiPreviewDlg { Q_OBJECT @@ -66,9 +66,7 @@ public: private: void Init( bool = true ); - void closeEvent( QCloseEvent* ); void enterEvent( QEvent* ); /* mouse enter the QWidget */ - void hideEvent( QHideEvent* ); /* ESC key */ void keyPressEvent( QKeyEvent* ); bool IsAxisOk(); void setNewMeshName(); @@ -84,10 +82,11 @@ private: QWidget* myEditCurrentArgument; /* Current LineEdit */ int myConstructorId; bool myBusy; - SMESH::SMESH_Mesh_var myMesh; SMESH_Actor* myActor; SMESH_LogicalFilter* myMeshOrSubMeshOrGroupFilter; - SMESH::SMESH_IDSource_var mySelectedObject; + QList myObjects; + QList myObjectsNames; + QList myMeshes; QGroupBox* GroupConstructors; QRadioButton* RadioButton1; @@ -134,11 +133,11 @@ private: SMESHGUI_FilterDlg* myFilterDlg; protected slots: - virtual void onDisplaySimulation( bool ); + virtual void onDisplaySimulation( bool ); + virtual void reject(); private slots: void ClickOnOk(); - void ClickOnCancel(); bool ClickOnApply(); void ClickOnHelp(); void SetEditCurrentArgument();