X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshOp.h;h=c658fb74e33568594bcfa6fd53b3784d597ab978;hb=415771a7d506997008edf6e99d0143ce5bb3a9a2;hp=9fd854e4c8acc3ebdf98859ec169b458e18bb0bf;hpb=902a6da0b24e3d6b3914c29d28f00befc442053b;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.h b/src/SMESHGUI/SMESHGUI_MeshOp.h index 9fd854e4c..c658fb74e 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.h +++ b/src/SMESHGUI/SMESHGUI_MeshOp.h @@ -1,3 +1,22 @@ +// Copyright (C) 2005 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 +// 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 +// 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 * @@ -13,34 +32,46 @@ #ifndef SMESHGUI_MeshOp_H #define SMESHGUI_MeshOp_H +#include "SMESH_SMESHGUI.hxx" + #include "SMESHGUI_SelectionOp.h" -#include #include -#include CORBA_SERVER_HEADER(GEOM_Gen) -#include CORBA_SERVER_HEADER(SMESH_Mesh) +#include CORBA_CLIENT_HEADER(GEOM_Gen) +#include CORBA_CLIENT_HEADER(SMESH_Mesh) -class SMESHGUI_MeshDlg; -class SMESH_TypeFilter; -class SMESH_NumberFilter; +#include +class SMESHGUI_MeshDlg; +class SMESHGUI_ShapeByMeshOp; +class HypothesisData; /*! * \brief Operation for mech creation or editing * * This operation is used for mech creation or editing. */ -class SMESHGUI_MeshOp : public SMESHGUI_SelectionOp +class SMESHGUI_EXPORT SMESHGUI_MeshOp : public SMESHGUI_SelectionOp { Q_OBJECT - enum HypType{ Algo = 0, MainHyp, AddHyp }; - public: + + enum HypType{ Algo = 0, MainHyp, AddHyp, NbHypTypes }; + + typedef std::pair THypItem; + typedef QValueList< THypItem > THypList; + + typedef int THypType; + typedef QMap< THypType, THypList > TType2HypList; + + typedef int THypDim; + typedef QMap< THypDim, TType2HypList > TDim2Type2HypList; + SMESHGUI_MeshOp( const bool theToCreate, const bool theIsMesh = true ); virtual ~SMESHGUI_MeshOp(); - virtual SalomeApp_Dialog* dlg() const; + virtual LightApp_Dialog* dlg() const; protected: virtual void startOperation(); @@ -53,22 +84,39 @@ protected slots: void onCreateHyp( const int theHypType, const int theIndex ); void onEditHyp( const int theHypType, const int theIndex ); void onHypoSet( const QString& theSetName ); + void onGeomSelectionByMesh( bool ); + void onPublishShapeByMeshDlg(SUIT_Operation*); + void onCloseShapeByMeshDlg(SUIT_Operation*); + void onAlgoSelected( const int theIndex, + const int theDim = -1); private: + + typedef QValueList THypDataList; // typedef: list of hypothesis data + bool isValid( QString& ) const; - void availableHyps( const int theDim, - const int theHypType, - QStringList& theHyps ) const; - void existingHyps( const int theDim, - const int theHypType, + 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, - QValueList& theHypVars ); - + 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& ); bool editMeshOrSubMesh( QString& ); - + int currentHyp( const int, const int ) const; bool isAccessibleDim( const int ) const; void setCurrentHyp( const int, const int, const int ); @@ -77,19 +125,28 @@ private: void readMesh(); QString name( _PTR(SObject) ) const; int find( const SMESH::SMESH_Hypothesis_var&, - const QValueList& ) const; + const THypList& theHypList) const; + SMESH::SMESH_Hypothesis_var getInitParamsHypothesis( const QString& aHypType, + const QString& aServerLib ) const; + bool isSubshapeOk() const; + _PTR(SObject) getSubmeshByGeom() const; + void selectObject( _PTR(SObject) ) const; private: - typedef QMap< int, QValueList > IdToHypListMap; - typedef QMap< int, IdToHypListMap > DimToHypMap; - SMESHGUI_MeshDlg* myDlg; + SMESHGUI_ShapeByMeshOp* myShapeByMeshOp; bool myToCreate; bool myIsMesh; - - DimToHypMap myExistingHyps; //!< all hypothesis of SMESH module - DimToHypMap myObjHyps; //!< hypothesis assigned to the current + bool myIsOnGeometry; //!< TRUE if edited mesh accotiated with geometrical object + + 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]; + + bool myIgnoreAlgoSelection; }; #endif