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
Fix regressions
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshOp.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshOp.h
b/src/SMESHGUI/SMESHGUI_MeshOp.h
index 91c39ed72bb8b16ce305e4630a9d3cf2d5f35d9c..8ba4f8c40b81bbe152d7a6fc51de9d4286904124 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshOp.h
+++ b/
src/SMESHGUI/SMESHGUI_MeshOp.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-36,6
+36,7
@@
class HypothesesSet;
class SMESHGUI_MeshDlg;
class SMESHGUI_ShapeByMeshOp;
class HypothesisData;
class SMESHGUI_MeshDlg;
class SMESHGUI_ShapeByMeshOp;
class HypothesisData;
+class SMESHGUI_GenericHypothesisCreator;
/*!
* \brief Operation for mech creation or editing
/*!
* \brief Operation for mech creation or editing
@@
-48,6
+49,7
@@
class SMESHGUI_EXPORT SMESHGUI_MeshOp : public SMESHGUI_SelectionOp
public:
enum HypType{ Algo = 0, MainHyp, AddHyp, NbHypTypes };
public:
enum HypType{ Algo = 0, MainHyp, AddHyp, NbHypTypes };
+ enum MeshType{ MT_ANY = 0, MT_TRIANGULAR, MT_QUADRILATERAL, MT_TETRAHEDRAL, MT_HEXAHEDRAL };
typedef std::pair<SMESH::SMESH_Hypothesis_var, QString> THypItem;
typedef QList< THypItem > THypList;
typedef std::pair<SMESH::SMESH_Hypothesis_var, QString> THypItem;
typedef QList< THypItem > THypList;
@@
-83,22
+85,31
@@
protected slots:
void processSet();
void onHypoCreated( int );
void onHypoEdited( int );
void processSet();
void onHypoCreated( int );
void onHypoEdited( int );
+ void onAlgoSetByMeshType( const int, const int );
private:
typedef QList<HypothesisData*> THypDataList; // typedef: list of hypothesis data
private:
typedef QList<HypothesisData*> THypDataList; // typedef: list of hypothesis data
+ typedef QMap<QString, bool> THypLabelIsAppMap; // typedef: map of hypothesis is applicable
bool isValid( QString& ) const;
bool isValid( QString& ) const;
+ bool isCompatibleToGeometry( HypothesisData* ,
+ QString,
+ GEOM::GEOM_Object_var);
+ bool isCompatibleToMeshType( HypothesisData* ,
+ QString);
void availableHyps( const int,
const int,
QStringList&,
THypDataList&,
void availableHyps( const int,
const int,
QStringList&,
THypDataList&,
- HypothesisData* = 0 ) const;
- static void existingHyps( const int,
+ HypothesisData* = 0,
+ HypothesisData* = 0,
+ const QString& = "");
+ void existingHyps( const int,
const int,
_PTR(SObject),
QStringList&,
THypList&,
const int,
_PTR(SObject),
QStringList&,
THypList&,
- HypothesisData* = 0 );
+ HypothesisData* = 0 )
const
;
HypothesisData* hypData( const int,
const int,
const int ); // access to myAvailableHypData
HypothesisData* hypData( const int,
const int,
const int ); // access to myAvailableHypData
@@
-109,11
+120,16
@@
private:
bool createMesh( QString&, QStringList& );
bool createSubMesh( QString&, QStringList& );
bool editMeshOrSubMesh( QString& );
bool createMesh( QString&, QStringList& );
bool createSubMesh( QString&, QStringList& );
bool editMeshOrSubMesh( QString& );
+ bool checkSubMeshConcurrency( SMESH::SMESH_Mesh_ptr mesh,
+ SMESH::SMESH_subMesh_ptr submesh,
+ bool askUser=false);
int currentHyp( const int, const int ) const;
int currentHyp( const int, const int ) const;
+ bool isSelectedHyp( int, int, int ) const;
+ int nbDlgHypTypes( const int ) const;
bool isAccessibleDim( const int ) const;
bool isAccessibleDim( const int ) const;
- void setCurrentHyp( const int, const int, const int
);
- void setDefaultName() const;
+ void setCurrentHyp( const int, const int, const int
, const bool=false
);
+ void setDefaultName(
const QString& prefix=""
) const;
SMESH::SMESH_Hypothesis_var getAlgo( const int );
void readMesh();
QString name( _PTR(SObject) ) const;
SMESH::SMESH_Hypothesis_var getAlgo( const int );
void readMesh();
QString name( _PTR(SObject) ) const;
@@
-121,28
+137,35
@@
private:
const THypList& ) const;
SMESH::SMESH_Hypothesis_var getInitParamsHypothesis( const QString&,
const QString& ) const;
const THypList& ) const;
SMESH::SMESH_Hypothesis_var getInitParamsHypothesis( const QString&,
const QString& ) const;
+ void initHypCreator( SMESHGUI_GenericHypothesisCreator* aCreator );
bool isSubshapeOk() const;
char* isSubmeshIgnored() const;
_PTR(SObject) getSubmeshByGeom() const;
void selectObject( _PTR(SObject) ) const;
bool isSubshapeOk() const;
char* isSubmeshIgnored() const;
_PTR(SObject) getSubmeshByGeom() const;
void selectObject( _PTR(SObject) ) const;
+ void createMeshTypeList( QStringList& );
+ void setAvailableMeshType( const QStringList& );
+ void setFilteredAlgoData( const int, const int );
+ QString currentMeshTypeName( const int ) const;
private:
private:
+
SMESHGUI_MeshDlg* myDlg;
SMESHGUI_ShapeByMeshOp* myShapeByMeshOp;
bool myToCreate;
bool myIsMesh;
bool myIsOnGeometry; //!< TRUE if edited mesh accotiated with geometrical object
SMESHGUI_MeshDlg* myDlg;
SMESHGUI_ShapeByMeshOp* myShapeByMeshOp;
bool myToCreate;
bool myIsMesh;
bool myIsOnGeometry; //!< TRUE if edited mesh accotiated with geometrical object
+ bool myHasConcurrentSubBefore;
TDim2Type2HypList myExistingHyps; //!< all hypothesis of SMESH module
TDim2Type2HypList myExistingHyps; //!< all hypothesis of SMESH module
- TDim2Type2HypList myObjHyps; //!< hypothesis assigned to the current
+ TDim2Type2HypList myObjHyps; //!< hypothesis assigned to the current
// edited mesh/sub-mesh
// edited mesh/sub-mesh
-
// hypdata corresponding to hypotheses present in myDlg
THypDataList myAvailableHypData[4][NbHypTypes];
// hypdata corresponding to hypotheses present in myDlg
THypDataList myAvailableHypData[4][NbHypTypes];
-
+ QString myLastGeomToSelect;
+ THypLabelIsAppMap myHypMapIsApplicable;
bool myIgnoreAlgoSelection;
bool myIgnoreAlgoSelection;
- HypothesesSet* myHypoSet;
- int
myDim, myType
;
+ HypothesesSet*
myHypoSet;
+ int
myDim, myType, myMaxShapeDim
;
QString myObjectToSelect;
};
QString myObjectToSelect;
};