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
22594: [CEA 1159] Salome crashes when loading a dumped meshing script
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshDlg.h
b/src/SMESHGUI/SMESHGUI_MeshDlg.h
index 212449ff96477d1096f73ba2bf8fcf76e6381378..2d0cdde7459bae9bf21f6e3759b457712977f4cb 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MeshDlg.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
@@
-74,21
+74,27
@@
public:
void enableTab(const int);
bool isTabEnabled(const int) const;
int getActiveObject();
void enableTab(const int);
bool isTabEnabled(const int) const;
int getActiveObject();
+ void setAvailableMeshType(const QStringList& );
+ int currentMeshType();
+ void setCurrentMeshType( const int );
signals:
void hypoSet( const QString& );
void geomSelectionByMesh( bool );
signals:
void hypoSet( const QString& );
void geomSelectionByMesh( bool );
+ void selectMeshType( const int, const int );
private slots:
void onHypoSetPopup( QAction* );
void onGeomPopup( QAction* );
void onGeomSelectionButton( bool );
private slots:
void onHypoSetPopup( QAction* );
void onGeomPopup( QAction* );
void onGeomSelectionButton( bool );
+ void onChangedMeshType( const int );
private:
QMap<int, SMESHGUI_MeshTab*> myTabs;
QTabWidget* myTabWg;
QToolButton* myHypoSetButton;
QMenu* myGeomPopup;
private:
QMap<int, SMESHGUI_MeshTab*> myTabs;
QTabWidget* myTabWg;
QToolButton* myHypoSetButton;
QMenu* myGeomPopup;
+ QComboBox* myMeshType;
};
/*!
};
/*!
@@
-114,7
+120,7
@@
public:
virtual ~SMESHGUI_MeshTab();
void setAvailableHyps( const int, const QStringList& );
virtual ~SMESHGUI_MeshTab();
void setAvailableHyps( const int, const QStringList& );
- void setExistingHyps( const int, const QStringList&
);
+ void setExistingHyps( const int, const QStringList&
, bool=false
);
void addHyp( const int, const QString& );
void renameHyp( const int, const int, const QString& );
void setCurrentHyp( const int, const int );
void addHyp( const int, const QString& );
void renameHyp( const int, const int, const QString& );
void setCurrentHyp( const int, const int );