Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0022571: [CEA 1152] if selection disabled, impossible to select a mesh in "Merge...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_RotationDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_RotationDlg.h
b/src/SMESHGUI/SMESHGUI_RotationDlg.h
index a4e6b4af244b4899be68af4c8551597ad7ee9d22..3f2c1b9ce7273549f1e9cdc88f46d1e44f8dc177 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_RotationDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_RotationDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
//
// 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
// 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
//
// 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_RotationDlg
// purpose :
//=================================================================================
-class SMESHGUI_EXPORT SMESHGUI_RotationDlg : public SMESHGUI_PreviewDlg
+class SMESHGUI_EXPORT SMESHGUI_RotationDlg : public SMESHGUI_
Multi
PreviewDlg
{
Q_OBJECT
{
Q_OBJECT
@@
-66,9
+66,7
@@
public:
private:
void Init( bool = true );
private:
void Init( bool = true );
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void enterEvent( QEvent* ); /* mouse enter the QWidget */
- void hideEvent( QHideEvent* ); /* ESC key */
void keyPressEvent( QKeyEvent* );
bool IsAxisOk();
void setNewMeshName();
void keyPressEvent( QKeyEvent* );
bool IsAxisOk();
void setNewMeshName();
@@
-84,10
+82,11
@@
private:
QWidget* myEditCurrentArgument; /* Current LineEdit */
int myConstructorId;
bool myBusy;
QWidget* myEditCurrentArgument; /* Current LineEdit */
int myConstructorId;
bool myBusy;
- SMESH::SMESH_Mesh_var myMesh;
SMESH_Actor* myActor;
SMESH_LogicalFilter* myMeshOrSubMeshOrGroupFilter;
SMESH_Actor* myActor;
SMESH_LogicalFilter* myMeshOrSubMeshOrGroupFilter;
- SMESH::SMESH_IDSource_var mySelectedObject;
+ QList<SMESH::SMESH_IDSource_var> myObjects;
+ QList<QString> myObjectsNames;
+ QList<SMESH::SMESH_Mesh_var> myMeshes;
QGroupBox* GroupConstructors;
QRadioButton* RadioButton1;
QGroupBox* GroupConstructors;
QRadioButton* RadioButton1;
@@
-134,11
+133,11
@@
private:
SMESHGUI_FilterDlg* myFilterDlg;
protected slots:
SMESHGUI_FilterDlg* myFilterDlg;
protected slots:
- virtual void onDisplaySimulation( bool );
+ virtual void onDisplaySimulation( bool );
+ virtual void reject();
private slots:
void ClickOnOk();
private slots:
void ClickOnOk();
- void ClickOnCancel();
bool ClickOnApply();
void ClickOnHelp();
void SetEditCurrentArgument();
bool ClickOnApply();
void ClickOnHelp();
void SetEditCurrentArgument();