X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshOp.cxx;h=cb6efcb78ff64343ce12e6cfa97f83f62356bc76;hp=9ad1a47fc5ae4d4a5ae928f3d6d315ce80107e92;hb=fad0945128baf5e8d6642d9805727269db28c4cd;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6 diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index 9ad1a47fc..cb6efcb78 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 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 @@ -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 -// 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 @@ -26,20 +26,22 @@ #include "SMESHGUI_MeshOp.h" #include "SMESHGUI.h" +#include "SMESHGUI_GEOMGenUtils.h" +#include "SMESHGUI_Hypotheses.h" +#include "SMESHGUI_HypothesesUtils.h" #include "SMESHGUI_MeshDlg.h" +#include "SMESHGUI_Operations.h" #include "SMESHGUI_ShapeByMeshDlg.h" -#include "SMESHGUI_HypothesesUtils.h" -#include "SMESHGUI_Hypotheses.h" #include "SMESHGUI_Utils.h" -#include "SMESHGUI_GEOMGenUtils.h" - -#include -#include +#include "SMESH_NumberFilter.hxx" +#include "SMESH_TypeFilter.hxx" // SALOME GEOM includes #include #include #include +#include +#include // SALOME GUI includes #include @@ -56,10 +58,13 @@ // SALOME KERNEL includes #include #include +#include +#include // Qt includes #include #include +#include // OCCT includes #include @@ -68,14 +73,6 @@ #include #include -// IDL includes -#include -#include CORBA_CLIENT_HEADER(SMESH_Gen) - -//To disable automatic genericobj management, the following line should be commented. -//Otherwise, it should be uncommented. Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx -#define WITHGENERICOBJ - //================================================================================ /*! * \brief Constructor @@ -87,15 +84,16 @@ //================================================================================ SMESHGUI_MeshOp::SMESHGUI_MeshOp( const bool theToCreate, const bool theIsMesh ) : SMESHGUI_SelectionOp(), - myToCreate( theToCreate ), - myIsMesh( theIsMesh ), myDlg( 0 ), myShapeByMeshOp( 0 ), - myHypoSet( 0 ) + myToCreate( theToCreate ), + myIsMesh( theIsMesh ), + myIsInvalidSubMesh( false ) { if ( GeometryGUI::GetGeomGen()->_is_nil() )// check that GEOM_Gen exists GeometryGUI::InitGeomGen(); myIsOnGeometry = true; + myMaxShapeDim = -1; } //================================================================================ @@ -131,7 +129,7 @@ LightApp_Dialog* SMESHGUI_MeshOp::dlg() const //================================================================================ bool SMESHGUI_MeshOp::onApply() { - if (isStudyLocked()) + if (SMESHGUI::isStudyLocked()) return false; QString aMess; @@ -150,7 +148,7 @@ bool SMESHGUI_MeshOp::onApply() QStringList anEntryList; if ( myToCreate && myIsMesh ) aResult = createMesh( aMess, anEntryList ); - if ( myToCreate && !myIsMesh ) + if (( myToCreate && !myIsMesh ) || myIsInvalidSubMesh ) aResult = createSubMesh( aMess, anEntryList ); else if ( !myToCreate ) aResult = editMeshOrSubMesh( aMess ); @@ -198,44 +196,47 @@ bool SMESHGUI_MeshOp::onApply() //================================================================================ void SMESHGUI_MeshOp::startOperation() { + myIgnoreAlgoSelection = false; + if (!myDlg) { myDlg = new SMESHGUI_MeshDlg( myToCreate, myIsMesh ); for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ ) { connect( myDlg->tab( i ), SIGNAL( createHyp( const int, const int ) ), - this, SLOT( onCreateHyp( const int, const int ) ) ); + this, SLOT( onCreateHyp( const int, const int ) ) ); connect( myDlg->tab( i ), SIGNAL( editHyp( const int, const int ) ), - this, SLOT( onEditHyp( const int, const int ) ) ); + this, SLOT( onEditHyp( const int, const int ) ) ); connect( myDlg->tab( i ), SIGNAL( selectAlgo( const int ) ), - this, SLOT( onAlgoSelected( const int ) ) ); + this, SLOT( onAlgoSelected( const int ) ) ); } connect( myDlg, SIGNAL( hypoSet( const QString& )), SLOT( onHypoSet( const QString& ))); connect( myDlg, SIGNAL( geomSelectionByMesh( bool )), SLOT( onGeomSelectionByMesh( bool ))); + connect( myDlg, SIGNAL( selectMeshType( const int, const int ) ), SLOT( onAlgoSetByMeshType( const int, const int))); - if ( myToCreate ) - if ( myIsMesh ) myHelpFileName = "constructing_meshes_page.html"; - else myHelpFileName = "constructing_submeshes_page.html"; - else myHelpFileName = "editing_meshes_page.html"; + if ( myToCreate ) { + if ( myIsMesh ) myHelpFileName = "constructing_meshes.html"; + else myHelpFileName = "constructing_submeshes.html"; + } + else { + myHelpFileName = "editing_meshes.html"; + } } SMESHGUI_SelectionOp::startOperation(); - // iterate through dimensions and get available algoritms, set them to the dialog - _PTR(SComponent) aFather = SMESH::GetActiveStudyDocument()->FindComponent( "SMESH" ); + // clear available hypotheses + QStringList hypList; for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ ) { SMESHGUI_MeshTab* aTab = myDlg->tab( i ); - QStringList hypList; - // clear available hypotheses + // set algos + aTab->setAvailableHyps( Algo, hypList ); aTab->setAvailableHyps( MainHyp, hypList ); aTab->setAvailableHyps( AddHyp, hypList ); aTab->setExistingHyps( MainHyp, hypList ); aTab->setExistingHyps( AddHyp, hypList ); myExistingHyps[ i ][ MainHyp ].clear(); myExistingHyps[ i ][ AddHyp ].clear(); - // set algos - availableHyps( i, Algo, hypList, myAvailableHypData[i][Algo] ); - aTab->setAvailableHyps( Algo, hypList ); } if ( myToCreate ) { @@ -243,15 +244,20 @@ void SMESHGUI_MeshOp::startOperation() myDlg->activateObject( myIsMesh ? SMESHGUI_MeshDlg::Geom : SMESHGUI_MeshDlg::Mesh ); } else + { myDlg->activateObject( SMESHGUI_MeshDlg::Obj ); + } + + updateMeshTypeList(); + myDlg->setCurrentMeshType( MT_ANY ); myDlg->setCurrentTab( SMESH::DIM_3D ); - myDlg->show(); myDlg->setGeomPopupEnabled(false); - selectionDone(); + myDlg->show(); - myIgnoreAlgoSelection = false; + selectionDone(); + myHasConcurrentSubBefore = false; myObjectToSelect.clear(); } @@ -259,7 +265,7 @@ void SMESHGUI_MeshOp::startOperation() /*! * \brief Selects a recently created mesh or sub-mesh if necessary * - * Virtual method redefined from base class called when operation is commited + * Virtual method redefined from base class called when operation is committed * selects a recently created mesh or sub-mesh if necessary. Allows to perform * selection when the custom selection filters are removed. */ @@ -297,9 +303,9 @@ SUIT_SelectionFilter* SMESHGUI_MeshOp::createFilter( const int theId ) const return new GEOM_SelectionFilter( (SalomeApp_Study*)study(), true ); } else if ( theId == SMESHGUI_MeshDlg::Obj && !myToCreate ) - return new SMESH_TypeFilter( MESHorSUBMESH ); + return new SMESH_TypeFilter( SMESH::MESHorSUBMESH ); else if ( theId == SMESHGUI_MeshDlg::Mesh ) - return new SMESH_TypeFilter( MESH ); + return new SMESH_TypeFilter( SMESH::MESH ); else return 0; } @@ -317,7 +323,7 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const // mesh QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); - _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() ); + _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( aMeshEntry.toUtf8().data() ); if (!pMesh) return false; SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface( pMesh ); @@ -333,18 +339,16 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const if (aGEOMs.count() > 0) { GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen(); - _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); - if (geomGen->_is_nil() || !aStudy) return false; + if (geomGen->_is_nil()) return false; - GEOM::GEOM_IGroupOperations_var op = - geomGen->GetIGroupOperations(aStudy->StudyId()); + GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations(); if (op->_is_nil()) return false; // check all selected shapes QStringList::const_iterator aSubShapesIter = aGEOMs.begin(); for ( ; aSubShapesIter != aGEOMs.end(); aSubShapesIter++) { QString aSubGeomEntry = (*aSubShapesIter); - _PTR(SObject) pSubGeom = studyDS()->FindObjectID(aSubGeomEntry.toLatin1().data()); + _PTR(SObject) pSubGeom = SMESH::getStudy()->FindObjectID(aSubGeomEntry.toUtf8().data()); if (!pSubGeom) return false; GEOM::GEOM_Object_var aSubGeomVar = @@ -352,18 +356,42 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const if (aSubGeomVar->_is_nil()) return false; // skl for NPAL14695 - implementation of searching of mainObj - GEOM::GEOM_Object_var mainObj = op->GetMainShape(aSubGeomVar); - //if (mainObj->_is_nil() || - // string(mainObj->GetEntry()) != string(mainGeom->GetEntry())) return false; - while(1) { - if (mainObj->_is_nil()) - return false; - if (std::string(mainObj->GetEntry()) == std::string(mainGeom->GetEntry())) + GEOM::GEOM_Object_var mainObj = op->GetMainShape(aSubGeomVar); /* _var not _wrap as + mainObj already exists! */ + while( !mainObj->_is_nil()) { + CORBA::String_var entry1 = mainObj->GetEntry(); + CORBA::String_var entry2 = mainGeom->GetEntry(); + if (std::string( entry1.in() ) == entry2.in() ) return true; mainObj = op->GetMainShape(mainObj); } + if ( aSubGeomVar->GetShapeType() == GEOM::COMPOUND ) + { + // is aSubGeomVar a compound of sub-shapes? + GEOM::GEOM_IShapesOperations_wrap sop = geomGen->GetIShapesOperations(); + if (sop->_is_nil()) return false; + GEOM::ListOfLong_var ids = sop->GetAllSubShapesIDs( aSubGeomVar, + GEOM::SHAPE,/*sorted=*/false); + if ( ids->length() > 0 ) + { + ids->length( 1 ); + GEOM::GEOM_Object_var compSub = geomGen->AddSubShape( aSubGeomVar, ids ); + if ( !compSub->_is_nil() ) + { + GEOM::ListOfGO_var shared = sop->GetSharedShapes( mainGeom, + compSub, + compSub->GetShapeType() ); + geomGen->RemoveObject( compSub ); + compSub->UnRegister(); + if ( shared->length() > 0 ) { + geomGen->RemoveObject( shared[0] ); + shared[0]->UnRegister(); + } + return ( shared->length() > 0 ); + } + } + } } - //return true; } return false; @@ -371,8 +399,8 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const //================================================================================ /*! - * \brief Return name of the algorithm that does not support submeshes and makes - * submesh creation useless + * \brief Return name of the algorithm that does not support sub-meshes and makes + * sub-mesh creation useless * \retval char* - string is to be deleted!!! */ //================================================================================ @@ -382,34 +410,36 @@ char* SMESHGUI_MeshOp::isSubmeshIgnored() const QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() ); + _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( aMeshEntry.toUtf8().data() ); if ( pMesh ) { QStringList algoNames; THypList algoList; existingHyps(3, Algo, pMesh, algoNames, algoList); if (!algoList.empty()) { - HypothesisData* algo = SMESH::GetHypothesisData( algoList[0].first->GetName() ); + HypothesisData* algo = + SMESH::GetHypothesisData( SMESH::toQStr( algoList[0].first->GetName() )); if ( algo && algo->InputTypes.empty() && // builds all dimensions it-self !algo->IsSupportSubmeshes ) - return CORBA::string_dup( algoNames[0].toLatin1().data() ); + return CORBA::string_dup( algoNames[0].toUtf8().data() ); } // GEOM::GEOM_Object_var geom; -// if (_PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.toLatin1().data() )) +// if (_PTR(SObject) pGeom = SMESH::getStudy()->FindObjectID( aGeomEntry.toUtf8().data() )) // geom = SMESH::SObjectToInterface( pGeom ); // if ( !geom->_is_nil() && geom->GetShapeType() >= GEOM::FACE ) { // WIRE, EDGE as well existingHyps(2, Algo, pMesh, algoNames, algoList); if (!algoList.empty()) { - HypothesisData* algo = SMESH::GetHypothesisData( algoList[0].first->GetName() ); + HypothesisData* algo = + SMESH::GetHypothesisData( SMESH::toQStr( algoList[0].first->GetName() )); if ( algo && algo->InputTypes.empty() && // builds all dimensions it-self !algo->IsSupportSubmeshes ) - return CORBA::string_dup( algoNames[0].toLatin1().data() ); + return CORBA::string_dup( algoNames[0].toUtf8().data() ); } -// } + // } } } return 0; @@ -423,42 +453,37 @@ char* SMESHGUI_MeshOp::isSubmeshIgnored() const //================================================================================ _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.toLatin1().data() ); - _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.toLatin1().data() ); - if ( pMesh && pGeom ) { - GEOM::GEOM_Object_var geom = SMESH::SObjectToInterface( pGeom ); - if ( !geom->_is_nil() ) { - int tag = -1; - switch ( geom->GetShapeType() ) { - case GEOM::VERTEX: tag = SMESH::Tag_SubMeshOnVertex; break; - case GEOM::EDGE: tag = SMESH::Tag_SubMeshOnEdge; break; - case GEOM::WIRE: tag = SMESH::Tag_SubMeshOnWire; break; - case GEOM::FACE: tag = SMESH::Tag_SubMeshOnFace; break; - case GEOM::SHELL: tag = SMESH::Tag_SubMeshOnShell; break; - case GEOM::SOLID: tag = SMESH::Tag_SubMeshOnSolid; break; - case GEOM::COMPOUND: tag = SMESH::Tag_SubMeshOnCompound; break; - default:; - } - _PTR(GenericAttribute) anAttr; - _PTR(SObject) aSubmeshRoot; - _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); - if ( pMesh->FindSubObject( tag, aSubmeshRoot ) ) + QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); + _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( aMeshEntry.toUtf8().data() ); + if ( pMesh && !myGeom->_is_nil() ) { + int tag = -1; + switch ( myGeom->GetShapeType() ) { + case GEOM::VERTEX: tag = SMESH::Tag_SubMeshOnVertex; break; + case GEOM::EDGE: tag = SMESH::Tag_SubMeshOnEdge; break; + case GEOM::WIRE: tag = SMESH::Tag_SubMeshOnWire; break; + case GEOM::FACE: tag = SMESH::Tag_SubMeshOnFace; break; + case GEOM::SHELL: tag = SMESH::Tag_SubMeshOnShell; break; + case GEOM::SOLID: tag = SMESH::Tag_SubMeshOnSolid; break; + case GEOM::COMPOUND: tag = SMESH::Tag_SubMeshOnCompound; break; + default:; + } + _PTR(GenericAttribute) anAttr; + _PTR(SObject) aSubmeshRoot; + _PTR(Study) aStudy = SMESH::getStudy(); + if ( pMesh->FindSubObject( tag, aSubmeshRoot ) ) + { + _PTR(ChildIterator) smIter = aStudy->NewChildIterator( aSubmeshRoot ); + for ( ; smIter->More(); smIter->Next() ) { - _PTR(ChildIterator) smIter = aStudy->NewChildIterator( aSubmeshRoot ); - for ( ; smIter->More(); smIter->Next() ) - { - _PTR(SObject) aSmObj = smIter->Value(); - if ( ! aSmObj->FindAttribute( anAttr, "AttributeIOR" )) - continue; - _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; - } + _PTR(SObject) aSmObj = smIter->Value(); + if ( ! aSmObj->FindAttribute( anAttr, "AttributeIOR" )) + continue; + _PTR(ChildIterator) anIter1 = aStudy->NewChildIterator(aSmObj); + for ( ; anIter1->More(); anIter1->Next()) { + _PTR(SObject) pGeom2 = anIter1->Value(); + if ( pGeom2->ReferencedObject( pGeom2 ) && + myGeomEntry == pGeom2->GetID().c_str() ) + return aSmObj; } } } @@ -480,203 +505,130 @@ void SMESHGUI_MeshOp::selectionDone() SMESHGUI_SelectionOp::selectionDone(); + myGeomEntry.clear(); + myGeom = GEOM::GEOM_Object::_nil(); + myIsInvalidSubMesh = false; + myIsOnGeometry = true; + try { - myIsOnGeometry = true; - - //Check geometry for mesh - QString anObjEntry = myDlg->selectedObject(SMESHGUI_MeshDlg::Obj); - _PTR(SObject) pObj = studyDS()->FindObjectID(anObjEntry.toLatin1().data()); - if (pObj) + // allow selecting multiple geom objects only for sub-mesh creation + QStringList aGEOMs; + myDlg->selectedObject( SMESHGUI_MeshDlg::Geom, aGEOMs ); + int nbGeoms = aGEOMs.count(); + if ( nbGeoms > 0 ) { - SMESH::SMESH_Mesh_var aMeshVar = - SMESH::SMESH_Mesh::_narrow(_CAST(SObject,pObj)->GetObject()); - if (!aMeshVar->_is_nil()) { - if (!myToCreate && !aMeshVar->HasShapeToMesh()) - myIsOnGeometry = false; + myGeomEntry = aGEOMs[0]; + _PTR(SObject) pGeom = SMESH::getStudy()->FindObjectID( myGeomEntry.toUtf8().data() ); + if ( nbGeoms > 1 && myToCreate && myIsMesh ) + { + selectObject( pGeom ); + selectionDone(); + return; } + myGeom = SMESH::SObjectToInterface< GEOM::GEOM_Object >( pGeom ); // creation case } - if (myIsOnGeometry) - { - // Enable tabs according to shape dimension - - int shapeDim = 3; + QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); + _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.toUtf8().data() ); - QStringList aGEOMs; - myDlg->selectedObject(SMESHGUI_MeshDlg::Geom, aGEOMs); - GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; + SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface< SMESH::SMESH_Mesh >( pObj ); + SMESH::SMESH_subMesh_var subMesh; - if (aGEOMs.count() > 0) { - // one or more GEOM shape selected - aSeq->length(aGEOMs.count()); - QStringList::const_iterator aSubShapesIter = aGEOMs.begin(); - int iSubSh = 0; - for ( ; aSubShapesIter != aGEOMs.end(); aSubShapesIter++, iSubSh++) { - QString aSubGeomEntry = (*aSubShapesIter); - _PTR(SObject) pSubGeom = studyDS()->FindObjectID(aSubGeomEntry.toLatin1().data()); - GEOM::GEOM_Object_var aSubGeomVar = - GEOM::GEOM_Object::_narrow(_CAST(SObject,pSubGeom)->GetObject()); - aSeq[iSubSh] = aSubGeomVar; - } - } else { - // get geometry by selected sub-mesh - QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); - _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); - GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj ); - if (!aGeomVar->_is_nil()) { - aSeq->length(1); - aSeq[0] = aGeomVar; + if ( !myToCreate ) // edition: read hypotheses + { + if ( pObj ) + { + subMesh = SMESH::SObjectToInterface< SMESH::SMESH_subMesh >( pObj ); + myIsMesh = subMesh->_is_nil(); + myGeom = SMESH::GetShapeOnMeshOrSubMesh( pObj ); + myIsInvalidSubMesh = ( !myIsMesh && subMesh->GetId() < 1 ); + if ( !mesh->_is_nil() && !mesh->HasShapeToMesh() ) + { + myIsOnGeometry = false; + myGeom = GEOM::GEOM_Object::_nil(); } - } - - if (aSeq->length() > 0) { - shapeDim = -1; - for (int iss = 0; iss < aSeq->length() && shapeDim < 3; iss++) { - GEOM::GEOM_Object_var aGeomVar = aSeq[iss]; - switch ( aGeomVar->GetShapeType() ) { - case GEOM::SOLID: shapeDim = 3; break; - case GEOM::SHELL: - // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab - // { - // TopoDS_Shape aShape; - // bool isClosed = GEOMBase::GetShape(aGeomVar, aShape) && /*aShape.Closed()*/BRep_Tool::IsClosed(aShape); - // shapeDim = qMax(isClosed ? 3 : 2, shapeDim); - // } - // break; - case GEOM::FACE: shapeDim = qMax(2, shapeDim); break; - case GEOM::WIRE: - case GEOM::EDGE: shapeDim = qMax(1, shapeDim); break; - case GEOM::VERTEX: shapeDim = qMax(0, shapeDim); break; - default: - { - TopoDS_Shape aShape; - if (GEOMBase::GetShape(aGeomVar, aShape)) - { - TopExp_Explorer exp (aShape, TopAbs_SOLID); - if (exp.More()) { - shapeDim = 3; - } - // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab - // else if ( exp.Init( aShape, TopAbs_SHELL ), exp.More() ) - // { - // shapeDim = 2; - // for (; exp.More() && shapeDim == 2; exp.Next()) { - // if (/*exp.Current().Closed()*/BRep_Tool::IsClosed(exp.Current())) - // shapeDim = 3; - // } - // } - else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() ) - shapeDim = qMax(2, shapeDim); - else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() ) - shapeDim = qMax(1, shapeDim); - else if ( exp.Init( aShape, TopAbs_VERTEX ), exp.More() ) - shapeDim = qMax(0, shapeDim); - } - } - } - if ( shapeDim == 3 ) - break; + if ( !myGeom->_is_nil() ) + myGeomEntry = myGeom->GetStudyEntry(); + + myDlg->setTitile( myToCreate, myIsMesh ); + myDlg->setObjectShown( SMESHGUI_MeshDlg::Mesh, !subMesh->_is_nil() ); + myDlg->setObjectShown( SMESHGUI_MeshDlg::Geom, !myGeom->_is_nil() ); + myDlg->objectWg( SMESHGUI_MeshDlg::Mesh, SMESHGUI_MeshDlg::Btn )->hide(); + if ( myIsInvalidSubMesh ) + { + // it is necessary to select a new geometry + myDlg->objectWg( SMESHGUI_MeshDlg::Geom, SMESHGUI_MeshDlg::Btn )->show(); + myDlg->activateObject( SMESHGUI_MeshDlg::Geom ); } - } - for (int i = SMESH::DIM_3D; i > shapeDim; i--) { - // reset algos before disabling tabs (0020138) - onAlgoSelected(-1, i); - } - myDlg->setMaxHypoDim( shapeDim ); - myDlg->setHypoSets( SMESH::GetHypothesesSets( shapeDim )); - - if (!myToCreate) // edition: read hypotheses - { - if (pObj != 0) + else { - SMESH::SMESH_subMesh_var aVar = - SMESH::SMESH_subMesh::_narrow( _CAST( SObject,pObj )->GetObject() ); - myDlg->setObjectShown( SMESHGUI_MeshDlg::Mesh, !aVar->_is_nil() ); - myDlg->setObjectShown( SMESHGUI_MeshDlg::Geom, true ); - myDlg->objectWg( SMESHGUI_MeshDlg::Mesh, SMESHGUI_MeshDlg::Btn )->hide(); myDlg->objectWg( SMESHGUI_MeshDlg::Geom, SMESHGUI_MeshDlg::Btn )->hide(); - myDlg->updateGeometry(); - myDlg->adjustSize(); - readMesh(); } - else - myDlg->reset(); + myDlg->updateGeometry(); + myDlg->adjustSize(); + readMesh(); } - 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::question( myDlg, tr( "SMESH_WARNING" ), - tr( "EDIT_SUBMESH_QUESTION"), - SUIT_MessageBox::Yes | - SUIT_MessageBox::No, - SUIT_MessageBox::No ) - == SUIT_MessageBox::Yes ); - if ( editSubmesh ) - { - selectionMgr()->clearFilters(); - selectObject( pSubmesh ); - SMESHGUI::GetSMESHGUI()->switchToOperation(704); - return; - } - else - { - myDlg->selectObject( "", SMESHGUI_MeshDlg::Geom, "" ); - selectObject( _PTR(SObject)() ); - selectionDone(); - return; - } + else + myDlg->reset(); + } + else if ( !myIsMesh ) // sub-mesh creation + { + // if a submesh on the selected shape already exist, pass to submesh edition mode + if ( _PTR(SObject) pSubmesh = getSubmeshByGeom() ) { + subMesh = SMESH::SObjectToInterface( pSubmesh ); + bool editSubmesh = ( !subMesh->_is_nil() && + SUIT_MessageBox::question( myDlg, tr( "SMESH_WARNING" ), + tr( "EDIT_SUBMESH_QUESTION"), + SUIT_MessageBox::Yes | + SUIT_MessageBox::No, + SUIT_MessageBox::No ) + == SUIT_MessageBox::Yes ); + if ( editSubmesh ) + { + selectionMgr()->clearFilters(); + selectObject( pSubmesh ); + SMESHGUI::GetSMESHGUI()->switchToOperation( SMESHOp::OpEditMeshOrSubMesh ); + return; } - // discard selected mesh if submesh creation not allowed because of - // a global algorithm that does not support submeshes - if ( char* algoName = isSubmeshIgnored() ) { - SUIT_MessageBox::warning( myDlg, tr( "SMESH_ERROR" ), - tr("SUBMESH_NOT_ALLOWED").arg(algoName)); - CORBA::string_free( algoName ); - myDlg->selectObject( "", SMESHGUI_MeshDlg::Mesh, "" ); + else + { + myDlg->selectObject( "", SMESHGUI_MeshDlg::Geom, "" ); selectObject( _PTR(SObject)() ); selectionDone(); return; } - - // 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.toLatin1().data() )) { - SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface( pMesh ); - if ( !mesh->_is_nil() ) { - //rnv: issue 21056: EDF 1608 SMESH: Dialog Box "Create Sub Mesh": focus should automatically switch to geometry - QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.toLatin1().data() ); - if ( !pGeom || GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() )->_is_nil() ) - myDlg->activateObject(SMESHGUI_MeshDlg::Geom); - enable = ( shapeDim > 1 ) && ( mesh->NbEdges() > 0 ); - } - } - myDlg->setGeomPopupEnabled( enable ); } - } - else { // no geometry defined - myDlg->enableTab( SMESH::DIM_3D ); - QStringList hypList; - availableHyps( SMESH::DIM_3D, Algo, hypList, - myAvailableHypData[SMESH::DIM_3D][Algo]); - - SMESHGUI_MeshTab* aTab = myDlg->tab( SMESH::DIM_3D ); - aTab->setAvailableHyps( Algo, hypList ); - for (int i = SMESH::DIM_0D;i < SMESH::DIM_3D; ++i) { - myDlg->disableTab(i); + // discard selected mesh if submesh creation not allowed because of + // a global algorithm that does not support submeshes + if ( char* algoName = isSubmeshIgnored() ) { + SUIT_MessageBox::warning( myDlg, tr( "SMESH_ERROR" ), + tr("SUBMESH_NOT_ALLOWED").arg(algoName)); + CORBA::string_free( algoName ); + myDlg->selectObject( "", SMESHGUI_MeshDlg::Mesh, "" ); + selectObject( _PTR(SObject)() ); + selectionDone(); + return; + } + + // enable/disable popup for choice of geom selection way + bool enable = false; + QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); + if ( _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( aMeshEntry.toLatin1().data() )) + { + mesh = SMESH::SObjectToInterface( pMesh ); + if ( !mesh->_is_nil() ) + enable = /*( shapeDim > 1 ) && */( mesh->NbEdges() > 0 ); } - //Hide labels and fields (Mesh ang Geometry) - myDlg->setObjectShown( SMESHGUI_MeshDlg::Mesh, false ); - myDlg->setObjectShown( SMESHGUI_MeshDlg::Geom, false ); - myDlg->adjustSize(); - readMesh(); + myDlg->setGeomPopupEnabled( enable ); + + //rnv: issue 21056: "Create Sub Mesh": focus should automatically switch to geometry + if ( pObj && myGeomEntry.isEmpty() ) + myDlg->activateObject( SMESHGUI_MeshDlg::Geom ); } + + setFilteredAlgoData(); + } catch ( const SALOME::SALOME_Exception& S_ex ) { @@ -719,7 +671,7 @@ bool SMESHGUI_MeshOp::isValid( QString& theMess ) const { QString aMeshEntry = myDlg->selectedObject ( myToCreate ? SMESHGUI_MeshDlg::Mesh : SMESHGUI_MeshDlg::Obj ); - if ( _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() )) { + if ( _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( aMeshEntry.toUtf8().data() )) { SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface( pMesh ); if ( !mesh->_is_nil() && CORBA::is_nil( mesh->GetShapeToMesh() )) { theMess = tr( "IMPORTED_MESH" ); @@ -729,15 +681,26 @@ bool SMESHGUI_MeshOp::isValid( QString& theMess ) const }*/ // Geom - if ( myToCreate ) + if ( myToCreate || myIsInvalidSubMesh ) { QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - if ( aGeomEntry == "" ) + if ( aGeomEntry.isEmpty() ) { - theMess = tr( "GEOMETRY_OBJECT_IS_NOT_DEFINED" ); - return false; + theMess = tr( myIsMesh ? + "GEOMETRY_OBJECT_IS_NOT_DEFINED_MESH" : + "GEOMETRY_OBJECT_IS_NOT_DEFINED_SUBMESH"); + if ( !myIsMesh ) + return false; + dlg()->show(); + if ( SUIT_MessageBox::warning( myDlg, tr( "SMESH_WRN_WARNING" ), theMess, + SUIT_MessageBox::Yes, SUIT_MessageBox::No ) == SUIT_MessageBox::No ) + { + theMess = ""; + return false; + } + return true; } - _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.toLatin1().data() ); + _PTR(SObject) pGeom = SMESH::getStudy()->FindObjectID( aGeomEntry.toUtf8().data() ); if ( !pGeom || GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() )->_is_nil() ) { theMess = tr( "GEOMETRY_OBJECT_IS_NULL" ); @@ -753,7 +716,7 @@ bool SMESHGUI_MeshOp::isValid( QString& theMess ) const theMess = tr( "MESH_IS_NOT_DEFINED" ); return false; } - _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() ); + _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( aMeshEntry.toUtf8().data() ); if ( !pMesh || SMESH::SMESH_Mesh::_narrow( _CAST( SObject,pMesh )->GetObject() )->_is_nil() ) { theMess = tr( "MESH_IS_NULL" ); @@ -773,11 +736,10 @@ bool SMESHGUI_MeshOp::isValid( QString& theMess ) const //================================================================================ /*! * \brief check compatibility of the algorithm and another algorithm or hypothesis - * \param theAlgoData - algorithm data - * \param theHypData - hypothesis data - * \param theHypType - hypothesis type - * \param theHypTypeName - hypothesis type name, must be provided if 2-nd arg is not algo - * \retval bool - check result + * \param theAlgoData - algorithm data + * \param theHypData - hypothesis data + * \param theHypType - hypothesis type + * \retval bool - check result */ //================================================================================ static bool isCompatible(const HypothesisData* theAlgoData, @@ -787,42 +749,172 @@ static bool isCompatible(const HypothesisData* theAlgoData, if ( !theAlgoData ) return true; - if ( theHypType == SMESHGUI_MeshOp::Algo ) + if ( theHypType == SMESHGUI_MeshOp::Algo ) // compatibility of 2 algos return SMESH::IsCompatibleAlgorithm( theAlgoData, theHypData ); - bool isOptional; + bool isOptional; // compatibility of algo and hyp return ( SMESH::IsAvailableHypothesis( theAlgoData, theHypData->TypeName, isOptional )); } //================================================================================ /*! - * \brief Gets available hypotheses or algorithms - * \param theDim - specifies dimension of returned hypotheses/algorifms - * \param theHypType - specifies whether algorims or hypotheses or additional ones - * are retrieved (possible values are in HypType enumeration) - * \param theHyps - Output list of hypotheses' names - * \param theAlgoData - to select hypos able to be used by this algo (optional) + * \brief check compatibility of the geometry + * \param theAlgoData - to select hypos able to be used by this algo + * \param theDim - algo dimension + * \retval bool - check result + */ +//================================================================================ +bool SMESHGUI_MeshOp::isCompatibleToGeometry(HypothesisData* theAlgoData, + const int theDim) +{ + if ( theDim < 1 || myGeom->_is_nil() ) + return true; + + bool isApplicable = false; + if ( myGeomEntry == myLastGeomEntry && !myGeomEntry.isEmpty() ) { + THypLabelIsAppMap::const_iterator lab2isApp = myHypMapIsApplicable.find( theAlgoData->Label ); + if ( lab2isApp != myHypMapIsApplicable.end() ) { + isApplicable = lab2isApp.value(); + return isApplicable; + } + } + bool toCheckIsApplicableToAll = !myIsMesh; + if ( toCheckIsApplicableToAll ) + toCheckIsApplicableToAll = ( myGeom->GetType() == GEOM_GROUP ); + + isApplicable = SMESH::IsApplicable( theAlgoData->TypeName, myGeom, toCheckIsApplicableToAll ); + myHypMapIsApplicable.insert( theAlgoData->Label, isApplicable ); + return isApplicable; +} + +//================================================================================ +/*! + * \brief check compatibility of the mesh type + * \param theAlgoData - to select hypos able to be used by this algo + * \param theDim - algo dimension + * \retval bool - check result + */ +//================================================================================ +bool SMESHGUI_MeshOp::isCompatibleToMeshType(HypothesisData* theAlgoData, + const int theDim) +{ + if ( theDim < 2 ) + return true; + + QString elemType; + int curMeshType = myDlg->currentMeshType(); + switch ( curMeshType ) { + case MT_ANY: + return true; + + case MT_TRIANGULAR: + if ( theDim > 2 ) + return false; + elemType = "TRIA"; + break; + + case MT_QUADRILATERAL: + if ( theDim > 2 ) + return false; + elemType = "QUAD"; + break; + + case MT_TETRAHEDRAL: + if ( theDim < 3 ) + elemType = "TRIA"; + else + elemType = "TETRA"; + break; + + case MT_HEXAHEDRAL: + if ( theDim < 3 ) + elemType = "QUAD"; + else + elemType = "HEXA"; + break; + + default: + return true; + } + + bool isAvailableAlgo = theAlgoData->OutputTypes.isEmpty(); + QStringList::const_iterator inElemType = theAlgoData->OutputTypes.begin(); + for ( ; inElemType != theAlgoData->OutputTypes.end(); inElemType++ ) + { + if ( *inElemType == elemType ) + { + isAvailableAlgo = true; + break; + } + } + return isAvailableAlgo; +} + +//================================================================================ +/*! + * \brief Get available hypotheses or algorithms + * \param theDim - specifies dimension of returned hypotheses/algorifms + * \param theHypType - specifies whether algorims or hypotheses or additional ones + * are retrieved (possible values are in HypType enumeration) + * \param theHyps - output list of hypotheses' names + * \param thePrevAlgoData - to select hypos able to be used by previously algo (optional) + * \param theNextAlgoData - to select hypos able to be used by next algo (optional) + * \param theMeshType - type of mesh for filtering algorithms (optional) * - * Gets available hypotheses or algorithm in accordance with input parameters + * Get available hypotheses or algorithm in accordance with input parameters. + * Result (\a theHyps) optionally depends on the following: + * - selected algorithm(s) + * - selected geometry + * - selected mesh type */ //================================================================================ void SMESHGUI_MeshOp::availableHyps( const int theDim, const int theHypType, QStringList& theHyps, THypDataList& theDataList, - HypothesisData* theAlgoData ) const + HypothesisData* thePrevAlgoData, + HypothesisData* theNextAlgoData, + const QString& theMeshType) { theDataList.clear(); theHyps.clear(); bool isAlgo = ( theHypType == Algo ); - bool isAux = ( theHypType == AddHyp ); - QStringList aHypTypeNameList = SMESH::GetAvailableHypotheses( isAlgo, theDim, isAux, myIsOnGeometry ); + bool isAux = ( theHypType >= AddHyp ); + QStringList aHypTypeNameList = SMESH::GetAvailableHypotheses( isAlgo, theDim, isAux, myIsOnGeometry, !myIsMesh ); + std::multimap< double, HypothesisData* > sortedHyps; QStringList::const_iterator anIter; for ( anIter = aHypTypeNameList.begin(); anIter != aHypTypeNameList.end(); ++anIter ) { HypothesisData* aData = SMESH::GetHypothesisData( *anIter ); - if ( isCompatible ( theAlgoData, aData, theHypType )) { + if ( isCompatible( thePrevAlgoData, aData, theHypType ) && + isCompatible( theNextAlgoData, aData, theHypType ) && + isCompatibleToGeometry( aData, theDim ) && + isCompatibleToMeshType( aData, theDim )) + { + int groupID = aData->GroupID; + int priority = aData->Priority; + if ( groupID < 0 || groupID > 9 ) groupID = 9; + if ( priority < 0 || priority > 999 ) priority = 999; + + sortedHyps.insert( std::make_pair( groupID + priority * 1e-3, aData )); + } + } + + if ( !sortedHyps.empty() ) + { + HypothesisData* aPrevGroup = SMESH::GetGroupTitle( sortedHyps.rbegin()->second, isAlgo ); + std::multimap< double, HypothesisData* >::iterator key_hyp = sortedHyps.begin(); + for ( ; key_hyp != sortedHyps.end(); ++key_hyp ) + { + HypothesisData* aData = key_hyp->second; + HypothesisData* aGroup = SMESH::GetGroupTitle( aData, isAlgo ); + if ( aPrevGroup != aGroup ) + { + theDataList.append( aGroup ); + theHyps.append( aGroup->Label ); + aPrevGroup = aGroup; + } theDataList.append( aData ); theHyps.append( aData->Label ); } @@ -832,24 +924,28 @@ void SMESHGUI_MeshOp::availableHyps( const int theDim, //================================================================================ /*! * \brief Gets existing hypotheses or algorithms - * \param theDim - specifies dimension of returned hypotheses/algorifms - * \param theHypType - specifies whether algorims or hypotheses or additional ones - * are retrieved (possible values are in HypType enumeration) - * \param theFather - start object for finding ( may be component, mesh, or sub-mesh ) - * \param theHyps - output list of names. - * \param theHypVars - output list of variables. - * \param theAlgoData - to select hypos able to be used by this algo (optional) + * \param theDim - specifies dimension of returned hypotheses/algorifms + * \param theHypType - specifies whether algorims or hypotheses or additional ones + * are retrieved (possible values are in HypType enumeration) + * \param theFather - start object for finding ( may be component, mesh, or sub-mesh ) + * \param theHyps - output list of names. + * \param theHypVars - output list of variables. + * \param theAlgoData - to select hypos able to be used by this algo (optional) * * Gets existing (i.e. already created) hypotheses or algorithm in accordance with - * input parameters + * input parameters. + * + * WARNING: when using this method to get hyps existing in Mesh component, + * call availableHyps() before in order to get only hyps of available types + * that was filtered by availableHyps() */ //================================================================================ -void SMESHGUI_MeshOp::existingHyps( const int theDim, - const int theHypType, - _PTR(SObject) theFather, - QStringList& theHyps, - THypList& theHypList, - HypothesisData* theAlgoData) +void SMESHGUI_MeshOp::existingHyps( const int theDim, + const int theHypType, + _PTR(SObject) theFather, + QStringList& theHyps, + THypList& theHypList, + HypothesisData* theAlgoData) const { // Clear hypoheses list theHyps.clear(); @@ -858,24 +954,24 @@ void SMESHGUI_MeshOp::existingHyps( const int theDim, if ( !theFather ) return; - const bool isAux = ( theHypType == AddHyp ); - _PTR(SObject) aHypRoot; _PTR(GenericAttribute) anAttr; _PTR(AttributeName) aName; _PTR(AttributeIOR) anIOR; - bool isMesh = !_CAST( SComponent, theFather ); + const bool isMesh = !_CAST( SComponent, theFather ); int aPart = -1; if ( isMesh ) aPart = theHypType == Algo ? SMESH::Tag_RefOnAppliedAlgorithms : SMESH::Tag_RefOnAppliedHypothesis; else aPart = theHypType == Algo ? SMESH::Tag_AlgorithmsRoot : SMESH::Tag_HypothesisRoot; + const bool isAux = ( theHypType >= AddHyp ); + const bool allHyps = ( !isMesh && theHypType != Algo && theDim > -1); + if ( theFather->FindSubObject( aPart, aHypRoot ) ) { - _PTR(ChildIterator) anIter = - SMESH::GetActiveStudyDocument()->NewChildIterator( aHypRoot ); + _PTR(ChildIterator) anIter = SMESH::getStudy()->NewChildIterator( aHypRoot ); for ( ; anIter->More(); anIter->Next() ) { _PTR(SObject) anObj = anIter->Value(); @@ -896,11 +992,13 @@ void SMESHGUI_MeshOp::existingHyps( const int theDim, SMESH::SMESH_Hypothesis_var aHypVar = SMESH::SMESH_Hypothesis::_narrow( aVar ); if ( !aHypVar->_is_nil() ) { - HypothesisData* aData = SMESH::GetHypothesisData( aHypVar->GetName() ); + CORBA::String_var hypType = aHypVar->GetName(); + HypothesisData* aData = SMESH::GetHypothesisData( hypType.in() ); if ( !aData) continue; - if ( ( theDim == -1 || aData->Dim.contains( theDim ) ) && - ( isCompatible ( theAlgoData, aData, theHypType )) && - ( isAux == aData->IsAux )) + if (( theDim == -1 || aData->Dim.contains( theDim ) ) && + ( isCompatible ( theAlgoData, aData, theHypType )) && + ( theHypType == Algo || isAux == aData->IsAuxOrNeedHyp ) && + ( !allHyps || myAvailableHypData[theDim][theHypType].count(aData) )) { std::string aHypName = aName->Value(); theHyps.append( aHypName.c_str() ); @@ -936,7 +1034,7 @@ SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType, myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ).count(':') > nbColonsInMeshEntry; // get mesh and geom object - SMESH::SMESH_Mesh_var aMeshVar = SMESH::SMESH_Mesh::_nil(); + SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil(); GEOM::GEOM_Object_var aGeomVar = GEOM::GEOM_Object::_nil(); QString anEntry; @@ -944,21 +1042,21 @@ SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType, { anEntry = myDlg->selectedObject ( myToCreate ? SMESHGUI_MeshDlg::Mesh : SMESHGUI_MeshDlg::Obj ); - if ( _PTR(SObject) pObj = studyDS()->FindObjectID( anEntry.toLatin1().data() )) + if ( _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anEntry.toUtf8().data() )) { CORBA::Object_ptr Obj = _CAST( SObject,pObj )->GetObject(); if ( myToCreate ) // mesh and geom may be selected { - aMeshVar = SMESH::SMESH_Mesh::_narrow( Obj ); + aMesh = SMESH::SMESH_Mesh::_narrow( Obj ); anEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - if ( _PTR(SObject) pGeom = studyDS()->FindObjectID( anEntry.toLatin1().data() )) + if ( _PTR(SObject) pGeom = SMESH::getStudy()->FindObjectID( anEntry.toUtf8().data() )) 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(); + aMesh = sm->GetFather(); aGeomVar = sm->GetSubShape(); } } @@ -969,16 +1067,16 @@ SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType, if ( !myToCreate ) // mesh to edit can be selected { anEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); - if ( _PTR(SObject) pMesh = studyDS()->FindObjectID( anEntry.toLatin1().data() )) + if ( _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( anEntry.toUtf8().data() )) { - aMeshVar = SMESH::SMESH_Mesh::_narrow( _CAST( SObject,pMesh )->GetObject() ); - if ( !aMeshVar->_is_nil() ) + aMesh = SMESH::SMESH_Mesh::_narrow( _CAST( SObject,pMesh )->GetObject() ); + if ( !aMesh->_is_nil() ) aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pMesh ); } } if ( aGeomVar->_is_nil() ) { anEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - if ( _PTR(SObject) pGeom = studyDS()->FindObjectID( anEntry.toLatin1().data() )) + if ( _PTR(SObject) pGeom = SMESH::getStudy()->FindObjectID( anEntry.toUtf8().data() )) { aGeomVar= GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() ); } @@ -986,15 +1084,15 @@ SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType, } SMESH::SMESH_Hypothesis_var hyp = - SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toLatin1().data(), - aServerLib.toLatin1().data(), - aMeshVar, + SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toUtf8().data(), + aServerLib.toUtf8().data(), + aMesh, aGeomVar, /*byMesh = */isSubMesh); if ( hyp->_is_nil() && isSubMesh ) hyp = SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toLatin1().data(), - aServerLib.toLatin1().data(), - aMeshVar, + aServerLib.toUtf8().data(), + aMesh, aGeomVar, /*byMesh = */false); return hyp; @@ -1002,10 +1100,74 @@ SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType, //================================================================================ /*! - * \Brief Returns tab dimention + * \brief initialize a hypothesis creator + */ +//================================================================================ + +void SMESHGUI_MeshOp::initHypCreator( SMESHGUI_GenericHypothesisCreator* theCreator ) +{ + if ( !theCreator ) return; + + // Set shapes, of mesh and sub-mesh if any + + // get Entry of the Geom object + QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); + QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); + QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); + + if ( myToCreate && myIsMesh ) + aMeshEntry = aGeomEntry; + + if ( aMeshEntry != aGeomEntry ) { // Get Geom object from Mesh of a sub-mesh being edited + _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( aMeshEntry.toUtf8().data() ); + GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj ); + aMeshEntry = ( aGeomVar->_is_nil() ) ? QString() : SMESH::toQStr( aGeomVar->GetStudyEntry() ); + } + + if ( aMeshEntry == "" && aGeomEntry == "" ) { // get geom of an object being edited + _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.toUtf8().data() ); + bool isMesh; + GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj, &isMesh ); + if ( !aGeomVar->_is_nil() ) + { + aGeomEntry = SMESH::toQStr( aGeomVar->GetStudyEntry() ); + if ( isMesh ) + aMeshEntry = aGeomEntry; + } + } + + if ( anObjEntry != "" && aGeomEntry != "" && aMeshEntry == "" ) { + // take geometry from submesh being created + _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.toUtf8().data() ); + if ( pObj ) { + // if current object is sub-mesh + SMESH::SMESH_subMesh_var aSubMeshVar = + SMESH::SMESH_subMesh::_narrow( _CAST( SObject,pObj )->GetObject() ); + if ( !aSubMeshVar->_is_nil() ) { + SMESH::SMESH_Mesh_var aMesh = aSubMeshVar->GetFather(); + if ( !aMesh->_is_nil() ) { + _PTR(SObject) aMeshSO = SMESH::FindSObject( aMesh ); + GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( aMeshSO ); + if ( !aGeomVar->_is_nil() ) + aMeshEntry = SMESH::toQStr( aGeomVar->GetStudyEntry() ); + } + } + } + } + + theCreator->setShapeEntry( aGeomEntry ); + if ( aMeshEntry != "" ) + theCreator->setMainShapeEntry( aMeshEntry ); + + theCreator->setNoGeomMesh( !myIsOnGeometry && myIsMesh && !myToCreate ); +} + +//================================================================================ +/*! + * \Brief Returns tab dimension * \param tab - the tab in the dlg * \param dlg - my dialogue - * \retval int - dimention + * \retval int - dimension */ //================================================================================ static int getTabDim (const QObject* tab, SMESHGUI_MeshDlg* dlg ) @@ -1021,7 +1183,7 @@ static int getTabDim (const QObject* tab, SMESHGUI_MeshDlg* dlg ) /*! * \brief Create hypothesis * \param theHypType - hypothesis category (main or additional) - * \param theIndex - index of type of hypothesis to be cerated + * \param theIndex - index of type of hypothesis to be created * * Specifies dimension of hypothesis to be created (using sender() method), * specifies its type and calls method for hypothesis creation @@ -1075,6 +1237,8 @@ void SMESHGUI_MeshOp::createHypothesis(const int theDim, myDim = theDim; myType = theType; + + // get a unique hyp name QStringList aHypNames; TDim2Type2HypList::const_iterator aDimIter = myExistingHyps.begin(); for ( ; aDimIter != myExistingHyps.end(); aDimIter++) { @@ -1100,86 +1264,33 @@ void SMESHGUI_MeshOp::createHypothesis(const int theDim, // Call hypothesis creation server method (without GUI) SMESH::SMESH_Hypothesis_var aHyp = SMESH::CreateHypothesis(theTypeName, aHypName, false); -#ifdef WITHGENERICOBJ - if (!CORBA::is_nil(aHyp)) - aHyp->UnRegister(); -#endif - } else { + aHyp.out(); + } + else { // Get hypotheses creator client (GUI) - // BUG 0020378 - //SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(theTypeName); SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(theTypeName); // Create hypothesis - if (aCreator) { + if (aCreator) + { // Get parameters appropriate to initialize a new hypothesis SMESH::SMESH_Hypothesis_var initParamHyp = getInitParamsHypothesis(theTypeName, aData->ServerLibName); removeCustomFilters(); // Issue 0020170 - // Get Entry of the Geom object - QString aGeomEntry = ""; - QString aMeshEntry = ""; - QString anObjEntry = ""; - aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); - anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); - - if ( myToCreate && myIsMesh ) - aMeshEntry = aGeomEntry; + // set shapes, of mesh and sub-mesh if any + initHypCreator( aCreator ); - if ( aMeshEntry != aGeomEntry ) { // Get Geom object from Mesh of a sub-mesh being edited - _PTR(SObject) pObj = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() ); - GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj ); - aMeshEntry = ( aGeomVar->_is_nil() ) ? "" : aMeshEntry = aGeomVar->GetStudyEntry(); - } - - if ( aMeshEntry == "" && aGeomEntry == "" ) { // get geom of an object being edited - _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); - bool isMesh; - GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj, &isMesh ); - if ( !aGeomVar->_is_nil() ) - { - aGeomEntry = aGeomVar->GetStudyEntry(); - if ( isMesh ) - aMeshEntry = aGeomEntry; - } - } - - if ( anObjEntry != "" && aGeomEntry != "" && aMeshEntry == "" ) { - // take geometry from submesh being created - _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); - if ( pObj ) { - // if current object is sub-mesh - SMESH::SMESH_subMesh_var aSubMeshVar = - SMESH::SMESH_subMesh::_narrow( _CAST( SObject,pObj )->GetObject() ); - if ( !aSubMeshVar->_is_nil() ) { - SMESH::SMESH_Mesh_var aMeshVar = aSubMeshVar->GetFather(); - if ( !aMeshVar->_is_nil() ) { - _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar ); - GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( aMeshSO ); - if ( !aGeomVar->_is_nil() ) - aMeshEntry = aGeomVar->GetStudyEntry(); - } - } - } - } - - aCreator->setShapeEntry( aGeomEntry ); - if ( aMeshEntry != "" ) - aCreator->setMainShapeEntry( aMeshEntry ); myDlg->setEnabled( false ); aCreator->create(initParamHyp, aHypName, myDlg, this, SLOT( onHypoCreated( int ) ) ); dialog = true; } - else { + else + { SMESH::SMESH_Hypothesis_var aHyp = SMESH::CreateHypothesis(theTypeName, aHypName, false); -#ifdef WITHGENERICOBJ - if (!CORBA::is_nil(aHyp)) - aHyp->UnRegister(); -#endif + aHyp.out(); } } @@ -1205,7 +1316,7 @@ void SMESHGUI_MeshOp::onHypoCreated( int result ) myDlg->setEnabled( true ); } - _PTR(SComponent) aFather = SMESH::GetActiveStudyDocument()->FindComponent("SMESH"); + _PTR(SComponent) aFather = SMESH::getStudy()->FindComponent("SMESH"); int nbHyp = myExistingHyps[myDim][myType].count(); HypothesisData* algoData = hypData( myDim, Algo, currentHyp( myDim, Algo )); @@ -1216,9 +1327,7 @@ void SMESHGUI_MeshOp::onHypoCreated( int result ) for (int i = nbHyp; i < aNewHyps.count(); i++) myDlg->tab(myDim)->addHyp(myType, aNewHyps[i]); } - - if( result!=2 && myHypoSet ) - processSet(); + return; } //================================================================================ @@ -1246,67 +1355,22 @@ void SMESHGUI_MeshOp::onEditHyp( const int theHypType, const int theIndex ) if ( aHyp->_is_nil() ) return; - SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(aHyp->GetName()); + SMESHGUI_GenericHypothesisCreator* aCreator = + SMESH::GetHypothesisCreator( SMESH::toQStr( aHyp->GetName() )); if ( aCreator ) { - // Get initial parameters + // set initial parameters SMESH::SMESH_Hypothesis_var initParamHyp = - getInitParamsHypothesis( aHyp->GetName(), aHyp->GetLibName()); + getInitParamsHypothesis( SMESH::toQStr( aHyp->GetName() ), + SMESH::toQStr( aHyp->GetLibName() )); aCreator->setInitParamsHypothesis( initParamHyp ); - // Get Entry of the Geom object - QString aGeomEntry = ""; - QString aMeshEntry = ""; - QString anObjEntry = ""; - aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); - anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); - - if ( myToCreate && myIsMesh ) - aMeshEntry = aGeomEntry; - - if ( aMeshEntry != aGeomEntry ) { // Get Geom object from Mesh of a sub-mesh being edited - _PTR(SObject) pObj = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() ); - GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj ); - aMeshEntry = ( aGeomVar->_is_nil() ) ? "" : aMeshEntry = aGeomVar->GetStudyEntry(); - } - - if ( aMeshEntry == "" && aGeomEntry == "" ) { // get geom of an object being edited - _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); - bool isMesh; - GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj, &isMesh ); - if ( !aGeomVar->_is_nil() ) - { - aGeomEntry = aGeomVar->GetStudyEntry(); - if ( isMesh ) - aMeshEntry = aGeomEntry; - } - } + // set shapes, of mesh and sub-mesh if any + initHypCreator( aCreator ); - if ( anObjEntry != "" && aGeomEntry != "" && aMeshEntry == "" ) { - // take geometry from submesh being created - _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); - if ( pObj ) { - // if current object is sub-mesh - SMESH::SMESH_subMesh_var aSubMeshVar = - SMESH::SMESH_subMesh::_narrow( _CAST( SObject,pObj )->GetObject() ); - if ( !aSubMeshVar->_is_nil() ) { - SMESH::SMESH_Mesh_var aMeshVar = aSubMeshVar->GetFather(); - if ( !aMeshVar->_is_nil() ) { - _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar ); - GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( aMeshSO ); - if ( !aGeomVar->_is_nil() ) - aMeshEntry = aGeomVar->GetStudyEntry(); - } - } - } - } - - aCreator->setShapeEntry( aGeomEntry ); - if ( aMeshEntry != "" ) - aCreator->setMainShapeEntry( aMeshEntry ); removeCustomFilters(); // Issue 0020170 myDlg->setEnabled( false ); + aCreator->edit( aHyp.in(), aHypItem.second, dlg(), this, SLOT( onHypoEdited( int ) ) ); } } @@ -1333,7 +1397,7 @@ void SMESHGUI_MeshOp::onHypoEdited( int result ) * \param theHypType - hyp type (Algo,MainHyp or AddHyp) * \param theIndex - index in the list * \retval HypothesisData* - result data, may be 0 - */ + */ //================================================================================ HypothesisData* SMESHGUI_MeshOp::hypData( const int theDim, const int theHypType, @@ -1346,10 +1410,86 @@ HypothesisData* SMESHGUI_MeshOp::hypData( const int theDim, return 0; } +//================================================================================ +/*! + * \brief Update list of algorithms and hypotheses according to currently selected + * algorithm, geometry and mesh type + */ +//================================================================================ +void SMESHGUI_MeshOp::setFilteredAlgoData() +{ + // keep current algorithms + HypothesisData* curAlgos[ 4 ]; + for ( int dim = 0; dim <= 3; ++dim ) + curAlgos[ dim ] = hypData( dim, Algo, currentHyp( dim, Algo )); + + // find out myMaxShapeDim by checking algorithm applicability to geometry + + int curMeshType = myDlg->currentMeshType(); + myDlg->setCurrentMeshType( MT_ANY ); + QStringList algosAvailable; + // get available algorithms taking into account geometry only + if ( myGeom->_is_nil() ) + { + myMaxShapeDim = 3; + + if ( myToCreate ) // readMesh() has done it if !myToCreate + for ( int dim = 0; dim <= 3; ++dim ) + availableHyps( dim, Algo, algosAvailable, myAvailableHypData[ dim ][ Algo ] ); + } + else + { + if ( myGeomEntry != myLastGeomEntry ) + myHypMapIsApplicable.clear(); + + for ( int dim = 0; dim <= 3; ++dim ) + { + availableHyps( dim, Algo, algosAvailable, myAvailableHypData[ dim ][ Algo ] ); + if ( algosAvailable.count() ) + myMaxShapeDim = dim; + } + if ( !myGeomEntry.isEmpty() ) + myLastGeomEntry = myGeomEntry; + } + myDlg->setMaxHypoDim( myMaxShapeDim ); + + // set mesh types according to myMaxShapeDim + updateMeshTypeList(); + + // update available hypo-sets that depend on geometry and mesh type + myDlg->setCurrentMeshType( Max( MT_ANY, curMeshType )); + updateHypoSets(); // it sets myAvailableHypData by curMeshType + + // restore current algorithms according to changed myAvailableHypData + for ( int dim = 0; dim <= 3; ++dim ) + { + int algoIndex = myAvailableHypData[ dim ][ Algo ].indexOf( curAlgos[ dim ]); + while ( algosAvailable.count() <= algoIndex ) + algosAvailable << ""; + myDlg->tab( dim )->setAvailableHyps( Algo, algosAvailable ); + setCurrentHyp( dim, Algo, algoIndex ); + if ( algoIndex < 0 ) + curAlgos[ dim ] = 0; + } + + // find a selected algo, current or of highest dimension + int algoDim = myDlg->currentTab(); + if ( !curAlgos[ algoDim ]) + for ( algoDim = SMESH::DIM_3D; algoDim >= SMESH::DIM_0D; algoDim-- ) + if ( curAlgos[ algoDim ] ) + break; + if ( algoDim < SMESH::DIM_0D ) + algoDim = myMaxShapeDim; + + // set algorithms and hypotheses according to all parameters (mesh type etc) + onAlgoSelected( currentHyp( algoDim, Algo ), algoDim ); +} + //================================================================================ /*! * \brief Set available algos and hypos according to the selected algorithm - * \param theIndex - algorithm index + * \param theIndex - algorithm index + * \param theDim - algorithm dimension */ //================================================================================ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex, @@ -1358,18 +1498,11 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex, if ( myIgnoreAlgoSelection ) return; - int aDim = theDim < 0 ? getTabDim( sender(), myDlg ): theDim; + int curDim = getTabDim( sender(), myDlg ); + int aDim = theDim < 0 ? curDim : theDim; if (aDim == -1) return; - // find highest available dimension, all algos of this dimension are available for choice - int aTopDim = -1; - for (int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++) - if (isAccessibleDim( i )) - aTopDim = i; - if (aTopDim == -1) - return; - const bool isSubmesh = ( myToCreate ? !myIsMesh : myDlg->isObjectShown( SMESHGUI_MeshDlg::Mesh )); HypothesisData* algoData = hypData( aDim, Algo, theIndex ); @@ -1377,123 +1510,136 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex, algoByDim[ aDim ] = algoData; QStringList anAvailable; - if ( !algoData ) { // all algos becomes available - availableHyps( aDim, Algo, anAvailable, myAvailableHypData[ aDim ][ Algo ]); - myDlg->tab( aDim )->setAvailableHyps( Algo, anAvailable ); - } - - // check that algorithms of other dimentions are compatible with - // the selected one + const int algoDim = aDim; - // 2 loops: backward and forward from algo dimension - for ( int forward = false; forward <= true; ++forward ) + // 2 loops: backward and forward from algo dimension (forward == to higher dimension) + for ( int forward = 1; forward >= 0; --forward ) { - int dim = aDim + 1, lastDim = SMESH::DIM_3D, dir = 1; + int dim = algoDim, lastDim = SMESH::DIM_3D, dir = 1; if ( !forward ) { - dim = aDim - 1; lastDim = SMESH::DIM_0D; dir = -1; + dim = algoDim - 1; lastDim = SMESH::DIM_0D; dir = -1; } - HypothesisData* prevAlgo = algoData; - bool noCompatible = false; + //bool noCompatible = false; for ( ; dim * dir <= lastDim * dir; dim += dir) { - if ( !isAccessibleDim( dim )) - continue; - if ( noCompatible ) { // the selected algo has no compatible ones - anAvailable.clear(); + // if ( noCompatible ) // the selected algo has no compatible ones (like 1D2D3D algo) + // { + // anAvailable.clear(); + // myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable ); + // myAvailableHypData[dim][Algo].clear(); + // algoByDim[ dim ] = 0; + // } + // else + { + int algoIndex = currentHyp( dim, Algo ); + HypothesisData *curAlgo = hypData( dim, Algo, algoIndex ); + + // set new available algorithms + HypothesisData *prevAlgo = 0; + if ( dim != algoDim ) + for ( int prevDim = dim + 1; prevDim <=3 && !prevAlgo; ++prevDim ) + prevAlgo = hypData( prevDim, Algo, currentHyp( prevDim, Algo )); + availableHyps( dim, Algo, anAvailable, myAvailableHypData[dim][Algo], prevAlgo ); myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable ); - myAvailableHypData[dim][Algo].clear(); - algoByDim[ dim ] = 0; - continue; - } - // get currently selected algo - int algoIndex = currentHyp( dim, Algo ); - HypothesisData* curAlgo = hypData( dim, Algo, algoIndex ); - if ( curAlgo ) { // some algo selected - if ( !isCompatible( prevAlgo, curAlgo, Algo )) - curAlgo = 0; + + //noCompatible = ( prevAlgo && !forward && anAvailable.isEmpty() ); + + // set current algo + algoIndex = myAvailableHypData[dim][Algo].indexOf( curAlgo ); + setCurrentHyp( dim, Algo, algoIndex, /*updateHyps=*/true ); + + algoByDim[ dim ] = hypData( dim, Algo, algoIndex ); } - // set new available algoritms - availableHyps( dim, Algo, anAvailable, myAvailableHypData[dim][Algo], prevAlgo ); - HypothesisData* soleCompatible = 0; - if ( anAvailable.count() == 1 ) - soleCompatible = myAvailableHypData[dim][Algo][0]; - if ( dim == aTopDim && prevAlgo ) // all available algoritms should be selectable any way - availableHyps( dim, Algo, anAvailable, myAvailableHypData[dim][Algo], 0 ); - myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable ); - noCompatible = anAvailable.isEmpty(); - - // restore previously selected algo - algoIndex = myAvailableHypData[dim][Algo].indexOf( curAlgo ); - if ( !isSubmesh && algoIndex < 0 && soleCompatible && !forward && dim != SMESH::DIM_0D) - // select the sole compatible algo - algoIndex = myAvailableHypData[dim][Algo].indexOf( soleCompatible ); - setCurrentHyp( dim, Algo, algoIndex ); - - // remember current algo - prevAlgo = algoByDim[ dim ] = hypData( dim, Algo, algoIndex ); - } - } - // set hypotheses corresponding to the found algoritms + // activate tabs according to algorithms availability + if ( anAvailable.isEmpty() ) myDlg->disableTab( dim ); + else myDlg->enableTab( dim ); + + } // loop on dims + } // loops backward and forward + + + // set hypotheses corresponding to the found algorithms - _PTR(SObject) pObj = SMESH::GetActiveStudyDocument()->FindComponent("SMESH"); + _PTR(SObject) pComp = SMESH::getStudy()->FindComponent("SMESH"); for ( int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++ ) { if ( !isAccessibleDim( dim )) continue; - for ( int type = MainHyp; type < NbHypTypes; type++ ) + + // get indices of selected hyps + const int nbTypes = nbDlgHypTypes(dim); + std::vector hypIndexByType( nbTypes, -1 ); + for ( int dlgType = MainHyp; dlgType < nbTypes; dlgType++ ) { + hypIndexByType[ dlgType ] = currentHyp( dim, dlgType ); + } + + // update hyps + for ( int dlgType = MainHyp; dlgType < nbTypes; dlgType++ ) + { + const int type = Min( dlgType, AddHyp ); myAvailableHypData[ dim ][ type ].clear(); QStringList anAvailable, anExisting; HypothesisData* curAlgo = algoByDim[ dim ]; - int hypIndex = currentHyp( dim, type ); + int hypIndex = hypIndexByType[ dlgType ]; SMESH::SMESH_Hypothesis_var curHyp; + QString curHypType; + HypothesisData* hypData = 0; if ( hypIndex >= 0 && hypIndex < myExistingHyps[ dim ][ type ].count() ) + { curHyp = myExistingHyps[ dim ][ type ][ hypIndex ].first; - - if ( !myToCreate && !curAlgo && !curHyp->_is_nil() ) { // edition, algo not selected + if ( !curHyp->_is_nil() ) + { + curHypType = SMESH::toQStr( curHyp->GetName() ); + hypData = SMESH::GetHypothesisData( curHypType ); + } + } + if ( !myToCreate && !curAlgo && !curHyp->_is_nil() ) // edition, algo not selected + { // try to find algo by selected hypothesis in order to keep it selected bool algoDeselectedByUser = ( theDim < 0 && aDim == dim ); - CORBA::String_var curHypType = curHyp->GetName(); if ( !algoDeselectedByUser && myObjHyps[ dim ][ type ].count() > 0 && - !strcmp( curHypType, myObjHyps[ dim ][ type ].first().first->GetName()) ) + curHypType == SMESH::toQStr( myObjHyps[ dim ][ type ].first().first->GetName()) ) { - HypothesisData* hypData = SMESH::GetHypothesisData( curHyp->GetName() ); - for (int i = 0; i < myAvailableHypData[ dim ][ Algo ].count(); ++i) { + for ( int i = 0; i < myAvailableHypData[ dim ][ Algo ].count(); ++i ) + { curAlgo = myAvailableHypData[ dim ][ Algo ][ i ]; - if (curAlgo && hypData && isCompatible(curAlgo, hypData, type)) + if ( curAlgo && hypData && isCompatible( curAlgo, hypData, type )) break; else curAlgo = 0; } } } + // get hyps compatible with curAlgo + bool defaulHypAvlbl = false; if ( curAlgo ) { - // check if a selected hyp is compatible with the curAlgo - if ( !curHyp->_is_nil() ) { - HypothesisData* hypData = SMESH::GetHypothesisData( curHyp->GetName() ); - if ( !isCompatible( curAlgo, hypData, type )) - curHyp = SMESH::SMESH_Hypothesis::_nil(); - } - existingHyps( dim, type, pObj, anExisting, myExistingHyps[ dim ][ type ], curAlgo); - availableHyps( dim, type, anAvailable, myAvailableHypData[ dim ][ type ], curAlgo); + if ( hypData && !isCompatible( curAlgo, hypData, type )) + curHyp = SMESH::SMESH_Hypothesis::_nil(); + availableHyps( dim, type, anAvailable, myAvailableHypData[ dim ][ type ], curAlgo ); + existingHyps ( dim, type, pComp, anExisting, myExistingHyps[ dim ][ type ], curAlgo ); + defaulHypAvlbl = ( type == MainHyp && !curAlgo->IsAuxOrNeedHyp ); } // set list of hypotheses - myDlg->tab( dim )->setAvailableHyps( type, anAvailable ); - myDlg->tab( dim )->setExistingHyps( type, anExisting ); - + if ( dlgType <= AddHyp ) + { + myDlg->tab( dim )->setAvailableHyps( type, anAvailable ); + myDlg->tab( dim )->setExistingHyps( type, anExisting, defaulHypAvlbl ); + } // set current existing hypothesis if ( !curHyp->_is_nil() && !anExisting.isEmpty() ) hypIndex = this->find( curHyp, myExistingHyps[ dim ][ type ]); else hypIndex = -1; - if ( !isSubmesh && hypIndex < 0 && anExisting.count() == 1 ) { + if ( !isSubmesh && myToCreate && hypIndex < 0 && anExisting.count() == 1 && dim == curDim ) + { // none is yet selected => select the sole existing if it is not optional CORBA::String_var hypTypeName = myExistingHyps[ dim ][ type ].first().first->GetName(); bool isOptional = true; @@ -1502,9 +1648,10 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex, !isOptional ) hypIndex = 0; } - setCurrentHyp( dim, type, hypIndex ); + setCurrentHyp( dim, dlgType, hypIndex ); } } + return; } //================================================================================ @@ -1515,105 +1662,102 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex, //================================================================================ void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName ) { - myHypoSet = SMESH::GetHypothesesSet(theSetName); - if (!myHypoSet) + HypothesesSet* aHypoSet = SMESH::GetHypothesesSet(theSetName); + if (!aHypoSet) return; // clear all hyps - for (int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++) { + for (int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++) + { setCurrentHyp(dim, Algo, -1); setCurrentHyp(dim, AddHyp, -1); setCurrentHyp(dim, MainHyp, -1); + onAlgoSelected( -1, dim ); } - myHypoSet->init(true); //algorithms - processSet(); - myHypoSet->init(false); //hypotheses - processSet(); - myHypoSet = 0; -} - -//================================================================================ -/*! - * \brief One step of hypothesis/algorithm list creation - * - * Creates a hypothesis or an algorithm for current item of internal list of names myHypoSet - */ -//================================================================================ -void SMESHGUI_MeshOp::processSet() -{ - myHypoSet->next(); - if( !myHypoSet->more() ) - return; - - bool isAlgo = myHypoSet->isAlgo(); - QString aHypoTypeName = myHypoSet->current(); - HypothesisData* aHypData = SMESH::GetHypothesisData(aHypoTypeName); - if (!aHypData) - { - processSet(); - return; - } - - int aDim = aHypData->Dim[0]; - // create or/and set - if (isAlgo) - { - int index = myAvailableHypData[aDim][Algo].indexOf( aHypData ); - if ( index < 0 ) + for ( int isAlgo = 1; isAlgo >= 0; --isAlgo ) + for ( aHypoSet->init( isAlgo ); aHypoSet->more(); aHypoSet->next() ) { - QStringList anAvailable; - availableHyps( aDim, Algo, anAvailable, myAvailableHypData[aDim][Algo] ); - myDlg->tab( aDim )->setAvailableHyps( Algo, anAvailable ); - index = myAvailableHypData[aDim][Algo].indexOf( aHypData ); - } - setCurrentHyp( aDim, Algo, index ); - onAlgoSelected( index, aDim ); - processSet(); - } - else - { - bool mainHyp = true; - QStringList anAvailable; - availableHyps( aDim, MainHyp, anAvailable, myAvailableHypData[aDim][MainHyp] ); - myDlg->tab( aDim )->setAvailableHyps( MainHyp, anAvailable ); - int index = myAvailableHypData[aDim][MainHyp].indexOf( aHypData ); - if ( index < 0 ) - { - mainHyp = false; - index = myAvailableHypData[aDim][AddHyp].indexOf( aHypData ); + QString aHypoTypeName = aHypoSet->current(); + HypothesisData* aHypData = SMESH::GetHypothesisData( aHypoTypeName ); + if (!aHypData) + continue; + + int aDim = aHypData->Dim[0]; + // create or/and set + if ( isAlgo ) + { + int index = myAvailableHypData[aDim][Algo].indexOf( aHypData ); + if ( index >= 0 ) + { + setCurrentHyp( aDim, Algo, index ); + onAlgoSelected( index, aDim ); + } + } + else + { + bool mainHyp = true; + int index = myAvailableHypData[aDim][MainHyp].indexOf( aHypData ); + if ( index < 0 ) + { + mainHyp = false; + index = myAvailableHypData[aDim][AddHyp].indexOf( aHypData ); + } + if ( index >= 0 ) + createHypothesis( aDim, mainHyp ? MainHyp : AddHyp, aHypoTypeName ); + } } - if (index >= 0) - createHypothesis(aDim, mainHyp ? MainHyp : AddHyp, aHypoTypeName); - else - processSet(); - } + return; } //================================================================================ /*! * \brief Creates mesh - * \param theMess - Output parameter intended for returning error message - * \param theEntryList - List of entries of published objects - * \retval bool - TRUE if mesh is created, FALSE otherwise - * - * Creates mesh + * \param theMess - Output parameter intended for returning error message + * \param theEntryList - List of entries of published objects + * \retval bool - TRUE if mesh is created, FALSE otherwise */ //================================================================================ bool SMESHGUI_MeshOp::createMesh( QString& theMess, QStringList& theEntryList ) { theMess = ""; - //QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - //QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); - QStringList aList; myDlg->selectedObject( SMESHGUI_MeshDlg::Geom, aList ); + if ( aList.isEmpty() ) + { + SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen(); + if ( aSMESHGen->_is_nil() ) + return false; + + SMESH::SMESH_Mesh_var aMesh= aSMESHGen->CreateEmptyMesh(); + if ( aMesh->_is_nil() ) + return false; + + _PTR(SObject) aMeshSO = SMESH::FindSObject( aMesh.in() ); + if ( aMeshSO ) { + SMESH::SetName( aMeshSO, myDlg->objectText( SMESHGUI_MeshDlg::Obj ) ); + theEntryList.append( aMeshSO->GetID().c_str() ); + } + return true; + } + QString namePrefix; + if ( aList.count() > 1 ) + { + namePrefix = myDlg->objectText( SMESHGUI_MeshDlg::Obj ); + int i = namePrefix.length() - 1; + while ( i > 0 && namePrefix[i].isDigit() ) + --i; + if ( i < namePrefix.length() - 1 ) + namePrefix.chop( namePrefix.length() - 1 - i ); + else + namePrefix += "_"; + } QStringList::Iterator it = aList.begin(); - for ( ; it!=aList.end(); it++) + for ( int i = 0; it!=aList.end(); it++, ++i ) { QString aGeomEntry = *it; - _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.toLatin1().data() ); + _PTR(SObject) pGeom = SMESH::getStudy()->FindObjectID( aGeomEntry.toUtf8().data() ); GEOM::GEOM_Object_var aGeomVar = GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() ); @@ -1624,51 +1768,48 @@ bool SMESHGUI_MeshOp::createMesh( QString& theMess, QStringList& theEntryList ) SUIT_OverrideCursor aWaitCursor; // create mesh - SMESH::SMESH_Mesh_var aMeshVar = aSMESHGen->CreateMesh( aGeomVar ); - if ( aMeshVar->_is_nil() ) + SMESH::SMESH_Mesh_var aMesh = aSMESHGen->CreateMesh( aGeomVar ); + if ( aMesh->_is_nil() ) return false; - _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar.in() ); + _PTR(SObject) aMeshSO = SMESH::FindSObject( aMesh.in() ); if ( aMeshSO ) { - SMESH::SetName( aMeshSO, myDlg->objectText( SMESHGUI_MeshDlg::Obj ) ); theEntryList.append( aMeshSO->GetID().c_str() ); + if ( i > 0 ) setDefaultName( namePrefix ); + SMESH::SetName( aMeshSO, myDlg->objectText( SMESHGUI_MeshDlg::Obj ) ); } - for ( int aDim = SMESH::DIM_0D; aDim <= SMESH::DIM_3D; aDim++ ) { + for ( int aDim = SMESH::DIM_0D; aDim <= SMESH::DIM_3D; aDim++ ) + { if ( !isAccessibleDim( aDim )) continue; // assign hypotheses - for ( int aHypType = MainHyp; aHypType <= AddHyp; aHypType++ ) { - int aHypIndex = currentHyp( aDim, aHypType ); - if ( aHypIndex >= 0 && aHypIndex < myExistingHyps[ aDim ][ aHypType ].count() ) { - SMESH::SMESH_Hypothesis_var aHypVar = myExistingHyps[ aDim ][ aHypType ][ aHypIndex ].first; + for ( int dlgType = MainHyp; dlgType < nbDlgHypTypes(aDim); dlgType++ ) + { + const int aHypIndex = currentHyp( aDim, dlgType ); + const int aHypType = Min( dlgType, AddHyp ); + if ( aHypIndex >= 0 && aHypIndex < myExistingHyps[ aDim ][ aHypType ].count() ) + { + SMESH::SMESH_Hypothesis_var aHypVar = + myExistingHyps[ aDim ][ aHypType ][ aHypIndex ].first; if ( !aHypVar->_is_nil() ) - SMESH::AddHypothesisOnMesh( aMeshVar, aHypVar ); + SMESH::AddHypothesisOnMesh( aMesh, aHypVar ); } } // find or create algorithm SMESH::SMESH_Hypothesis_var anAlgoVar = getAlgo( aDim ); if ( !anAlgoVar->_is_nil() ) - SMESH::AddHypothesisOnMesh( aMeshVar, anAlgoVar ); + SMESH::AddHypothesisOnMesh( aMesh, anAlgoVar ); } -#ifdef WITHGENERICOBJ - // obj has been published in study. Its refcount has been incremented. - // It is safe to decrement its refcount - // so that it will be destroyed when the entry in study will be removed - if (aMeshSO) - aMeshVar->UnRegister(); -#endif } return true; } //================================================================================ /*! - * \brief Creates sub-mesh - * \param theMess - Output parameter intended for returning error message - * \param theEntryList - List of entries of published objects - * \retval bool - TRUE if sub-mesh is created, FALSE otherwise - * - * Creates sub-mesh + * \brief Create sub-mesh + * \param theMess - Output parameter intended for returning error message + * \param theEntryList - List of entries of published objects + * \retval bool - TRUE if sub-mesh is created, FALSE otherwise */ //================================================================================ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList ) @@ -1680,15 +1821,20 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList return false; // get mesh object - QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); - _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() ); - SMESH::SMESH_Mesh_var aMeshVar = - SMESH::SMESH_Mesh::_narrow( _CAST( SObject,pMesh )->GetObject() ); - if (aMeshVar->_is_nil()) + SMESH::SMESH_Mesh_var aMesh = + SMESH::EntryToInterface( myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh )); + if ( aMesh->_is_nil() && myIsInvalidSubMesh ) + { + SMESH::SMESH_subMesh_var aSMVar = + SMESH::EntryToInterface( myDlg->selectedObject( SMESHGUI_MeshDlg::Obj )); + if ( !aSMVar->_is_nil() ) + aMesh = aSMVar->GetMesh(); + } + if ( aMesh->_is_nil() ) return false; // GEOM shape of the main mesh - GEOM::GEOM_Object_var mainGeom = aMeshVar->GetShapeToMesh(); + GEOM::GEOM_Object_var mainGeom = aMesh->GetShapeToMesh(); // Name for the new sub-mesh QString aName = myDlg->objectText(SMESHGUI_MeshDlg::Obj); @@ -1701,17 +1847,16 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList { //QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom ); QString aGeomEntry = aGEOMs.first(); - _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.toLatin1().data() ); + _PTR(SObject) pGeom = SMESH::getStudy()->FindObjectID( aGeomEntry.toUtf8().data() ); aGeomVar = GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() ); } else if (aGEOMs.count() > 1) { // create a GEOM 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 (!geomGen->_is_nil()) { + GEOM::GEOM_IGroupOperations_wrap op = + geomGen->GetIGroupOperations(); if (!op->_is_nil()) { // check and add all selected GEOM objects: they must be // a sub-shapes of the main GEOM and must be of one type @@ -1722,7 +1867,7 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList QStringList::const_iterator aSubShapesIter = aGEOMs.begin(); for ( ; aSubShapesIter != aGEOMs.end(); aSubShapesIter++, iSubSh++) { QString aSubGeomEntry = (*aSubShapesIter); - _PTR(SObject) pSubGeom = studyDS()->FindObjectID(aSubGeomEntry.toLatin1().data()); + _PTR(SObject) pSubGeom = SMESH::getStudy()->FindObjectID(aSubGeomEntry.toUtf8().data()); GEOM::GEOM_Object_var aSubGeomVar = GEOM::GEOM_Object::_narrow(_CAST(SObject,pSubGeom)->GetObject()); TopAbs_ShapeEnum aSubShapeType = (TopAbs_ShapeEnum)aSubGeomVar->GetShapeType(); @@ -1735,18 +1880,19 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList aSeq[iSubSh] = aSubGeomVar; } // create a group - GEOM::GEOM_Object_var aGroupVar = op->CreateGroup(mainGeom, aGroupType); + GEOM::GEOM_Object_wrap aGroupVar = op->CreateGroup(mainGeom, aGroupType); op->UnionList(aGroupVar, aSeq); - if (op->IsDone()) { - aGeomVar = aGroupVar; + if (op->IsDone()) + { + aGeomVar = GEOM::GEOM_Object::_duplicate( aGroupVar.in() ); // publish the GEOM group in study QString aNewGeomGroupName ("Auto_group_for_"); aNewGeomGroupName += aName; - SALOMEDS::SObject_var aNewGroupSO = - geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGeomVar, - aNewGeomGroupName.toLatin1().data(), mainGeom); + SALOMEDS::SObject_wrap aNewGroupSO = + geomGen->AddInStudy( aGeomVar, + aNewGeomGroupName.toUtf8().data(), mainGeom); } } } @@ -1758,11 +1904,17 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList SUIT_OverrideCursor aWaitCursor; + QString aNameOrID = aName; + if ( myIsInvalidSubMesh ) + // pass a sub-mesh entry to mesh->GetSubMesh() to replace the invalid sub-mesh + // by a valid one in an existing SO + aNameOrID = myDlg->selectedObject(SMESHGUI_MeshDlg::Obj); + // create sub-mesh - SMESH::SMESH_subMesh_var aSubMeshVar = aMeshVar->GetSubMesh( aGeomVar, aName.toLatin1().data() ); + SMESH::SMESH_subMesh_var aSubMeshVar = aMesh->GetSubMesh( aGeomVar, aNameOrID.toUtf8().data() ); _PTR(SObject) aSubMeshSO = SMESH::FindSObject( aSubMeshVar.in() ); if ( aSubMeshSO ) { - SMESH::SetName( aSubMeshSO, aName.toLatin1().data() ); + SMESH::SetName( aSubMeshSO, aName.toUtf8().data() ); theEntryList.append( aSubMeshSO->GetID().c_str() ); } @@ -1775,9 +1927,10 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList if ( !anAlgoVar->_is_nil() ) SMESH::AddHypothesisOnSubMesh( aSubMeshVar, anAlgoVar ); // assign hypotheses - for ( int aHypType = MainHyp; aHypType <= AddHyp; aHypType++ ) + for ( int dlgType = MainHyp; dlgType < nbDlgHypTypes(aDim); dlgType++ ) { - int aHypIndex = currentHyp( aDim, aHypType ); + const int aHypIndex = currentHyp( aDim, dlgType ); + const int aHypType = Min( dlgType, AddHyp ); if ( aHypIndex >= 0 && aHypIndex < myExistingHyps[ aDim ][ aHypType ].count() ) { SMESH::SMESH_Hypothesis_var aHypVar = @@ -1793,22 +1946,58 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList selectObject( _PTR(SObject)() ); selectionDone(); + checkSubMeshConcurrency( aMesh, aSubMeshVar, /*askUser=*/true ); + return true; } //================================================================================ /*! - * \brief Gets current hypothesis or algorithms + * \brief Return index of current hypothesis or algorithm * \param theDim - dimension of hypothesis or algorithm * \param theHypType - Type of hypothesis (Algo, MainHyp, AddHyp) - * \retval int - current hypothesis or algorithms - * - * Gets current hypothesis or algorithms + * \retval int - index of current hypothesis or algorithm, -1 if None selected */ //================================================================================ int SMESHGUI_MeshOp::currentHyp( const int theDim, const int theHypType ) const { - return myDlg->tab( theDim )->currentHyp( theHypType ) - 1; + if ( 0 <= theDim && theDim <= 3 ) + return myDlg->tab( theDim )->currentHyp( theHypType ) - 1; + else + return -1; +} + +//================================================================================ +/*! + * \brief Checks if a hypothesis is selected + */ +//================================================================================ + +bool SMESHGUI_MeshOp::isSelectedHyp( int theDim, int theHypType, int theIndex) const +{ + if ( theIndex < 0 ) + return false; + + if ( theHypType < AddHyp ) // only one hyp can be selected + return currentHyp( theDim, theHypType ) == theIndex; + + for ( int dlgHypType = AddHyp; dlgHypType < nbDlgHypTypes( theDim ); ++dlgHypType ) + if ( currentHyp( theDim, dlgHypType ) == theIndex ) + return true; + + return false; +} + +//================================================================================ +/*! + * \brief Returns nb of HypType's taking into account possible several + * selected additional hypotheses which are coded as additional HypType's. + */ +//================================================================================ + +int SMESHGUI_MeshOp::nbDlgHypTypes( const int dim ) const +{ + return NbHypTypes + myDlg->tab( dim )->nbAddHypTypes(); } //================================================================================ @@ -1829,17 +2018,28 @@ bool SMESHGUI_MeshOp::isAccessibleDim( const int theDim ) const * \param theDim - dimension of hypothesis or algorithm * \param theHypType - Type of hypothesis (Algo, MainHyp, AddHyp) * \param theIndex - Index of hypothesis + * \param updateHypsOnAlgoDeselection - to clear and disable hyps if algo deselected * * Gets current hypothesis or algorithms */ //================================================================================ -void SMESHGUI_MeshOp::setCurrentHyp( const int theDim, - const int theHypType, - const int theIndex ) +void SMESHGUI_MeshOp::setCurrentHyp( const int theDim, + const int theHypType, + const int theIndex, + const bool updateHypsOnAlgoDeselection) { myIgnoreAlgoSelection = true; myDlg->tab( theDim )->setCurrentHyp( theHypType, theIndex + 1 ); myIgnoreAlgoSelection = false; + + if ( updateHypsOnAlgoDeselection && theHypType == Algo && theIndex < 0 ) + { + const QStringList noHyps; + myDlg->tab( theDim )->setAvailableHyps( MainHyp, noHyps ); + myDlg->tab( theDim )->setExistingHyps ( MainHyp, noHyps ); + myDlg->tab( theDim )->setAvailableHyps( AddHyp, noHyps ); + myDlg->tab( theDim )->setExistingHyps ( AddHyp, noHyps ); + } } //================================================================================ @@ -1849,18 +2049,22 @@ void SMESHGUI_MeshOp::setCurrentHyp( const int theDim, * Generates and sets default mesh/submesh name(Mesh_1, Mesh_2, etc.) */ //================================================================================ -void SMESHGUI_MeshOp::setDefaultName() const +void SMESHGUI_MeshOp::setDefaultName( const QString& thePrefix ) const { QString aResName; - _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + _PTR(Study) aStudy = SMESH::getStudy(); int i = 1; - QString aPrefix = tr( myIsMesh ? "SMESH_OBJECT_MESH" : "SMESH_SUBMESH" ) + "_"; + + QString aPrefix = thePrefix; + if ( aPrefix.isEmpty() ) + aPrefix = tr( myIsMesh ? "SMESH_OBJECT_MESH" : "SMESH_SUBMESH" ) + "_"; + _PTR(SObject) anObj; do { aResName = aPrefix + QString::number( i++ ); - anObj = aStudy->FindObject( aResName.toLatin1().data() ); + anObj = aStudy->FindObject( aResName.toUtf8().data() ); } while ( anObj ); @@ -1889,10 +2093,10 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim ) return anAlgoVar; QString aHypName = dataList[ aHypIndex ]->TypeName; - // get existing algoritms - _PTR(SObject) pObj = SMESH::GetActiveStudyDocument()->FindComponent("SMESH"); + // get existing algorithms + _PTR(SObject) pComp = SMESH::getStudy()->FindComponent("SMESH"); QStringList tmp; - existingHyps( theDim, Algo, pObj, tmp, myExistingHyps[ theDim ][ Algo ]); + existingHyps( theDim, Algo, pComp, tmp, myExistingHyps[ theDim ][ Algo ]); // look for an existing algo of such a type THypList& aHypVarList = myExistingHyps[ theDim ][ Algo ]; @@ -1900,8 +2104,7 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim ) for ( ; anIter != aHypVarList.end(); anIter++) { SMESH::SMESH_Hypothesis_var aHypVar = (*anIter).first; - CORBA::String_var aName = aHypVar->GetName(); - if ( !aHypVar->_is_nil() && !strcmp(aHypName.toLatin1().data(), aName) ) + if ( !aHypVar->_is_nil() && aHypName == SMESH::toQStr( aHypVar->GetName() )) { anAlgoVar = aHypVar; break; @@ -1914,36 +2117,30 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim ) if (aHypData) { QString aClientLibName = aHypData->ClientLibName; - if (aClientLibName == "") + if ( aClientLibName.isEmpty() ) { // Call hypothesis creation server method (without GUI) SMESH::SMESH_Hypothesis_var aHyp = - SMESH::CreateHypothesis(aHypName, aHypName, true); -#ifdef WITHGENERICOBJ - if (!CORBA::is_nil(aHyp)) - aHyp->UnRegister(); -#endif + SMESH::CreateHypothesis(aHypName, aHypData->Label, true); + aHyp.out(); } else { // Get hypotheses creator client (GUI) - // BUG 0020378 SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(aHypName); // Create algorithm if (aCreator) - aCreator->create(true, aHypName, myDlg, 0, QString::null ); + aCreator->create( true, aHypName, myDlg, 0, QString::null ); else { SMESH::SMESH_Hypothesis_var aHyp = - SMESH::CreateHypothesis(aHypName, aHypName, true); -#ifdef WITHGENERICOBJ - if (!CORBA::is_nil(aHyp)) - aHyp->UnRegister(); -#endif + SMESH::CreateHypothesis(aHypName, aHypData->Label, true); + aHyp.out(); } + delete aCreator; } QStringList tmpList; - _PTR(SComponent) aFather = SMESH::GetActiveStudyDocument()->FindComponent( "SMESH" ); + _PTR(SComponent) aFather = SMESH::getStudy()->FindComponent( "SMESH" ); existingHyps( theDim, Algo, aFather, tmpList, myExistingHyps[ theDim ][ Algo ] ); } @@ -1951,8 +2148,7 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim ) for ( anIter = aNewHypVarList.begin(); anIter != aNewHypVarList.end(); ++anIter ) { SMESH::SMESH_Hypothesis_var aHypVar = (*anIter).first; - CORBA::String_var aName = aHypVar->GetName(); - if ( !aHypVar->_is_nil() && !strcmp(aHypName.toLatin1().data(), aName) ) + if ( !aHypVar->_is_nil() && aHypName == SMESH::toQStr( aHypVar->GetName() )) { anAlgoVar = aHypVar; break; @@ -1965,106 +2161,117 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim ) //================================================================================ /*! - * \brief Reads parameters of edited mesh and assigns them to the dialog + * \brief Reads parameters of an edited mesh/sub-mesh and assigns them to the dialog * - * Reads parameters of edited mesh and assigns them to the dialog (called when - * mesh is edited only) + * Called when mesh is edited only. */ //================================================================================ void SMESHGUI_MeshOp::readMesh() { QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); - _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); + _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.toUtf8().data() ); if ( !pObj ) return; - if (myIsOnGeometry) { - // Get name of mesh if current object is sub-mesh - SMESH::SMESH_subMesh_var aSubMeshVar = - SMESH::SMESH_subMesh::_narrow( _CAST( SObject,pObj )->GetObject() ); - if ( !aSubMeshVar->_is_nil() ) + if ( myIsOnGeometry ) + { + // Set name of mesh if current object is sub-mesh + SMESH::SMESH_subMesh_var subMesh = SMESH::SObjectToInterface< SMESH::SMESH_subMesh >( pObj ); + if ( !subMesh->_is_nil() ) { - SMESH::SMESH_Mesh_var aMeshVar = aSubMeshVar->GetFather(); - if ( !aMeshVar->_is_nil() ) + SMESH::SMESH_Mesh_var aMesh = subMesh->GetFather(); + if ( !aMesh->_is_nil() ) { - _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar ); - QString aMeshName = name( aMeshSO ); + _PTR(SObject) aMeshSO = SMESH::FindSObject( aMesh ); + QString aMeshName = name( aMeshSO ); myDlg->setObjectText( SMESHGUI_MeshDlg::Mesh, aMeshName ); } + myHasConcurrentSubBefore = checkSubMeshConcurrency( aMesh, subMesh ); } - // Get name of geometry object - GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj ); - if ( !aGeomVar->_is_nil() ) + if ( !myIsInvalidSubMesh ) { - _PTR(SObject) aGeomSO = studyDS()->FindObjectID( aGeomVar->GetStudyEntry() ); - QString aShapeName = name( aGeomSO ); - myDlg->setObjectText( SMESHGUI_MeshDlg::Geom, aShapeName ); + // Set name of geometry object + CORBA::String_var name = SMESH::GetGeomName( pObj ); + if ( name.in() ) + myDlg->setObjectText( SMESHGUI_MeshDlg::Geom, name.in() ); } } // Get hypotheses and algorithms assigned to the mesh/sub-mesh - QStringList anExisting; - const int aDim = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_3D; - for ( int dim = aDim; dim <= SMESH::DIM_3D; dim++ ) + QStringList anExisting, anAvailable; + bool algoFound = false; + const int dim1st = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_2D; + for ( int dim = dim1st; dim <= SMESH::DIM_3D; ++dim ) { // get algorithm existingHyps( dim, Algo, pObj, anExisting, myObjHyps[ dim ][ Algo ] ); // find algo index among available ones int aHypIndex = -1; + anAvailable.clear(); if ( myObjHyps[ dim ][ Algo ].count() > 0 ) { - SMESH::SMESH_Hypothesis_var aVar = myObjHyps[ dim ][ Algo ].first().first; - HypothesisData* algoData = SMESH::GetHypothesisData( aVar->GetName() ); - aHypIndex = myAvailableHypData[ dim ][ Algo ].indexOf ( algoData ); -// if ( aHypIndex < 0 && algoData ) { -// // assigned algo is incompatible with other algorithms -// myAvailableHypData[ dim ][ Algo ].push_back( algoData ); -// aHypIndex = myAvailableHypData[ dim ][ hypType ].count() - 1; -// } + SMESH::SMESH_Hypothesis_var hyp = myObjHyps[ dim ][ Algo ].first().first; + HypothesisData* algoData = SMESH::GetHypothesisData( SMESH::toQStr( hyp->GetName() )); + availableHyps( dim, Algo, anAvailable, myAvailableHypData[ dim ][ Algo ] ); + aHypIndex = myAvailableHypData[ dim ][ Algo ].indexOf( algoData ); + // if ( aHypIndex < 0 && algoData ) { + // // assigned algo is incompatible with other algorithms + // myAvailableHypData[ dim ][ Algo ].push_back( algoData ); + // aHypIndex = myAvailableHypData[ dim ][ hypType ].count() - 1; + // } + algoFound = ( aHypIndex > -1 ); } + myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable ); setCurrentHyp( dim, Algo, aHypIndex ); // set existing and available hypothesis according to the selected algo - onAlgoSelected( aHypIndex, dim ); + if ( aHypIndex > -1 || !algoFound ) + onAlgoSelected( aHypIndex, dim ); } // get hypotheses bool hypWithoutAlgo = false; - for ( int dim = aDim; dim <= SMESH::DIM_3D; dim++ ) + for ( int dim = dim1st; dim <= SMESH::DIM_3D; ++dim ) { for ( int hypType = MainHyp; hypType <= AddHyp; hypType++ ) { // get hypotheses existingHyps( dim, hypType, pObj, anExisting, myObjHyps[ dim ][ hypType ] ); - // find index of requered hypothesis among existing ones for this dimension and type - int aHypIndex = -1; - if ( myObjHyps[ dim ][ hypType ].count() > 0 ) { - aHypIndex = find( myObjHyps[ dim ][ hypType ].first().first, - myExistingHyps[ dim ][ hypType ] ); + if ( myObjHyps[ dim ][ hypType ].count() == 0 ) { + setCurrentHyp( dim, hypType, -1 ); + } + for ( int i = 0, nb = myObjHyps[ dim ][ hypType ].count(); i < nb; ++i ) + { + // find index of required hypothesis among existing ones for this dimension and type + int aHypIndex = find( myObjHyps[ dim ][ hypType ][ i ].first, + myExistingHyps[ dim ][ hypType ] ); if ( aHypIndex < 0 ) { // assigned hypothesis is incompatible with the algorithm if ( currentHyp( dim, Algo ) < 0 ) { // none algo selected; it is edition for sure, of submesh maybe hypWithoutAlgo = true; - myExistingHyps[ dim ][ hypType ].push_back( myObjHyps[ dim ][ hypType ].first() ); + myExistingHyps[ dim ][ hypType ].push_back( myObjHyps[ dim ][ hypType ][ i ] ); + anExisting.push_back( myObjHyps[ dim ][ hypType ][ i ].second ); aHypIndex = myExistingHyps[ dim ][ hypType ].count() - 1; myDlg->tab( dim )->setExistingHyps( hypType, anExisting ); } } + setCurrentHyp( dim, hypType + i, aHypIndex ); + + if ( hypType == MainHyp ) break; // only one main hyp allowed } - setCurrentHyp( dim, hypType, aHypIndex ); } } // make available other hyps of same type as one without algo if ( hypWithoutAlgo ) - onAlgoSelected( currentHyp( 0, Algo ), 0 ); + onAlgoSelected( currentHyp( /*dim=*/0, Algo ), /*dim=*/0 ); } //================================================================================ /*! * \brief Gets name of object - * \param theSO - SObject - * \retval QString - name of object + * \param theSO - SObject + * \retval QString - name of object * * Gets name of object */ @@ -2120,9 +2327,9 @@ int SMESHGUI_MeshOp::find( const SMESH::SMESH_Hypothesis_var& theHyp, /*! * \brief Edits mesh or sub-mesh * \param theMess - Output parameter intended for returning error message - * \retval bool - TRUE if mesh is edited succesfully, FALSE otherwise + * \retval bool - TRUE if mesh is edited successfully, FALSE otherwise * - * Assigns new name hypotheses and algoriths to the mesh or sub-mesh + * Assigns new name hypotheses and algorithms to the mesh or sub-mesh */ //================================================================================ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess ) @@ -2134,7 +2341,7 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess ) return false; QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj ); - _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); + _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.toUtf8().data() ); if ( !pObj ) return false; @@ -2143,17 +2350,17 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess ) // Set new name QString aName = myDlg->objectText( SMESHGUI_MeshDlg::Obj ); SMESH::SetName( pObj, aName ); - int aDim = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_3D; + int aDim = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_2D; // First, remove old algos in order to avoid messages on algorithm hiding for ( int dim = aDim; dim <= SMESH::DIM_3D; dim++ ) { - if ( isAccessibleDim( dim ) && myObjHyps[ dim ][ Algo ].count() > 0 ) + if ( /*isAccessibleDim( dim ) &&*/ myObjHyps[ dim ][ Algo ].count() > 0 ) { SMESH::SMESH_Hypothesis_var anOldAlgo = myObjHyps[ dim ][ Algo ].first().first; SMESH::SMESH_Hypothesis_var anAlgoVar = getAlgo( dim ); if ( anAlgoVar->_is_nil() || // no new algo selected or - strcmp(anOldAlgo->GetName(), anAlgoVar->GetName()) ) // algo change + SMESH::toQStr(anOldAlgo->GetName()) != SMESH::toQStr(anAlgoVar->GetName())) // algo change { // remove old algorithm SMESH::RemoveHypothesisOrAlgorithmOnMesh ( pObj, myObjHyps[ dim ][ Algo ].first().first ); @@ -2162,10 +2369,18 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess ) } } + SALOMEDS_SObject* aSObject = _CAST(SObject, pObj); + CORBA::Object_var anObject = aSObject->GetObject(); + SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( anObject ); + SMESH::SMESH_subMesh_var aSubMeshVar = SMESH::SMESH_subMesh::_narrow( anObject ); + bool isMesh = !aMesh->_is_nil(); + if ( !isMesh && !aSubMeshVar->_is_nil() ) + aMesh = aSubMeshVar->GetFather(); + // Assign new algorithms and hypotheses for ( int dim = aDim; dim <= SMESH::DIM_3D; dim++ ) { - if ( !isAccessibleDim( dim )) continue; + //if ( !isAccessibleDim( dim )) continue; // find or create algorithm SMESH::SMESH_Hypothesis_var anAlgoVar = getAlgo( dim ); @@ -2174,70 +2389,106 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess ) if ( !anAlgoVar->_is_nil() && // some algo selected and myObjHyps[ dim ][ Algo ].count() == 0 ) // no algo assigned { - SALOMEDS_SObject* aSObject = _CAST(SObject, pObj); - CORBA::Object_var anObject = aSObject->GetObject(); - SMESH::SMESH_Mesh_var aMeshVar = SMESH::SMESH_Mesh::_narrow( anObject ); - bool isMesh = !aMeshVar->_is_nil(); - if ( isMesh ) { - SMESH::AddHypothesisOnMesh( aMeshVar, anAlgoVar ); - } else { - SMESH::SMESH_subMesh_var aVar = - SMESH::SMESH_subMesh::_narrow( _CAST(SObject,pObj)->GetObject() ); - if ( !aVar->_is_nil() ) - SMESH::AddHypothesisOnSubMesh( aVar, anAlgoVar ); - } + if ( isMesh ) + SMESH::AddHypothesisOnMesh( aMesh, anAlgoVar ); + else if ( !aSubMeshVar->_is_nil() ) + SMESH::AddHypothesisOnSubMesh( aSubMeshVar, anAlgoVar ); + myObjHyps[ dim ][ Algo ].append( THypItem( anAlgoVar, aName) ); } - // assign hypotheses + // remove deselected hypotheses for ( int hypType = MainHyp; hypType <= AddHyp; hypType++ ) { - int aNewHypIndex = currentHyp( dim, hypType ); - int anOldHypIndex = -1; - - // remove old hypotheses - if ( myObjHyps[ dim ][ hypType ].count() > 0 ) + for ( int i = 0, nb = myObjHyps[ dim ][ hypType ].count(); i < nb; ++i ) { - anOldHypIndex = find( myObjHyps[ dim ][ hypType ].first().first, - myExistingHyps[ dim ][ hypType ] ); - if ( aNewHypIndex != anOldHypIndex || // different hyps - anOldHypIndex == -1 ) // hyps of different algos + SMESH::SMESH_Hypothesis_var hyp = myObjHyps[ dim ][ hypType ][ i ].first; + int hypIndex = this->find( hyp, myExistingHyps[ dim ][ hypType ]); + if ( !isSelectedHyp( dim, hypType, hypIndex ) && !hyp->_is_nil() ) { - SMESH::RemoveHypothesisOrAlgorithmOnMesh - ( pObj, myObjHyps[ dim ][ hypType ].first().first ); - myObjHyps[ dim ][ hypType ].clear(); + SMESH::RemoveHypothesisOrAlgorithmOnMesh( pObj, hyp ); } } - - // assign new hypotheses - if ( aNewHypIndex != anOldHypIndex && aNewHypIndex != -1 ) + } + // assign newly selected hypotheses + for ( int dlgType = MainHyp; dlgType < nbDlgHypTypes(dim); dlgType++ ) + { + const int curIndex = currentHyp( dim, dlgType ); + const int hypType = Min( dlgType, AddHyp ); + if ( curIndex >= 0 && curIndex < myExistingHyps[ dim ][ hypType ].count() ) { - SMESH::SMESH_Mesh_var aMeshVar = - SMESH::SMESH_Mesh::_narrow( _CAST(SObject,pObj)->GetObject() ); - bool isMesh = !aMeshVar->_is_nil(); - if ( isMesh ) - { - SMESH::AddHypothesisOnMesh - (aMeshVar, myExistingHyps[ dim ][ hypType ][ aNewHypIndex ].first ); - } - else + SMESH::SMESH_Hypothesis_var hyp = myExistingHyps[ dim ][ hypType ][ curIndex ].first; + + bool isAssigned = ( this->find( hyp, myObjHyps[ dim ][ hypType ]) >= 0 ); + if ( !isAssigned ) { - SMESH::SMESH_subMesh_var aVar = - SMESH::SMESH_subMesh::_narrow( _CAST(SObject,pObj)->GetObject() ); - if ( !aVar->_is_nil() ) - SMESH::AddHypothesisOnSubMesh - ( aVar, myExistingHyps[ dim ][ hypType ][ aNewHypIndex ].first ); + if ( isMesh ) + SMESH::AddHypothesisOnMesh (aMesh, hyp ); + else if ( !aSubMeshVar->_is_nil() ) + SMESH::AddHypothesisOnSubMesh ( aSubMeshVar, hyp ); } } - // reread all hypotheses of mesh if necessary + // reread all hypotheses of mesh QStringList anExisting; existingHyps( dim, hypType, pObj, anExisting, myObjHyps[ dim ][ hypType ] ); } } + myHasConcurrentSubBefore = + checkSubMeshConcurrency( aMesh, aSubMeshVar, /*askUser=*/!myHasConcurrentSubBefore ); + return true; } +//================================================================================ +/*! + * \brief Checks if a concurrent sub-meshes appear as result of sub-mesh + * creation/edition and, if (askUser) , proposes the uses to set up a desired + * order of sub-mesh computation. + * Returns \c true if a sub-mesh concurrency detected. + */ +//================================================================================ + +bool SMESHGUI_MeshOp::checkSubMeshConcurrency(SMESH::SMESH_Mesh_ptr mesh, + SMESH::SMESH_subMesh_ptr submesh, + bool askUser) +{ + if ( CORBA::is_nil( mesh ) || CORBA::is_nil( submesh )) + return false; + + bool isNewConcurrent = mesh->IsUnorderedSubMesh( submesh->GetId() ); + if ( isNewConcurrent && askUser ) + { + int butID = SUIT_MessageBox::warning( myDlg->parentWidget(), tr( "SMESH_WARNING" ), + tr("CONCURRENT_SUBMESH_APPEARS"), + tr("SMESH_BUT_YES"), tr("SMESH_BUT_NO")); + if ( butID == 0 ) + { + _PTR(SObject) meshSO = SMESH::FindSObject( mesh ); + LightApp_SelectionMgr* aSelectionMgr = selectionMgr(); + if ( meshSO && aSelectionMgr ) + { + myDlg->setEnabled( false ); // disactivate selection + selectionMgr()->clearFilters(); + selectObject( meshSO ); + SMESHGUI::GetSMESHGUI()->OnGUIEvent( SMESHOp::OpMeshOrder ); // MESH_ORDER + qApp->processEvents(); + + myDlg->setEnabled( true ); + int obj = myDlg->getActiveObject(); + onActivateObject( obj ); // restore filter + if ( !myToCreate ) + { + selectObject( SMESH::FindSObject( submesh )); + selectionDone(); + } + } + } + } + + return isNewConcurrent; +} + //================================================================================ /*! * \brief Verifies whether given operator is valid for this one @@ -2246,7 +2497,7 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess ) * * 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 + * returns false if theOtherOp operation is not intended for deleting objects or mesh * elements. */ //================================================================================ @@ -2273,14 +2524,14 @@ void SMESHGUI_MeshOp::onGeomSelectionByMesh( bool theByMesh ) } // set mesh object to SMESHGUI_ShapeByMeshOp and start it QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ); - if ( _PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() )) { - SMESH::SMESH_Mesh_var aMeshVar = + if ( _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( aMeshEntry.toUtf8().data() )) { + SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( _CAST( SObject,pMesh )->GetObject() ); - if ( !aMeshVar->_is_nil() ) { + if ( !aMesh->_is_nil() ) { myDlg->hide(); // stop processing selection myShapeByMeshOp->setModule( getSMESHGUI() ); myShapeByMeshOp->setStudy( 0 ); // it's really necessary - myShapeByMeshOp->SetMesh( aMeshVar ); + myShapeByMeshOp->SetMesh( aMesh ); myShapeByMeshOp->start(); } } @@ -2301,8 +2552,8 @@ void SMESHGUI_MeshOp::onPublishShapeByMeshDlg(SUIT_Operation* op) GEOM::GEOM_Object_var aGeomVar = myShapeByMeshOp->GetShape(); if ( !aGeomVar->_is_nil() ) { - QString ID = aGeomVar->GetStudyEntry(); - if ( _PTR(SObject) aGeomSO = studyDS()->FindObjectID( ID.toLatin1().data() )) { + QString ID = SMESH::toQStr( aGeomVar->GetStudyEntry() ); + if ( _PTR(SObject) aGeomSO = SMESH::getStudy()->FindObjectID( ID.toUtf8().data() )) { selectObject( aGeomSO ); selectionDone(); } @@ -2340,3 +2591,79 @@ void SMESHGUI_MeshOp::selectObject( _PTR(SObject) theSObj ) const sm->setSelectedObjects( anIOList, false ); } } +//================================================================================ +/*! + * \brief Update available list of mesh types + */ +//================================================================================ +void SMESHGUI_MeshOp::updateMeshTypeList() +{ + QStringList meshTypes; + meshTypes.append( tr( "MT_ANY" ) ); + if ( myMaxShapeDim >= 2 || myMaxShapeDim == -1 ) + { + meshTypes.append( tr( "MT_TRIANGULAR" ) ); + meshTypes.append( tr( "MT_QUADRILATERAL" ) ); + } + if ( myMaxShapeDim == 3 || myMaxShapeDim == -1 ) + { + meshTypes.append( tr( "MT_TETRAHEDRAL" ) ); + meshTypes.append( tr( "MT_HEXAHEDRAL" ) ); + } + + myDlg->setAvailableMeshType( meshTypes ); +} + +//================================================================================ +/*! + * \brief Update available list of hypothesis sets + */ +//================================================================================ +void SMESHGUI_MeshOp::updateHypoSets() +{ + // get available algorithms taking into account geometry and mesh type + QStringList algosAvailable; + if ( myDlg->currentMeshType() != MT_ANY ) + for ( int dim = 0; dim <= 3; ++dim ) + availableHyps( dim, Algo, algosAvailable, myAvailableHypData[ dim ][ Algo ] ); + + THypDataList anAvailableAlgsData; + QStringList aHypothesesSetsList = SMESH::GetHypothesesSets( myMaxShapeDim ); + QStringList aFilteredHypothesesSetsList; + QStringList::const_iterator inHypoSetName = aHypothesesSetsList.begin(); + for ( ; inHypoSetName != aHypothesesSetsList.end(); ++inHypoSetName ) + { + HypothesesSet* currentHypoSet = SMESH::GetHypothesesSet( *inHypoSetName ); + bool isAvailable = false; + for ( currentHypoSet->init( true ); currentHypoSet->more(); currentHypoSet->next() ) + { + isAvailable = false; + if ( HypothesisData* algoDataIn = SMESH::GetHypothesisData( currentHypoSet->current() )) { + for (int i = SMESH::DIM_0D; i <= myMaxShapeDim; i++) { + int aCurrentAvailableAlgo = myAvailableHypData[i][Algo].indexOf( algoDataIn ); + if ( aCurrentAvailableAlgo > -1 ) { + isAvailable = true; + break; + } + } + if ( !isAvailable ) + break; + } + } + if ( isAvailable ) + aFilteredHypothesesSetsList.append( *inHypoSetName ); + } + myDlg->setHypoSets( aFilteredHypothesesSetsList ); +} + +//================================================================================ +/*! + * \brief SLOT. Is called when the user select type of mesh + * \param theTabIndex - Index of current active tab + * \param theIndex - Index of current type of mesh + */ +//================================================================================ +void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int theTabIndex, const int theIndex ) +{ + setFilteredAlgoData(); +}