X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESHGUI%2FSMESHGUI_MeshOp.cxx;h=1bf664dfd35217daae8274445f434ecd47a45a9b;hb=d0f366c4a3a66a71b0be94f7a6e2d146f80a94c4;hp=e001bea8eb89673236448ffb97fed305c25044fa;hpb=f87e54ae3a450f6adeee75d1b42c3b17e9c6250c;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index e001bea8e..1bf664dfd 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -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/ +// /** * SMESH SMESHGUI * @@ -12,6 +31,7 @@ #include "SMESHGUI_MeshOp.h" #include "SMESHGUI_MeshDlg.h" +#include "SMESHGUI_ShapeByMeshDlg.h" #include "SMESH_TypeFilter.hxx" #include "SMESHGUI.h" @@ -19,33 +39,49 @@ #include "SMESHGUI_Hypotheses.h" #include "SMESHGUI_Utils.h" #include "SMESHGUI_GEOMGenUtils.h" +#include "SMESHGUI_VTKUtils.h" -#include -#include +#include "SMESH_TypeFilter.hxx" +#include "SMESH_NumberFilter.hxx" -#include +#include "GEOM_SelectionFilter.h" +#include "GEOMBase.h" +#include "GeometryGUI.h" -#include -#include -#include -#include -#include +#include "SalomeApp_Tools.h" +#include "SALOMEDSClient_Study.hxx" +#include "SALOMEDSClient_AttributeIOR.hxx" +#include "SALOMEDSClient_AttributeName.hxx" +#include "SALOMEDS_SComponent.hxx" +#include "SALOMEDS_SObject.hxx" -#include -#include -#include -#include -#include +#include "LightApp_SelectionMgr.h" +#include "LightApp_UpdateFlags.h" +#include "SUIT_MessageBox.h" +#include "SUIT_Desktop.h" +#include "SUIT_OverrideCursor.h" +#include "SALOME_InteractiveObject.hxx" +#include "SALOME_ListIO.hxx" -#include +#include "utilities.h" #include #include -#include - -#define DEB_SLN - +#include +#include + +enum { GLOBAL_ALGO_TAG =3, + GLOBAL_HYPO_TAG =2, + LOCAL_ALGO_TAG =2, + LOCAL_HYPO_TAG =1, + SUBMESH_ON_EDGE_TAG =5, + SUBMESH_ON_WIRE_TAG =6, + SUBMESH_ON_FACE_TAG =7, + SUBMESH_ON_SHELL_TAG =8, + SUBMESH_ON_SOLID_TAG =9, + SUBMESH_ON_COMPOUND_TAG=10 }; + //================================================================================ /*! * \brief Constructor @@ -59,8 +95,11 @@ SMESHGUI_MeshOp::SMESHGUI_MeshOp( const bool theToCreate, const bool theIsMesh ) : SMESHGUI_SelectionOp(), myToCreate( theToCreate ), myIsMesh( theIsMesh ), - myDlg( 0 ) + myDlg( 0 ), + myShapeByMeshDlg( 0 ) { + if ( GeometryGUI::GetGeomGen()->_is_nil() )// check that GEOM_Gen exists + GeometryGUI::InitGeomGen(); } //================================================================================ @@ -70,17 +109,17 @@ SMESHGUI_MeshOp::SMESHGUI_MeshOp( const bool theToCreate, const bool theIsMesh ) //================================================================================ SMESHGUI_MeshOp::~SMESHGUI_MeshOp() { - if( myDlg ) + if ( myDlg ) delete myDlg; } //================================================================================ /*! * \brief Gets dialog of this operation - * \retval SalomeApp_Dialog* - pointer to dialog of this operation + * \retval LightApp_Dialog* - pointer to dialog of this operation */ //================================================================================ -SalomeApp_Dialog* SMESHGUI_MeshOp::dlg() const +LightApp_Dialog* SMESHGUI_MeshOp::dlg() const { return myDlg; } @@ -167,6 +206,8 @@ void SMESHGUI_MeshOp::startOperation() connect( myDlg->tab( i ), SIGNAL( editHyp( const int, const int ) ), this, SLOT( onEditHyp( const int, const int) ) ); } + connect( myDlg, SIGNAL( hypoSet( const QString& )), SLOT( onHypoSet( const QString& ))); + connect( myDlg, SIGNAL( geomSelectionByMesh( bool )), SLOT( onGeomSelectionByMesh( bool ))); } SMESHGUI_SelectionOp::startOperation(); @@ -195,6 +236,8 @@ void SMESHGUI_MeshOp::startOperation() else myDlg->activateObject( SMESHGUI_MeshDlg::Obj ); + myDlg->setHypoSets( SMESH::GetHypothesesSets() ); + selectionDone(); myDlg->setCurrentTab( SMESH::DIM_1D ); @@ -228,6 +271,105 @@ SUIT_SelectionFilter* SMESHGUI_MeshOp::createFilter( const int theId ) const return 0; } +//================================================================================ +/*! + * \brief check if selected shape is a subshape of the shape to mesh + * \retval bool - check result + */ +//================================================================================ + +bool SMESHGUI_MeshOp::isSubshapeOk() const +{ + if ( !myToCreate || myIsMesh ) // not submesh creation + return false; + + QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); + QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); + _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.latin1() ); + _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() ); + if ( pMesh && pGeom ) { + SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface( pMesh ); + if ( !mesh->_is_nil() ) { + GEOM::GEOM_Object_var mainGeom, subGeom; + mainGeom = mesh->GetShapeToMesh(); + subGeom = SMESH::SObjectToInterface( pGeom ); + if ( !mainGeom->_is_nil() && !subGeom->_is_nil() ) { + TopoDS_Shape mainShape, subShape; + if ( GEOMBase::GetShape( mainGeom, mainShape ) && + GEOMBase::GetShape( subGeom, subShape ) ) + { + int index = GEOMBase::GetIndex( subShape, mainShape, 0 ); + if ( index > 0 ) { + // 1 is index of mainShape itself + return index > 1; // it is a subshape + } + // is it a group? + GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen(); + _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + if ( !geomGen->_is_nil() && aStudy ) { + GEOM::GEOM_IGroupOperations_var op = + geomGen->GetIGroupOperations( aStudy->StudyId() ); + if ( ! op->_is_nil() ) { + GEOM::GEOM_Object_var mainObj = op->GetMainShape( subGeom ); + if ( !mainObj->_is_nil() ) + return ( string( mainObj->GetEntry() ) == string( mainGeom->GetEntry() )); + } + } + } + } + } + } + return false; +} + +//================================================================================ +/*! + * \brief find an existing submesh by the selected shape + * \retval _PTR(SObject) - the found submesh SObject + */ +//================================================================================ + +_PTR(SObject) SMESHGUI_MeshOp::getSubmeshByGeom() const +{ + QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); + QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); + _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.latin1() ); + _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() ); + if ( pMesh && pGeom ) { + GEOM::GEOM_Object_var geom = SMESH::SObjectToInterface( pGeom ); + if ( !geom->_is_nil() ) { + int tag = -1; + switch ( geom->GetShapeType() ) { + case GEOM::EDGE: tag = SUBMESH_ON_EDGE_TAG ; break; + case GEOM::WIRE: tag = SUBMESH_ON_WIRE_TAG ; break; + case GEOM::FACE: tag = SUBMESH_ON_FACE_TAG ; break; + case GEOM::SHELL: tag = SUBMESH_ON_SHELL_TAG ; break; + case GEOM::SOLID: tag = SUBMESH_ON_SOLID_TAG ; break; + case GEOM::COMPOUND: tag = SUBMESH_ON_COMPOUND_TAG; break; + default:; + } + _PTR(SObject) aSubmeshRoot; + _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + if ( pMesh->FindSubObject( tag, aSubmeshRoot ) ) + { + _PTR(ChildIterator) smIter = aStudy->NewChildIterator( aSubmeshRoot ); + for (; smIter->More(); smIter->Next() ) + { + _PTR(SObject) aSmObj = smIter->Value(); + _PTR(ChildIterator) anIter1 = aStudy->NewChildIterator(aSmObj); + for (; anIter1->More(); anIter1->Next()) { + _PTR(SObject) pGeom2 = anIter1->Value(); + if ( pGeom2->ReferencedObject( pGeom2 ) && + pGeom2->GetID() == pGeom->GetID() ) + return aSmObj; + } + } + } + } + } + return _PTR(SObject)(); +} + //================================================================================ /*! * \brief Updates dialog's look and feel @@ -237,11 +379,55 @@ SUIT_SelectionFilter* SMESHGUI_MeshOp::createFilter( const int theId ) const //================================================================================ void SMESHGUI_MeshOp::selectionDone() { + if ( myShapeByMeshDlg && myShapeByMeshDlg->isShown() ) + return; + SMESHGUI_SelectionOp::selectionDone(); - if ( !myToCreate ) + try { - try + // Enable tabs according to shape dimension + + int shapeDim = 3; + + GEOM::GEOM_Object_var aGeomVar; + QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); + _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() ); + if ( pGeom ) { + aGeomVar = GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() ); + } + else { + QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); + _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.latin1() ); + aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj ); + } + if ( !aGeomVar->_is_nil() ) { + shapeDim = 0; + switch ( aGeomVar->GetShapeType() ) { + case GEOM::SOLID: + case GEOM::SHELL: shapeDim = 3; break; + case GEOM::FACE: shapeDim = 2; break; + case GEOM::WIRE: + case GEOM::EDGE: shapeDim = 1; break; + case GEOM::VERTEX: shapeDim = 0; break; + default: + TopoDS_Shape aShape; + if ( GEOMBase::GetShape(aGeomVar, aShape)) { + TopExp_Explorer exp( aShape, TopAbs_SHELL ); + if ( exp.More() ) + shapeDim = 3; + else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() ) + shapeDim = 2; + else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() ) + shapeDim = 1; + else + shapeDim = 0; + } + } + } + myDlg->setMaxHypoDim( shapeDim ); + + if ( !myToCreate ) // edition: read hypotheses { QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.latin1() ); @@ -257,15 +443,51 @@ void SMESHGUI_MeshOp::selectionDone() } else myDlg->reset(); + } - catch ( const SALOME::SALOME_Exception& S_ex ) - { - SalomeApp_Tools::QtCatchCorbaException( S_ex ); - } - catch ( ... ) + else if ( !myIsMesh ) // submesh creation { + // if a submesh on the selected shape already exist, pass to submesh edition mode + if ( _PTR(SObject) pSubmesh = getSubmeshByGeom() ) { + SMESH::SMESH_subMesh_var sm = + SMESH::SObjectToInterface( pSubmesh ); + bool editSubmesh = ( !sm->_is_nil() && + SUIT_MessageBox::question2( myDlg, tr( "SMESH_WARNING" ), + tr( "EDIT_SUBMESH_QUESTION"), + tr( "SMESH_BUT_YES" ), + tr( "SMESH_BUT_NO" ), 1, 0, 0 )); + if ( editSubmesh ) + { + selectionMgr()->clearFilters(); + selectObject( pSubmesh ); + SMESHGUI::GetSMESHGUI()->switchToOperation(704); + return; + } + else + { + selectObject( _PTR(SObject)() ); + myDlg->selectObject( "", SMESHGUI_MeshDlg::Geom, "" ); + } + } + + // enable/disable popup for choice of geom selection way + bool enable = false; + QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); + if ( _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.latin1() )) { + SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface( pMesh ); + if ( !mesh->_is_nil() ) + enable = ( shapeDim > 1 ) && ( mesh->NbEdges() > 0 ); + } + myDlg->setGeomPopupEnabled( enable ); } } + catch ( const SALOME::SALOME_Exception& S_ex ) + { + SalomeApp_Tools::QtCatchCorbaException( S_ex ); + } + catch ( ... ) + { + } } //================================================================================ @@ -296,6 +518,20 @@ bool SMESHGUI_MeshOp::isValid( QString& theMess ) const return false; } + // Imported mesh, if create sub-mesh or edit mesh + if ( !myToCreate || ( myToCreate && !myIsMesh )) + { + QString aMeshEntry = myDlg->selectedObject + ( myToCreate ? SMESHGUI_MeshDlg::Mesh : SMESHGUI_MeshDlg::Obj ); + if ( _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.latin1() )) { + SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface( pMesh ); + if ( !mesh->_is_nil() && CORBA::is_nil( mesh->GetShapeToMesh() )) { + theMess = tr( "IMPORTED_MESH" ); + return false; + } + } + } + // Geom if ( myToCreate ) { @@ -327,8 +563,14 @@ bool SMESHGUI_MeshOp::isValid( QString& theMess ) const theMess = tr( "MESH_IS_NULL" ); return false; } + if ( !isSubshapeOk() ) + { + theMess = tr( "INVALID_SUBSHAPE" ); + return false; + } } } + return true; } @@ -393,9 +635,9 @@ void SMESHGUI_MeshOp::existingHyps( const int theDim, bool isMesh = !_CAST( SComponent, theFather ); int aPart = -1; if ( isMesh ) - aPart = theHypType == Algo ? 3 : 2; + aPart = theHypType == Algo ? GLOBAL_ALGO_TAG : GLOBAL_HYPO_TAG; else - aPart = theHypType == Algo ? 2 : 1; + aPart = theHypType == Algo ? LOCAL_ALGO_TAG : LOCAL_HYPO_TAG; if ( theFather->FindSubObject( aPart, aHypRoot ) ) { @@ -436,6 +678,66 @@ void SMESHGUI_MeshOp::existingHyps( const int theDim, } } +//================================================================================ +/*! + * \brief If create or edit a submesh, return a hypothesis holding parameters used + * to mesh a subshape + * \param aHypType - The hypothesis type name + * \param aServerLib - Server library name + * \param hypData - The structure holding the hypothesis type etc. + * \retval SMESH::SMESH_Hypothesis_var - the hypothesis holding parameter values + */ +//================================================================================ + +SMESH::SMESH_Hypothesis_var +SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType, + const QString& aServerLib ) const +{ + if ( aHypType.isEmpty() || aServerLib.isEmpty() ) + return SMESH::SMESH_Hypothesis::_nil(); + + const int nbColonsInMeshEntry = 3; + bool isSubMesh = myToCreate ? + !myIsMesh : + myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ).contains(':') > nbColonsInMeshEntry; + + if ( isSubMesh ) + { + // get mesh and geom object + SMESH::SMESH_Mesh_var aMeshVar = SMESH::SMESH_Mesh::_nil(); + GEOM::GEOM_Object_var aGeomVar = GEOM::GEOM_Object::_nil(); + + QString anEntry = myDlg->selectedObject + ( myToCreate ? SMESHGUI_MeshDlg::Mesh : SMESHGUI_MeshDlg::Obj ); + if ( _PTR(SObject) pObj = studyDS()->FindObjectID( anEntry.latin1() )) + { + CORBA::Object_ptr Obj = _CAST( SObject,pObj )->GetObject(); + if ( myToCreate ) // mesh and geom may be selected + { + aMeshVar = SMESH::SMESH_Mesh::_narrow( Obj ); + anEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); + if ( _PTR(SObject) pGeom = studyDS()->FindObjectID( anEntry.latin1() )) + aGeomVar= GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() ); + } + else // edition: sub-mesh may be selected + { + SMESH::SMESH_subMesh_var sm = SMESH::SMESH_subMesh::_narrow( Obj ); + if ( !sm->_is_nil() ) { + aMeshVar = sm->GetFather(); + aGeomVar = sm->GetSubShape(); + } + } + } + + if ( !aMeshVar->_is_nil() && !aGeomVar->_is_nil() ) + return SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType, + aServerLib, + aMeshVar, + aGeomVar ); + } + return SMESH::SMESH_Hypothesis::_nil(); +} + //================================================================================ /*! * \brief Calls plugin methods for hypothesis creation @@ -485,7 +787,22 @@ void SMESHGUI_MeshOp::onCreateHyp( const int theHypType, const int theIndex ) SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator( aHypTypeName ); // Create hypothesis - aCreator->CreateHypothesis( false, myDlg ); + if ( aCreator ) + { + // When create or edit a submesh, try to initialize a new hypothesis + // with values used to mesh a subshape + SMESH::SMESH_Hypothesis_var initParamHyp = + getInitParamsHypothesis( aHypTypeName, aData->ServerLibName ); + + if ( initParamHyp->_is_nil() ) + aCreator->create( false, myDlg ); + else + aCreator->create( initParamHyp, myDlg ); + } + else + { + SMESH::CreateHypothesis( aHypTypeName, aData->Label, false ); + } } QStringList aNewHyps; @@ -527,7 +844,104 @@ void SMESHGUI_MeshOp::onEditHyp( const int theHypType, const int theIndex ) char* aTypeName = aHyp->GetName(); SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator( aTypeName ); if ( aCreator ) - aCreator->EditHypothesis( aHyp ); + aCreator->edit( aHyp.in(), dlg() ); +} + +//================================================================================ +/*! + * \brief Creates and selects hypothesis of hypotheses set + * \param theSetName - The name of hypotheses set + */ +//================================================================================ + +void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName ) +{ + HypothesesSet* aHypoSet = SMESH::GetHypothesesSet( theSetName ); + if ( !aHypoSet ) return; + + for ( int aHypType = Algo; aHypType < AddHyp; aHypType++ ) + { + bool isAlgo = (aHypType == Algo); + + // clear all hyps + for ( int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++ ) + setCurrentHyp( dim, aHypType, -1 ); + + // set hyps from the set + + QStringList* aHypoList = isAlgo ? & aHypoSet->AlgoList : & aHypoSet->HypoList; + for ( int i = 0, n = aHypoList->count(); i < n; i++ ) + { + const QString& aHypoTypeName = (*aHypoList)[ i ]; + HypothesisData* aHypData = SMESH::GetHypothesisData( aHypoTypeName ); + if ( !aHypData ) + continue; + + int aDim = aHypData->Dim[0]; + // create or/and set + int index = -1; + if ( isAlgo ) + { + QStringList aHypTypeNameList = SMESH::GetAvailableHypotheses( isAlgo, aDim ); + index = aHypTypeNameList.findIndex( aHypoTypeName ); + if ( index < 0 ) continue; + setCurrentHyp ( aDim, aHypType, index ); + } + else + { + // try to find an existing hypo + QValueList & aList = myExistingHyps[ aDim ][ aHypType ]; + int /*iHyp = 0,*/ nbHyp = aList.count(); +// for ( ; iHyp < nbHyp; ++iHyp ) +// { +// SMESH::SMESH_Hypothesis_var aHyp = aList[ iHyp ]; +// if ( !aHyp->_is_nil() && aHypoTypeName == aHyp->GetName() ) { +// index = iHyp; +// break; +// } +// } + if ( index >= 0 ) // found + { + // select the found hypothesis + setCurrentHyp ( aDim, aHypType, index ); + } + else + { + // create a hypothesis + QString aClientLibName = aHypData->ClientLibName; + if ( aClientLibName == "" ) { + // Call hypothesis creation server method (without GUI) + SMESH::CreateHypothesis( aHypoTypeName, aHypData->Label, isAlgo ); + } + else { + // Get hypotheses creator client (GUI) + SMESHGUI_GenericHypothesisCreator* aCreator = + SMESH::GetHypothesisCreator( aHypoTypeName ); + if ( aCreator ) + { + // When create or edit a submesh, try to initialize a new hypothesis + // with values used to mesh a subshape + SMESH::SMESH_Hypothesis_var initParamHyp = + getInitParamsHypothesis( aHypoTypeName, aHypData->ServerLibName ); + aCreator->create( initParamHyp, myDlg ); + } + else + { + SMESH::CreateHypothesis( aHypoTypeName, aHypData->Label, isAlgo ); + } + } + QStringList aNewHyps; + _PTR(SComponent) aFather = SMESH::GetActiveStudyDocument()->FindComponent( "SMESH" ); + existingHyps( aDim, aHypType, aFather, aNewHyps, aList ); + if ( aList.count() > nbHyp ) + { + for ( int i = nbHyp; i < aNewHyps.count(); i++ ) + myDlg->tab( aDim )->addHyp( aHypType, aNewHyps[ i ] ); + } + } + } + } // loop on hypos in the set + } // loop on algo/hypo } //================================================================================ @@ -564,6 +978,8 @@ bool SMESHGUI_MeshOp::createMesh( QString& theMess ) for ( int aDim = SMESH::DIM_1D; aDim <= SMESH::DIM_3D; aDim++ ) { + if ( !isAccessibleDim( aDim )) continue; + // assign hypotheses for ( int aHypType = MainHyp; aHypType <= AddHyp; aHypType++ ) { @@ -620,6 +1036,8 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess ) for ( int aDim = SMESH::DIM_1D; aDim <= SMESH::DIM_3D; aDim++ ) { + if ( !isAccessibleDim( aDim )) continue; + // find or create algorithm SMESH::SMESH_Hypothesis_var anAlgoVar = getAlgo( aDim ); if ( !anAlgoVar->_is_nil() ) @@ -655,6 +1073,18 @@ int SMESHGUI_MeshOp::currentHyp( const int theDim, const int theHypType ) const return myDlg->tab( theDim )->currentHyp( theHypType ) - 1; } +//================================================================================ +/*! + * \brief Returns true if hypotheses of given dim can be assigned + * \param theDim - hypotheses dimension + * \retval bool - result + */ +//================================================================================ +bool SMESHGUI_MeshOp::isAccessibleDim( const int theDim) const +{ + return myDlg->tab( theDim )->isEnabled(); +} + //================================================================================ /*! * \brief Sets current hypothesis or algorithms @@ -740,7 +1170,7 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim ) SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator( aHypName ); if ( aCreator ) - aCreator->CreateHypothesis( true, myDlg ); + aCreator->create( true, myDlg ); } QStringList tmpList; _PTR(SComponent) aFather = SMESH::GetActiveStudyDocument()->FindComponent( "SMESH" ); @@ -924,6 +1354,8 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess ) // Assign new hypotheses and algorithms for ( int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++ ) { + if ( !isAccessibleDim( dim )) continue; + // find or create algorithm bool toDelete = false, toAdd = true; SMESH::SMESH_Hypothesis_var anAlgoVar = getAlgo( dim ); @@ -1013,7 +1445,7 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess ) * \param theOtherOp - other operation * \return Returns TRUE if the given operator is valid for this one, FALSE otherwise * -* Virtual method redefined from base class verifies whether given operator is valid for +* method redefined from base class verifies whether given operator is valid for * this one (i.e. can be started "above" this operator). In current implementation method * retuns false if theOtherOp operation is not intended for deleting objects or mesh * elements. @@ -1023,3 +1455,103 @@ bool SMESHGUI_MeshOp::isValid( SUIT_Operation* theOp ) const { return SMESHGUI_Operation::isValid( theOp ) && !theOp->inherits( "SMESHGUI_MeshOp" ); } + +//================================================================================ +/*! + * \brief SLOT. Is called when the user selects a way of geometry selection + * \param theByMesh - true if the user wants to find geometry by mesh element + */ +//================================================================================ + +void SMESHGUI_MeshOp::onGeomSelectionByMesh( bool theByMesh ) +{ + if ( theByMesh ) { + if ( !myShapeByMeshDlg ) { + myShapeByMeshDlg = new SMESHGUI_ShapeByMeshDlg( SMESHGUI::GetSMESHGUI(), "ShapeByMeshDlg"); + connect(myShapeByMeshDlg, SIGNAL(PublishShape()), SLOT(onPublishShapeByMeshDlg())); + connect(myShapeByMeshDlg, SIGNAL(Close()), SLOT(onCloseShapeByMeshDlg())); + } + // set mesh object to dlg + QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); + if ( _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.latin1() )) { + SMESH::SMESH_Mesh_var aMeshVar = + SMESH::SMESH_Mesh::_narrow( _CAST( SObject,pMesh )->GetObject() ); + if ( !aMeshVar->_is_nil() ) { + myDlg->hide(); + myDlg->activateObject( SMESHGUI_MeshDlg::Mesh ); + myShapeByMeshDlg->Init(); + myShapeByMeshDlg->SetMesh( aMeshVar ); + myShapeByMeshDlg->show(); + } + } + } +} + +//================================================================================ +/*! + * \brief SLOT. Is called when Ok is pressed in SMESHGUI_ShapeByMeshDlg + */ +//================================================================================ + +void SMESHGUI_MeshOp::onPublishShapeByMeshDlg() +{ + if ( myShapeByMeshDlg ) { + // Select a found geometry object + GEOM::GEOM_Object_var aGeomVar = myShapeByMeshDlg->GetShape(); + if ( !aGeomVar->_is_nil() ) + { + QString ID = aGeomVar->GetStudyEntry(); + if ( _PTR(SObject) aGeomSO = studyDS()->FindObjectID( ID )) { + SMESH::SMESH_Mesh_ptr aMeshPtr = myShapeByMeshDlg->GetMesh(); + if ( !CORBA::is_nil( aMeshPtr )) { + if (_PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshPtr )) { + myDlg->activateObject( SMESHGUI_MeshDlg::Mesh ); + myDlg->selectObject( aMeshSO->GetName(), SMESHGUI_MeshDlg::Mesh, aMeshSO->GetID() ); + } + } + myDlg->activateObject( SMESHGUI_MeshDlg::Geom ); + selectObject( aGeomSO ); + //selectionDone(); + } + } + else { + onCloseShapeByMeshDlg(); + } + } + myDlg->show(); +} + +//================================================================================ +/*! + * \brief SLOT. Is called when Close is pressed in SMESHGUI_ShapeByMeshDlg + */ +//================================================================================ + +void SMESHGUI_MeshOp::onCloseShapeByMeshDlg() +{ + if ( myDlg ) { + myDlg->show(); + myDlg->activateObject( SMESHGUI_MeshDlg::Geom ); + myDlg->selectObject( "", SMESHGUI_MeshDlg::Geom, "" ); + } +} + +//================================================================================ +/*! + * \brief Selects a SObject + * \param theSObj - the SObject to select + */ +//================================================================================ + +void SMESHGUI_MeshOp::selectObject( _PTR(SObject) theSObj ) const +{ + if ( LightApp_SelectionMgr* sm = selectionMgr() ) { + SALOME_ListIO anIOList; + if ( theSObj ) { + Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject + ( theSObj->GetID().c_str(), "SMESH", theSObj->GetName().c_str() ); + anIOList.Append( anIO ); + } + sm->setSelectedObjects( anIOList, false ); + } +}