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
Merge branch 'master' into gni/adaptation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshOp.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshOp.h
b/src/SMESHGUI/SMESHGUI_MeshOp.h
index 206f4504e97784ff74d3f3a85b681b7d1b72172d..e9b79ffb29a9c4c09af6313f326cefe7a869469e 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshOp.h
+++ b/
src/SMESHGUI/SMESHGUI_MeshOp.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-32,6
+32,11
@@
#include "SMESHGUI_SelectionOp.h"
#include "SMESHGUI_SelectionOp.h"
+// IDL includes
+#include <SALOMEconfig.h>
+#include CORBA_CLIENT_HEADER(SMESH_Gen)
+#include CORBA_CLIENT_HEADER(GEOM_Gen)
+
class HypothesesSet;
class SMESHGUI_MeshDlg;
class SMESHGUI_ShapeByMeshOp;
class HypothesesSet;
class SMESHGUI_MeshDlg;
class SMESHGUI_ShapeByMeshOp;
@@
-82,7
+87,6
@@
protected slots:
void onPublishShapeByMeshDlg( SUIT_Operation* );
void onCloseShapeByMeshDlg( SUIT_Operation* );
void onAlgoSelected( const int, const int = -1 );
void onPublishShapeByMeshDlg( SUIT_Operation* );
void onCloseShapeByMeshDlg( SUIT_Operation* );
void onAlgoSelected( const int, const int = -1 );
- void processSet();
void onHypoCreated( int );
void onHypoEdited( int );
void onAlgoSetByMeshType( const int, const int );
void onHypoCreated( int );
void onHypoEdited( int );
void onAlgoSetByMeshType( const int, const int );
@@
-92,11
+96,8
@@
private:
typedef QMap<QString, bool> THypLabelIsAppMap; // typedef: map of hypothesis is applicable
bool isValid( QString& ) const;
typedef QMap<QString, bool> THypLabelIsAppMap; // typedef: map of hypothesis is applicable
bool isValid( QString& ) const;
- bool isCompatibleToGeometry( HypothesisData* ,
- QString,
- GEOM::GEOM_Object_var);
- bool isCompatibleToMeshType( HypothesisData* ,
- QString);
+ bool isCompatibleToGeometry( HypothesisData* , const int);
+ bool isCompatibleToMeshType( HypothesisData* , const int);
void availableHyps( const int,
const int,
QStringList&,
void availableHyps( const int,
const int,
QStringList&,
@@
-120,6
+121,8
@@
private:
bool createMesh( QString&, QStringList& );
bool createSubMesh( QString&, QStringList& );
bool editMeshOrSubMesh( QString& );
bool createMesh( QString&, QStringList& );
bool createSubMesh( QString&, QStringList& );
bool editMeshOrSubMesh( QString& );
+ void createSubMeshOnInternalEdges( SMESH::SMESH_Mesh_ptr mesh,
+ GEOM::GEOM_Object_ptr mainShape );
bool checkSubMeshConcurrency( SMESH::SMESH_Mesh_ptr mesh,
SMESH::SMESH_subMesh_ptr submesh,
bool askUser=false);
bool checkSubMeshConcurrency( SMESH::SMESH_Mesh_ptr mesh,
SMESH::SMESH_subMesh_ptr submesh,
bool askUser=false);
@@
-128,7
+131,7
@@
private:
bool isSelectedHyp( int, int, int ) const;
int nbDlgHypTypes( const int ) const;
bool isAccessibleDim( const int ) const;
bool isSelectedHyp( int, int, int ) const;
int nbDlgHypTypes( const int ) const;
bool isAccessibleDim( const int ) const;
- void setCurrentHyp( const int, const int, const int
);
+ 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();
void setDefaultName( const QString& prefix="" ) const;
SMESH::SMESH_Hypothesis_var getAlgo( const int );
void readMesh();
@@
-136,16
+139,18
@@
private:
int find( const SMESH::SMESH_Hypothesis_var&,
const THypList& ) const;
SMESH::SMESH_Hypothesis_var getInitParamsHypothesis( const QString&,
int find( const SMESH::SMESH_Hypothesis_var&,
const THypList& ) const;
SMESH::SMESH_Hypothesis_var getInitParamsHypothesis( const QString&,
- const QString& ) const;
+ const QString&,
+ const SMESH::HypInitParams* prm=0) const;
void initHypCreator( SMESHGUI_GenericHypothesisCreator* aCreator );
void initHypCreator( SMESHGUI_GenericHypothesisCreator* aCreator );
+ bool getAverageSize( double & averageSize );
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
;
+ void
updateMeshTypeList(
);
+ void
updateHypoSets(
);
+ void setFilteredAlgoData();
+ QString
List getHypoNames()
;
private:
private:
@@
-153,19
+158,27
@@
private:
SMESHGUI_ShapeByMeshOp* myShapeByMeshOp;
bool myToCreate;
bool myIsMesh;
SMESHGUI_ShapeByMeshOp* myShapeByMeshOp;
bool myToCreate;
bool myIsMesh;
- bool myIsOnGeometry; //!< TRUE if edited mesh
accotiated with geometrical object
+ bool myIsOnGeometry; //!< TRUE if edited mesh
is based on geometry
bool myHasConcurrentSubBefore;
bool myHasConcurrentSubBefore;
+ bool myIsInvalidSubMesh; //!< "invalid sub-mesh" is edited
+ // The geometry of "invalid sub-mesh" is not a sub-shape of the main shape;
+ // it is created for the case where a valid sub-shape not found by CopyMeshWithGeom()
+
+ QString myGeomEntry;
+ GEOM::GEOM_Object_var myGeom;
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
// hypdata corresponding to hypotheses present in myDlg
THypDataList myAvailableHypData[4][NbHypTypes];
// edited mesh/sub-mesh
// hypdata corresponding to hypotheses present in myDlg
THypDataList myAvailableHypData[4][NbHypTypes];
- QString myLastGeom
ToSelect
;
+ QString myLastGeom
Entry
;
THypLabelIsAppMap myHypMapIsApplicable;
bool myIgnoreAlgoSelection;
THypLabelIsAppMap myHypMapIsApplicable;
bool myIgnoreAlgoSelection;
- HypothesesSet* myHypoSet;
- int myDim, myType, myMaxShapeDim;
+ int myDim, myType, myMaxShapeDim;
+
+ HypothesesSet* myHypoSet; // applied hypo-set
+ double myAverageSize; // entered at hypo-set processing
QString myObjectToSelect;
};
QString myObjectToSelect;
};