X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshOp.h;h=fcaedabf3fe112271e81fb3281a8658a1c8aef9f;hp=c658fb74e33568594bcfa6fd53b3784d597ab978;hb=057ae95be6c89a0aac8e918607cae04f129e5e71;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813 diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.h b/src/SMESHGUI/SMESHGUI_MeshOp.h index c658fb74e..fcaedabf3 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.h +++ b/src/SMESHGUI/SMESHGUI_MeshOp.h @@ -1,47 +1,38 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// Copyright (C) 2007-2014 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 -// +// // 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. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// License as published by the Free Software Foundation; either +// 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -/** -* SMESH SMESHGUI -* -* Copyright (C) 2005 CEA/DEN, EDF R&D -* -* -* -* File : SMESHGUI_MeshOp.h -* Author : Sergey LITONIN -* Module : SMESHGUI -*/ -#ifndef SMESHGUI_MeshOp_H -#define SMESHGUI_MeshOp_H +// SMESH SMESHGUI : GUI for SMESH component +// File : SMESHGUI_MeshOp.h +// Author : Sergey LITONIN, Open CASCADE S.A.S. +// +#ifndef SMESHGUI_MESHOP_H +#define SMESHGUI_MESHOP_H +// SMESH includes #include "SMESH_SMESHGUI.hxx" #include "SMESHGUI_SelectionOp.h" -#include -#include CORBA_CLIENT_HEADER(GEOM_Gen) -#include CORBA_CLIENT_HEADER(SMESH_Mesh) - -#include - +class HypothesesSet; class SMESHGUI_MeshDlg; class SMESHGUI_ShapeByMeshOp; class HypothesisData; @@ -56,11 +47,11 @@ class SMESHGUI_EXPORT SMESHGUI_MeshOp : public SMESHGUI_SelectionOp Q_OBJECT public: - enum HypType{ Algo = 0, MainHyp, AddHyp, NbHypTypes }; + enum MeshType{ MT_ANY = 0, MT_TRIANGULAR, MT_QUADRILATERAL, MT_TETRAHEDRAL, MT_HEXAHEDRAL }; typedef std::pair THypItem; - typedef QValueList< THypItem > THypList; + typedef QList< THypItem > THypList; typedef int THypType; typedef QMap< THypType, THypList > TType2HypList; @@ -68,85 +59,99 @@ public: typedef int THypDim; typedef QMap< THypDim, TType2HypList > TDim2Type2HypList; - SMESHGUI_MeshOp( const bool theToCreate, const bool theIsMesh = true ); +public: + SMESHGUI_MeshOp( const bool, const bool = true ); virtual ~SMESHGUI_MeshOp(); virtual LightApp_Dialog* dlg() const; protected: virtual void startOperation(); + virtual void commitOperation(); virtual void selectionDone(); virtual SUIT_SelectionFilter* createFilter( const int ) const; virtual bool isValid( SUIT_Operation* ) const; protected slots: virtual bool onApply(); - void onCreateHyp( const int theHypType, const int theIndex ); - void onEditHyp( const int theHypType, const int theIndex ); - void onHypoSet( const QString& theSetName ); + void onCreateHyp( const int, const int ); + void onEditHyp( const int, const int ); + void onHypoSet( const QString& ); void onGeomSelectionByMesh( bool ); - void onPublishShapeByMeshDlg(SUIT_Operation*); - void onCloseShapeByMeshDlg(SUIT_Operation*); - void onAlgoSelected( const int theIndex, - const int theDim = -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 ); private: - - typedef QValueList THypDataList; // typedef: list of hypothesis data + typedef QList THypDataList; // typedef: list of hypothesis data bool isValid( QString& ) const; - void availableHyps( const int theDim, - const int theHypType, - QStringList& theHyps, - THypDataList& theDataList, - HypothesisData* theAlgoData = 0 ) const; - void existingHyps( const int theDim, - const int theHypType, - _PTR(SObject) theFather, - QStringList& theHyps, - THypList& theHypList, - HypothesisData* theAlgoData = 0); - HypothesisData* hypData( const int theDim, - const int theHypType, - const int theIndex); // access to myAvailableHypData - - void createHypothesis(const int theDim, const int theType, - const QString& theTypeName); - - bool createMesh( QString& ); - bool createSubMesh( QString& ); + void availableHyps( const int, + const int, + QStringList&, + THypDataList&, + HypothesisData* = 0 ) const; + static void existingHyps( const int, + const int, + _PTR(SObject), + QStringList&, + THypList&, + HypothesisData* = 0 ); + HypothesisData* hypData( const int, + const int, + const int ); // access to myAvailableHypData + + void createHypothesis( const int, const int, + const 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; bool isAccessibleDim( const int ) const; void setCurrentHyp( const int, const int, const int ); - void setDefaultName() const; + void setDefaultName( const QString& prefix="" ) const; SMESH::SMESH_Hypothesis_var getAlgo( const int ); void readMesh(); QString name( _PTR(SObject) ) const; int find( const SMESH::SMESH_Hypothesis_var&, - const THypList& theHypList) const; - SMESH::SMESH_Hypothesis_var getInitParamsHypothesis( const QString& aHypType, - const QString& aServerLib ) const; + const THypList& ) const; + SMESH::SMESH_Hypothesis_var getInitParamsHypothesis( const QString&, + const QString& ) 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 ); private: 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 myObjHyps; //!< hypothesis assigned to the current // edited mesh/sub-mesh - // hypdata corresponding to hypotheses present in myDlg THypDataList myAvailableHypData[4][NbHypTypes]; - + THypDataList myFilteredAlgoData[4]; bool myIgnoreAlgoSelection; + HypothesesSet* myHypoSet; + int myDim, myType, myMaxShapeDim; + + QString myObjectToSelect; }; -#endif +#endif // SMESHGUI_MESHOP_H