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
Rollback previous wrong integration, restore improvement 0018239 implementation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.h
b/src/SMESHGUI/SMESHGUI_GroupDlg.h
index 18607e2aa4ee3d425f46b659b00de99402bfd4fe..fb6b9dcf02ec481aa6a902ba4b127285a3dda9d2 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.h
@@
-69,7
+69,8
@@
public:
SMESHGUI_GroupDlg( SMESHGUI*,
SMESH::SMESH_Mesh_ptr = SMESH::SMESH_Mesh::_nil() );
SMESHGUI_GroupDlg( SMESHGUI*,
SMESHGUI_GroupDlg( SMESHGUI*,
SMESH::SMESH_Mesh_ptr = SMESH::SMESH_Mesh::_nil() );
SMESHGUI_GroupDlg( SMESHGUI*,
- SMESH::SMESH_GroupBase_ptr );
+ SMESH::SMESH_GroupBase_ptr,
+ const bool theIsConvert = false );
~SMESHGUI_GroupDlg();
static QString GetDefaultName( const QString& );
~SMESHGUI_GroupDlg();
static QString GetDefaultName( const QString& );
@@
-81,6
+82,7
@@
public slots:
private slots:
void onTypeChanged( int );
void onGrpTypeChanged( int );
private slots:
void onTypeChanged( int );
void onGrpTypeChanged( int );
+ void onColorChanged( QColor );
void onOK();
void onClose();
void onOK();
void onClose();
@@
-111,7
+113,8
@@
private slots:
private:
void initDialog( bool );
void init( SMESH::SMESH_Mesh_ptr );
private:
void initDialog( bool );
void init( SMESH::SMESH_Mesh_ptr );
- void init( SMESH::SMESH_GroupBase_ptr );
+ void init( SMESH::SMESH_GroupBase_ptr,
+ const bool theIsConvert = false );
void closeEvent( QCloseEvent* );
void enterEvent( QEvent* );
void hideEvent( QHideEvent* ); /* ESC key */
void closeEvent( QCloseEvent* );
void enterEvent( QEvent* );
void hideEvent( QHideEvent* ); /* ESC key */
@@
-119,6
+122,9
@@
private:
void setSelectionMode( int );
void updateButtons();
void updateGeomPopup();
void setSelectionMode( int );
void updateButtons();
void updateGeomPopup();
+ bool SetAppropriateActor();
+ void setShowEntityMode();
+ void restoreShowEntityMode();
void setGroupColor( const SALOMEDS::Color& );
SALOMEDS::Color getGroupColor() const;
void setGroupColor( const SALOMEDS::Color& );
SALOMEDS::Color getGroupColor() const;
@@
-133,6
+139,7
@@
private:
SMESH_Actor* myActor; /* Current mesh actor */
int myGrpTypeId; /* Current group type id : standalone or group on geometry */
int myTypeId; /* Current type id = radio button id */
SMESH_Actor* myActor; /* Current mesh actor */
int myGrpTypeId; /* Current group type id : standalone or group on geometry */
int myTypeId; /* Current type id = radio button id */
+ int myStoredShownEntity; /* Store ShowEntity mode of myMesh */
QLineEdit* myCurrentLineEdit; /* Current LineEdit */
SVTK_Selector* mySelector;
QLineEdit* myCurrentLineEdit; /* Current LineEdit */
SVTK_Selector* mySelector;
@@
-193,6
+200,8
@@
private:
QString myHelpFileName;
QMap<QAction*, int> myActions;
QString myHelpFileName;
QMap<QAction*, int> myActions;
+
+ bool myNameChanged; //added by skl for IPAL19574
};
#endif // SMESHGUI_GROUPDLG_H
};
#endif // SMESHGUI_GROUPDLG_H