-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 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
#include "SMESHGUI.h"
#include "SMESHGUI_GEOMGenUtils.h"
+#include "SMESHGUI_GroupOnShapeDlg.h"
#include "SMESHGUI_Hypotheses.h"
#include "SMESHGUI_HypothesesUtils.h"
#include "SMESHGUI_MeshDlg.h"
#include "SMESHGUI_ShapeByMeshDlg.h"
#include "SMESHGUI_Utils.h"
#include "SMESH_NumberFilter.hxx"
+#include "SMESH_TypeDefs.hxx"
#include "SMESH_TypeFilter.hxx"
+#include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
+
// SALOME GEOM includes
-#include <GEOM_SelectionFilter.h>
#include <GEOMBase.h>
-#include <GeometryGUI.h>
-#include <GEOM_wrap.hxx>
#include <GEOMImpl_Types.hxx>
+#include <GEOM_Client.hxx>
+#include <GEOM_SelectionFilter.h>
+#include <GEOM_wrap.hxx>
+#include <GeometryGUI.h>
// SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Application.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_UpdateFlags.h>
+#include <SALOME_InteractiveObject.hxx>
+#include <SALOME_ListIO.hxx>
#include <SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h>
+#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
-#include <SALOME_InteractiveObject.hxx>
-#include <SALOME_ListIO.hxx>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Tools.h>
// SALOME KERNEL includes
#include <SALOMEDS_SComponent.hxx>
#include <SALOMEDS_wrap.hxx>
// Qt includes
-#include <QStringList>
-#include <QLineEdit>
#include <QApplication>
+#include <QLineEdit>
+#include <QStringList>
// OCCT includes
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopExp_Explorer.hxx>
#include <BRep_Tool.hxx>
-
-// IDL includes
-#include <SALOMEconfig.h>
-#include CORBA_CLIENT_HEADER(SMESH_Gen)
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopoDS.hxx>
//================================================================================
/*!
myShapeByMeshOp( 0 ),
myToCreate( theToCreate ),
myIsMesh( theIsMesh ),
- myHypoSet( 0 )
+ myIsInvalidSubMesh( false )
{
if ( GeometryGUI::GetGeomGen()->_is_nil() )// check that GEOM_Gen exists
GeometryGUI::InitGeomGen();
//================================================================================
bool SMESHGUI_MeshOp::onApply()
{
- if (isStudyLocked())
+ if (SMESHGUI::isStudyLocked())
return false;
QString aMess;
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 );
SUIT_MessageBox::warning( myDlg, tr( "SMESH_ERROR" ), aMess );
}
+ myHypoSet = 0;
+
return aResult;
}
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";
+ if ( myIsMesh ) myHelpFileName = "constructing_meshes.html";
+ else myHelpFileName = "constructing_submeshes.html";
}
else {
- myHelpFileName = "editing_meshes_page.html";
+ myHelpFileName = "editing_meshes.html";
}
}
SMESHGUI_SelectionOp::startOperation();
- // iterate through dimensions and get available algorithms, 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 )
{
{
myDlg->activateObject( SMESHGUI_MeshDlg::Obj );
}
- myDlg->setCurrentTab( SMESH::DIM_3D );
- QStringList TypeMeshList;
- createMeshTypeList( TypeMeshList );
- setAvailableMeshType( TypeMeshList );
+ updateMeshTypeList();
+ myDlg->setCurrentMeshType( MT_ANY );
- myDlg->show();
+ myDlg->setCurrentTab( SMESH::DIM_3D );
myDlg->setGeomPopupEnabled(false);
+ myDlg->show();
+
selectionDone();
+ myHypoSet = 0;
myHasConcurrentSubBefore = false;
-
myObjectToSelect.clear();
}
/*!
* \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.
*/
//================================================================================
/*!
* \brief Creates selection filter
- * \param theId - identifier of current selection widget
- * \retval SUIT_SelectionFilter* - pointer to the created filter or null
+ * \param theId - identifier of current selection widget
+ * \retval SUIT_SelectionFilter* - pointer to the created filter or null
*
* Creates selection filter in accordance with identifier of current selection widget
*/
return 0;
}
+//================================================================================
+/*!
+ * \brief Return type of shape contained in a group
+ */
+//================================================================================
+
+TopAbs_ShapeEnum getGroupType(const TopoDS_Shape& group)
+{
+ if ( group.ShapeType() != TopAbs_COMPOUND )
+ return group.ShapeType();
+
+ // iterate on a compound
+ TopoDS_Iterator it( group );
+ if ( it.More() )
+ return getGroupType( it.Value() );
+
+ return TopAbs_SHAPE;
+}
+
//================================================================================
/*!
* \brief check if selected shape is a sub-shape of the shape to mesh
- * \retval bool - check result
+ * \retval bool - check result
*/
//================================================================================
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<SMESH::SMESH_Mesh>( pMesh );
myDlg->selectedObject(SMESHGUI_MeshDlg::Geom, aGEOMs);
if (aGEOMs.count() > 0) {
- GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
- if (geomGen->_is_nil() || !aStudy) return false;
+ GEOM::GEOM_Gen_var geomGen = mainGeom->GetGen();
+ if (geomGen->_is_nil()) return false;
- GEOM::GEOM_IGroupOperations_wrap 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++) {
+ 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 =
// skl for NPAL14695 - implementation of searching of mainObj
GEOM::GEOM_Object_var mainObj = op->GetMainShape(aSubGeomVar); /* _var not _wrap as
mainObj already exists! */
- while( !mainObj->_is_nil()) {
+ while( !mainObj->_is_nil())
+ {
CORBA::String_var entry1 = mainObj->GetEntry();
CORBA::String_var entry2 = mainGeom->GetEntry();
if (std::string( entry1.in() ) == entry2.in() )
if ( aSubGeomVar->GetShapeType() == GEOM::COMPOUND )
{
// is aSubGeomVar a compound of sub-shapes?
- GEOM::GEOM_IShapesOperations_wrap sop = geomGen->GetIShapesOperations(aStudy->StudyId());
+ 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 );
- }
+ GEOM_Client geomClient;
+ TopoDS_Shape subShape = geomClient.GetShape( geomGen, aSubGeomVar );
+ TopoDS_Shape mainShape = geomClient.GetShape( geomGen, mainGeom );
+ if ( subShape.IsNull() || mainShape.IsNull() )
+ return false;
+
+ TopAbs_ShapeEnum subType = getGroupType( subShape );
+ TopTools_IndexedMapOfShape subMap;
+ TopExp::MapShapes( subShape, subType, subMap );
+ for ( TopExp_Explorer exp( mainShape, subType ); exp.More(); exp.Next() )
+ if ( subMap.Contains( exp.Current() ))
+ return true;
}
}
}
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;
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<GEOM::GEOM_Object>( pGeom );
// if ( !geom->_is_nil() && geom->GetShapeType() >= GEOM::FACE ) { // WIRE, EDGE as well
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;
//================================================================================
_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<GEOM::GEOM_Object>( 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;
}
}
}
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
+ QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj );
+ _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.toUtf8().data() );
- int shapeDim = 3;
+ SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface< SMESH::SMESH_Mesh >( pObj );
+ SMESH::SMESH_subMesh_var subMesh;
- QStringList aGEOMs;
- myDlg->selectedObject(SMESHGUI_MeshDlg::Geom, aGEOMs);
- GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
-
- 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());
-
- if( pSubGeom ) {
- SALOMEDS_SObject* sobj = _CAST(SObject,pSubGeom);
- if( sobj ) {
- GEOM::GEOM_Object_var aSubGeomVar =
- GEOM::GEOM_Object::_narrow(sobj->GetObject());
- if( !aSubGeomVar->_is_nil() ){
- 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 ( CORBA::ULong 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 );
- myMaxShapeDim = shapeDim;
- myDlg->setHypoSets( SMESH::GetHypothesesSets( shapeDim ));
-
- if (!myToCreate) // edition: read hypotheses
- {
- if (pObj != 0)
+ else
{
- SMESH::SMESH_subMesh_var submeshVar =
- SMESH::SMESH_subMesh::_narrow( _CAST( SObject,pObj )->GetObject() );
- myIsMesh = submeshVar->_is_nil();
- myDlg->setTitile( myToCreate, myIsMesh );
- myDlg->setObjectShown( SMESHGUI_MeshDlg::Mesh, !submeshVar->_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<SMESH::SMESH_subMesh>( 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( SMESHOp::OpEditMeshOrSubMesh );
- 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<SMESH::SMESH_subMesh>( 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<SMESH::SMESH_Mesh>( 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<SMESH::SMESH_Mesh>( pMesh );
+ if ( !mesh->_is_nil() )
+ enable = /*( shapeDim > 1 ) && */( mesh->NbEdges() > 0 );
}
- myMaxShapeDim = -1;
- //Hide labels and fields (Mesh and 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 );
}
- int curIndex = myDlg->currentMeshType( );
- QStringList TypeMeshList;
- createMeshTypeList( TypeMeshList );
- setAvailableMeshType( TypeMeshList );
- curIndex =( curIndex >= TypeMeshList.count() ) ? 0 : curIndex;
- myDlg->setCurrentMeshType( curIndex );
- setFilteredAlgoData( myMaxShapeDim, curIndex);
+
+ setFilteredAlgoData();
+
}
catch ( const SALOME::SALOME_Exception& S_ex )
{
{
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<SMESH::SMESH_Mesh>( pMesh );
if ( !mesh->_is_nil() && CORBA::is_nil( mesh->GetShapeToMesh() )) {
theMess = tr( "IMPORTED_MESH" );
}*/
// Geom
- if ( myToCreate )
+ if ( myToCreate || myIsInvalidSubMesh )
{
QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
if ( aGeomEntry.isEmpty() )
}
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" );
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" );
//================================================================================
/*!
* \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,
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 check compatibility of the geometry
- * \param theAlgoData - to select hypos able to be used by this algo
- * \param theCurrentGeomToSelect - the current name of the selected geometry
- * \param theGeomVar - currently selected geometry
- * \retval bool - check result
+ * \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,
- QString theCurrentGeomToSelect,
- GEOM::GEOM_Object_var theGeomVar)
+ const int theDim)
{
- if ( theGeomVar->_is_nil() )
+ if ( theDim < 1 || myGeom->_is_nil() )
return true;
bool isApplicable = false;
- if ( theCurrentGeomToSelect == myLastGeomToSelect && !theCurrentGeomToSelect.isEmpty() ) {
- THypLabelIsAppMap::const_iterator iter = myHypMapIsApplicable.find( theAlgoData->Label );
- if ( iter != myHypMapIsApplicable.end() && iter.key() == theAlgoData->Label ) {
- isApplicable = iter.value();
+ if ( myGeomEntry == myLastGeomEntry && !myGeomEntry.isEmpty() ) {
+ THypLabelIsAppMap::const_iterator lab2isApp = myHypMapIsApplicable.find( theAlgoData->TypeName );
+ if ( lab2isApp != myHypMapIsApplicable.end() ) {
+ isApplicable = lab2isApp.value();
return isApplicable;
}
}
bool toCheckIsApplicableToAll = !myIsMesh;
if ( toCheckIsApplicableToAll )
- toCheckIsApplicableToAll = ( theGeomVar->GetType() == GEOM_GROUP );
- isApplicable = SMESH::IsApplicable( theAlgoData->TypeName, theGeomVar, toCheckIsApplicableToAll );
- myHypMapIsApplicable.insert( theAlgoData->Label, isApplicable );
+ toCheckIsApplicableToAll = ( myGeom->GetType() == GEOM_GROUP );
+
+ isApplicable = SMESH::IsApplicable( theAlgoData->TypeName, myGeom, toCheckIsApplicableToAll );
+ myHypMapIsApplicable.insert( theAlgoData->TypeName, isApplicable );
return isApplicable;
}
//================================================================================
/*!
* \brief check compatibility of the mesh type
- * \param theAlgoData - to select hypos able to be used by this algo
- * \param theMeshType - type of mesh for filtering algorithms
- * \retval bool - check result
+ * \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,
- QString theMeshType)
+ const int theDim)
{
- bool isAvailableAlgo = ( theAlgoData->OutputTypes.count() == 0 );
+ 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 == theMeshType ) {
+ for ( ; inElemType != theAlgoData->OutputTypes.end(); inElemType++ )
+ {
+ if ( *inElemType == elemType )
+ {
isAvailableAlgo = true;
break;
}
//================================================================================
/*!
- * \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 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)
+ * \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,
THypDataList& theDataList,
HypothesisData* thePrevAlgoData,
HypothesisData* theNextAlgoData,
- const QString& theMeshType)
+ const QString& /*theMeshType*/)
{
theDataList.clear();
theHyps.clear();
bool isAux = ( theHypType >= AddHyp );
QStringList aHypTypeNameList = SMESH::GetAvailableHypotheses( isAlgo, theDim, isAux, myIsOnGeometry, !myIsMesh );
- GEOM::GEOM_Object_var aGeomVar;
- QString aCurrentGeomToSelect;
- if ( !theMeshType.isEmpty() ) {
- aCurrentGeomToSelect = myDlg->selectedObject( myToCreate ? SMESHGUI_MeshDlg::Geom : SMESHGUI_MeshDlg::Obj );
- if ( _PTR(SObject) so = studyDS()->FindObjectID( aCurrentGeomToSelect.toLatin1().data() )) {
- aGeomVar = SMESH::GetGeom( so );
- }
- if ( aCurrentGeomToSelect != myLastGeomToSelect )
- myHypMapIsApplicable.clear();
- }
-
std::multimap< double, HypothesisData* > sortedHyps;
QStringList::const_iterator anIter;
for ( anIter = aHypTypeNameList.begin(); anIter != aHypTypeNameList.end(); ++anIter )
{
HypothesisData* aData = SMESH::GetHypothesisData( *anIter );
- if ( ( isCompatible ( thePrevAlgoData, aData, theHypType ) &&
- isCompatible ( theNextAlgoData, aData, theHypType ) ) ||
- ( theMeshType == "ANY" && aData->InputTypes.isEmpty()))
+ if ( isCompatible( thePrevAlgoData, aData, theHypType ) &&
+ isCompatible( theNextAlgoData, aData, theHypType ) &&
+ isCompatibleToGeometry( aData, theDim ) &&
+ isCompatibleToMeshType( aData, theDim ))
{
- if ( ( !theMeshType.isEmpty() ) &&
- ( theDim >= SMESH::DIM_2D ) &&
- ( ( theMeshType != "ANY" && !isCompatibleToMeshType( aData, theMeshType )) ||
- !isCompatibleToGeometry( aData, aCurrentGeomToSelect, aGeomVar )))
- continue;
-
int groupID = aData->GroupID;
int priority = aData->Priority;
if ( groupID < 0 || groupID > 9 ) groupID = 9;
theHyps.append( aData->Label );
}
}
-
- if ( !theMeshType.isEmpty() && !aCurrentGeomToSelect.isEmpty() )
- myLastGeomToSelect = aCurrentGeomToSelect;
}
//================================================================================
* \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)
+ * 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.
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();
*/
//================================================================================
SMESH::SMESH_Hypothesis_var
-SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType,
- const QString& aServerLib ) const
+SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType,
+ const QString& aServerLib,
+ const SMESH::HypInitParams* aParams ) const
{
if ( aHypType.isEmpty() || aServerLib.isEmpty() )
return SMESH::SMESH_Hypothesis::_nil();
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;
{
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();
}
}
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() );
}
}
}
- SMESH::SMESH_Hypothesis_var hyp =
- SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toLatin1().data(),
- aServerLib.toLatin1().data(),
- aMeshVar,
- aGeomVar,
- /*byMesh = */isSubMesh);
- if ( hyp->_is_nil() && isSubMesh )
+ SMESH::HypInitParams initParams;
+ enum { BY_MESH, BY_GEOM, BY_AVERAGE_LENGTH }; // same as ::SMESH_Hypothesis::InitWay
+ if ( aParams )
+ {
+ initParams = *aParams;
+ }
+ else
+ {
+ initParams.way = isSubMesh ? BY_MESH : BY_GEOM;
+ }
+
+ SMESH::SMESH_Hypothesis_var hyp;
+ if ( initParams.way == BY_AVERAGE_LENGTH )
+ hyp = SMESHGUI::GetSMESHGen()->CreateHypothesisByAverageLength( aHypType.toUtf8().data(),
+ aServerLib.toUtf8().data(),
+ initParams.averageLength,
+ initParams.quadDominated );
+ else
+ hyp = SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toUtf8().data(),
+ aServerLib.toUtf8().data(),
+ aMesh,
+ aGeomVar,
+ initParams );
+ if ( hyp->_is_nil() && initParams.way == BY_MESH )
+ {
+ initParams.way = BY_GEOM;
hyp = SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toLatin1().data(),
- aServerLib.toLatin1().data(),
- aMeshVar,
+ aServerLib.toUtf8().data(),
+ aMesh,
aGeomVar,
- /*byMesh = */false);
+ initParams );
+ }
+ if ( hyp->_is_nil() && initParams.way == BY_GEOM )
+ {
+ initParams.way = BY_AVERAGE_LENGTH;
+ initParams.averageLength = 1.;
+ hyp = SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toLatin1().data(),
+ aServerLib.toUtf8().data(),
+ aMesh,
+ aGeomVar,
+ initParams );
+ }
return hyp;
}
aMeshEntry = aGeomEntry;
if ( aMeshEntry != aGeomEntry ) { // Get Geom object from Mesh of a sub-mesh being edited
- _PTR(SObject) pObj = studyDS()->FindObjectID( aMeshEntry.toLatin1().data() );
+ _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 = studyDS()->FindObjectID( anObjEntry.toLatin1().data() );
+ _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.toUtf8().data() );
bool isMesh;
GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj, &isMesh );
if ( !aGeomVar->_is_nil() )
if ( anObjEntry != "" && aGeomEntry != "" && aMeshEntry == "" ) {
// take geometry from submesh being created
- _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() );
+ _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 aMeshVar = aSubMeshVar->GetFather();
- if ( !aMeshVar->_is_nil() ) {
- _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar );
+ 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() );
//================================================================================
/*!
- * \Brief Returns tab dimention
+ * \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 )
/*!
* \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
//================================================================================
/*!
- * Create hypothesis and update dialog.
- * \param theDim - dimension of hypothesis to be created
- * \param theType - hypothesis category (algorithm, hypothesis, additional hypothesis)
- * \param theTypeName - specifies hypothesis to be created
+ * \brief Return names of all existing hypotheses
*/
//================================================================================
-void SMESHGUI_MeshOp::createHypothesis(const int theDim,
- const int theType,
- const QString& theTypeName)
-{
- HypothesisData* aData = SMESH::GetHypothesisData(theTypeName);
- if (!aData)
- return;
-
- myDim = theDim;
- myType = theType;
- // get a unique hyp name
+QStringList SMESHGUI_MeshOp::getHypoNames()
+{
QStringList aHypNames;
+
TDim2Type2HypList::const_iterator aDimIter = myExistingHyps.begin();
for ( ; aDimIter != myExistingHyps.end(); aDimIter++) {
const TType2HypList& aType2HypList = aDimIter.value();
}
}
}
- QString aHypName = GetUniqueName( aHypNames, aData->Label);
+ return aHypNames;
+}
+
+//================================================================================
+/*!
+ * Create hypothesis and update dialog.
+ * \param theDim - dimension of hypothesis to be created
+ * \param theType - hypothesis category (algorithm, hypothesis, additional hypothesis)
+ * \param theTypeName - specifies hypothesis to be created
+ */
+//================================================================================
+void SMESHGUI_MeshOp::createHypothesis(const int theDim,
+ const int theType,
+ const QString& theTypeName)
+{
+ HypothesisData* aData = SMESH::GetHypothesisData(theTypeName);
+ if (!aData)
+ return;
+
+ myDim = theDim;
+ myType = theType;
+
+ // get a unique hyp name
+ QString aHypName = GetUniqueName( getHypoNames(), aData->Label);
// existing hypos
bool dialog = false;
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 ));
for (int i = nbHyp; i < aNewHyps.count(); i++)
myDlg->tab(myDim)->addHyp(myType, aNewHyps[i]);
}
-
- if( result!=2 && myHypoSet )
- processSet();
+ return;
}
//================================================================================
* 1 = accepted
*/
//================================================================================
-void SMESHGUI_MeshOp::onHypoEdited( int result )
+void SMESHGUI_MeshOp::onHypoEdited( int /*result*/ )
{
int obj = myDlg->getActiveObject();
onActivateObject( obj ); // Issue 0020170. Restore filters
* \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,
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
+ algosAvailable.clear();
+ 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,
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;
algoByDim[ aDim ] = algoData;
QStringList anAvailable;
+ const int algoDim = aDim;
- // enable / disable tabs
- if ( myIsOnGeometry ) {
- for (int i = SMESH::DIM_3D; i >= SMESH::DIM_0D; i--) {
- if ( i > aDim ) {
- if ( i > myMaxShapeDim ) myDlg->disableTab( i );
- else myDlg->enableTab( i );
- }
- else if ( i == aDim ) {
- continue;
- }
- else {//( i < aDim )
- if ( algoData && algoData->InputTypes.isEmpty() ) {
- myDlg->disableTab( i );
- for ( int type = Algo, nbTypes = nbDlgHypTypes(i); type < nbTypes; type++ )
- setCurrentHyp(i, type, -1);
- }
- else {
- myDlg->enableTab( i );
- }
- }
- }
- }
-
- int algoDim = aDim;
- HypothesisData* a3DAlgo = 0;
- // 2 loops: backward and forward from algo dimension
- for ( int forward = 0; forward <= 1; ++forward )
+ // 2 loops: backward and forward from algo dimension (forward == to higher dimension)
+ for ( int forward = 1; forward >= 0; --forward )
{
- int dim = algoDim + 1, lastDim = SMESH::DIM_3D, dir = 1;
+ int dim = algoDim, lastDim = SMESH::DIM_3D, dir = 1;
if ( !forward ) {
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;
- }
- HypothesisData* nextAlgo = 0;
- if ( myMaxShapeDim == SMESH::DIM_3D && a3DAlgo && dim == SMESH::DIM_2D ) {
- nextAlgo = a3DAlgo;
- }
- // get currently selected algo
- int algoIndex = currentHyp( dim, Algo );
- HypothesisData* curAlgo = hypData( dim, Algo, algoIndex );
-
- QString anCompareType = currentMeshTypeName(myDlg->currentMeshType());
- QString anCurrentCompareType = "";
- if ( dim == SMESH::DIM_3D || anCompareType == "ANY" )
- anCurrentCompareType = anCompareType;
- else if ( dim == SMESH::DIM_2D ) {
- anCurrentCompareType = (anCompareType == "HEXA" || anCompareType == "QUAD") ? "QUAD" : "TRIA";
- nextAlgo = 0;
- }
- // set new available algorithms
- availableHyps( dim, Algo, anAvailable, myAvailableHypData[dim][Algo], prevAlgo, nextAlgo, anCurrentCompareType);
- HypothesisData* soleCompatible = 0;
- if ( anAvailable.count() == 1 )
- soleCompatible = myAvailableHypData[dim][Algo][0];
- myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable );
- noCompatible = anAvailable.isEmpty();
- algoIndex = myAvailableHypData[dim][Algo].indexOf( curAlgo );
- if ( !isSubmesh && algoIndex < 0 && soleCompatible && !forward && dim != SMESH::DIM_0D) {
- // select the sole compatible algo
- algoIndex = 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 );
}
- setCurrentHyp( dim, Algo, algoIndex );
- // remember current algo
- prevAlgo = algoByDim[ dim ] = hypData( dim, Algo, algoIndex );
+ // activate tabs according to algorithms availability
+ if ( anAvailable.isEmpty() ) myDlg->disableTab( dim );
+ else myDlg->enableTab( dim );
} // loop on dims
-
- if ( myMaxShapeDim == SMESH::DIM_3D && forward && algoDim == SMESH::DIM_1D )
- {
- algoDim = SMESH::DIM_3D;
- forward = -1;
- a3DAlgo = prevAlgo;
- continue;
- }
} // 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++ )
{
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 );
- QString curHypType = SMESH::toQStr( curHyp->GetName() );
if ( !algoDeselectedByUser &&
myObjHyps[ dim ][ type ].count() > 0 &&
curHypType == SMESH::toQStr( myObjHyps[ dim ][ type ].first().first->GetName()) )
{
- HypothesisData* hypData = SMESH::GetHypothesisData( SMESH::toQStr( 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( SMESH::toQStr( curHyp->GetName() ));
- if ( !isCompatible( curAlgo, hypData, type ))
- curHyp = SMESH::SMESH_Hypothesis::_nil();
- }
- availableHyps( dim, type, anAvailable, myAvailableHypData[ dim ][ type ], curAlgo);
- existingHyps( dim, type, pObj, anExisting, myExistingHyps[ dim ][ type ], curAlgo);
- defaulHypAvlbl = (type == MainHyp && !curAlgo->IsAuxOrNeedHyp );
+ 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
if ( dlgType <= AddHyp )
hypIndex = this->find( curHyp, myExistingHyps[ dim ][ type ]);
else
hypIndex = -1;
- if ( !isSubmesh && myToCreate && 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;
setCurrentHyp( dim, dlgType, hypIndex );
}
}
+ return;
}
//================================================================================
/*!
- * \brief Creates and selects hypothesis of hypotheses set
- * \param theSetName - The name of hypotheses set
+ * \brief Create a sub-mesh on internal edges in the case where the global algorithm
+ * is of type 1D-2D[-3D] so that the internal edges would remain not meshed.
*/
//================================================================================
-void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName )
+
+void SMESHGUI_MeshOp::createSubMeshOnInternalEdges( SMESH::SMESH_Mesh_ptr theMesh,
+ GEOM::GEOM_Object_ptr theMainShape )
{
- myHypoSet = SMESH::GetHypothesesSet(theSetName);
- if (!myHypoSet)
+ if ( theMesh->_is_nil() || theMainShape->_is_nil() )
return;
- // clear all hyps
- for (int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++) {
- setCurrentHyp(dim, Algo, -1);
- setCurrentHyp(dim, AddHyp, -1);
- setCurrentHyp(dim, MainHyp, -1);
+ if ( isAccessibleDim( 1 ))
+ return; // global 1D algorithm is/can be assigned
+
+ const HypothesesSet::SetType internSet = HypothesesSet::INTERN;
+ bool toCreate = true;
+ bool toCreateMandatory = ( myHypoSet &&
+ myAverageSize > 0 &&
+ ( myHypoSet->init( /*algo=*/ true, internSet ), myHypoSet->more()) &&
+ ( myHypoSet->init( /*algo=*/false, internSet ), myHypoSet->more()));
+ if ( !toCreateMandatory ) // ask the user
+ toCreate = false; // can't pass both mesh and geometry to Create Submesh operation (so far?)
+ // toCreate = SUIT_MessageBox::warning( SMESHGUI::desktop(),
+ // QObject::tr("SMESH_WRN_WARNING"),
+ // QObject::tr("SMESH_CREATE_SUBMESH_ON_INTERNAL_EDGES"),
+ // QObject::tr("SMESH_BUT_YES"),
+ // QObject::tr("SMESH_BUT_NO"), 1, 0);
+ if ( !toCreate )
+ return;
+
+ TopoDS_Shape shape;
+ if ( !GEOMBase::GetShape( theMainShape, shape ))
+ return;
+
+ std::vector< TopoDS_Shape > internalEdges;
+ for ( TopExp_Explorer edge( shape, TopAbs_EDGE, TopAbs_WIRE ); edge.More(); edge.Next() )
+ internalEdges.push_back( edge.Current() );
+
+ if ( internalEdges.empty() )
+ return;
+
+ TopTools_IndexedMapOfShape shapeIDs;
+ TopExp::MapShapes( shape, shapeIDs );
+
+ std::set< int > intIDSet;
+ for ( size_t i = 0; i < internalEdges.size(); ++i )
+ intIDSet.insert( shapeIDs.FindIndex( internalEdges[ i ]));
+
+ GEOM::GEOM_Gen_var geomGen = theMainShape->GetGen();
+ if (geomGen->_is_nil()) return;
+
+ GEOM::GEOM_Object_var edgeGroup;
+ GEOM::GEOM_IShapesOperations_wrap sOp = geomGen->GetIShapesOperations();
+ GEOM::GEOM_IGroupOperations_wrap gOp = geomGen->GetIGroupOperations();
+ GEOM::ListOfGO_var geomGroups = sOp->GetExistingSubObjects( theMainShape,
+ /*groupsOnly=*/true );
+ for ( CORBA::ULong i = 0; i < geomGroups->length(); ++i )
+ {
+ GEOM::ListOfLong_var ids = gOp->GetObjects( geomGroups[ i ]);
+ std::set< int > idSet( & ids[0], & ids[0] + ids->length() );
+ if ( idSet == intIDSet )
+ {
+ edgeGroup = geomGroups[ i ];
+ break;
+ }
}
- myHypoSet->init(true); //algorithms
- processSet();
- myHypoSet->init(false); //hypotheses
- processSet();
- myHypoSet = 0;
+ if ( edgeGroup->_is_nil() )
+ {
+ GEOM::GEOM_Object_var edgeGroup = gOp->CreateGroup( theMainShape, TopAbs_EDGE );
+
+ GEOM::ListOfLong_var edgeIDs = new GEOM::ListOfLong;
+ edgeIDs->length( internalEdges.size() );
+ std::set< int >::iterator id = intIDSet.begin();
+ for ( size_t i = 0; i < intIDSet.size(); ++i, ++id )
+ edgeIDs[ i ] = *id;
+ gOp->UnionIDs( edgeGroup, edgeIDs );
+
+ SALOMEDS::SObject_wrap so = geomGen->AddInStudy( edgeGroup, "Internal edges", theMainShape );
+ }
+
+ if ( !toCreateMandatory )
+ {
+ // show Create Sub-mesh dislog
+ // _PTR(SObject) aMeshSO = SMESH::FindSObject( theMesh );
+ // selectionMgr()->clearFilters();
+ // selectObject( pSubmesh );
+ // SMESHGUI::GetSMESHGUI()->switchToOperation( SMESHOp::OpEditMeshOrSubMesh );
+ return;
+ }
+
+ // create a sub-mesh using myAverageSize w/o GUI
+
+ SMESH::SMESH_subMesh_var subMesh = theMesh->GetSubMesh( edgeGroup, "" );
+
+ for ( int isAlgo = 1; isAlgo >= 0; --isAlgo )
+ for ( myHypoSet->init( isAlgo, internSet ); myHypoSet->more(); myHypoSet->next() )
+ {
+ QString aHypoTypeName = myHypoSet->current();
+ HypothesisData* aHypData = SMESH::GetHypothesisData( aHypoTypeName );
+ if ( !aHypData )
+ continue;
+
+ myDim = aHypData->Dim[0];
+ if ( myDim != 1 )
+ continue;
+
+ // create or/and set
+ SMESH::SMESH_Hypothesis_var newHypo;
+ if ( isAlgo )
+ {
+ myAvailableHypData[ myDim ][ Algo ].clear();
+ myAvailableHypData[ myDim ][ Algo ] << aHypData;
+ QStringList hypList; hypList << aHypoTypeName;
+ myDlg->tab( myDim )->setAvailableHyps( Algo, hypList );
+ setCurrentHyp( myDim, Algo, 0 );
+ newHypo = getAlgo( myDim );
+ }
+ else
+ {
+ SMESH::HypInitParams params = { 2, myAverageSize, false };
+ newHypo = getInitParamsHypothesis( aHypData->TypeName, aHypData->ServerLibName, & params );
+ QString hypName = GetUniqueName( getHypoNames(), aHypData->Label );
+ SALOMEDS::SObject_wrap so =
+ SMESHGUI::GetSMESHGen()->PublishInStudy( SALOMEDS::SObject::_nil(), newHypo,
+ hypName.toUtf8().data() );
+ }
+ SMESH::AddHypothesisOnSubMesh( subMesh, newHypo );
+ }
+
+ return;
}
//================================================================================
/*!
- * \brief One step of hypothesis/algorithm list creation
- *
- * Creates a hypothesis or an algorithm for current item of internal list of names myHypoSet
+ * \brief Ask the user to enter an average size which will be used to create
+ * hypotheses of a hypo-set basing on this size
+ * \param [out] averageSize - average element size
+ * \return bool - false if the user canceled the dialog
*/
//================================================================================
-void SMESHGUI_MeshOp::processSet()
+
+bool SMESHGUI_MeshOp::getAverageSize( double & averageSize )
{
- myHypoSet->next();
- if( !myHypoSet->more() )
+ HypothesisData* hypData = SMESH::GetHypothesisData( "MaxLength" );
+ if ( !hypData )
+ return false;
+
+ SMESH::SMESH_Hypothesis_var hyp = getInitParamsHypothesis( hypData->TypeName,
+ hypData->ServerLibName );
+ if ( hyp->_is_nil() )
+ return false;
+
+ SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator( hypData->TypeName );
+ if ( !aCreator )
+ return false;
+
+ initHypCreator( aCreator );
+ myDlg->setEnabled( false );
+
+ aCreator->edit( hyp.in(), HypothesesSet::getCommonHypoSetHypoType(),
+ dlg(), this, SLOT( onHypoEdited( int )));
+
+ StdMeshers::StdMeshers_MaxLength_var lenHyp = StdMeshers::StdMeshers_MaxLength::_narrow( hyp );
+ if ( lenHyp->_is_nil() )
+ return false;
+
+ averageSize = lenHyp->GetLength();
+ return true;
+}
+
+//================================================================================
+/*!
+ * \brief Creates and selects hypothesis of hypotheses set
+ * \param theSetName - The name of hypotheses set
+ */
+//================================================================================
+void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName )
+{
+ HypothesesSet* aHypoSet = SMESH::GetHypothesesSet(theSetName);
+ myHypoSet = aHypoSet;
+ if (!aHypoSet)
return;
- bool isAlgo = myHypoSet->isAlgo();
- QString aHypoTypeName = myHypoSet->current();
- HypothesisData* aHypData = SMESH::GetHypothesisData(aHypoTypeName);
- if (!aHypData)
+ // clear all hyps
+ for (int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++)
{
- processSet();
- return;
+ setCurrentHyp(dim, Algo, -1);
+ setCurrentHyp(dim, AddHyp, -1);
+ setCurrentHyp(dim, MainHyp, -1);
+ onAlgoSelected( -1, dim );
}
- int aDim = aHypData->Dim[0];
- // create or/and set
- if (isAlgo)
+ HypothesesSet::SetType setType = aHypoSet->getPreferredHypType();
+ if ( !aHypoSet->getAlgoAvailable( setType ))
{
- int index = myAvailableHypData[aDim][Algo].indexOf( aHypData );
- if ( index < 0 )
- {
- 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();
+ setType = ( setType == HypothesesSet::ALT ) ? HypothesesSet::MAIN : HypothesesSet::ALT;
+ if ( !aHypoSet->getAlgoAvailable( setType ))
+ return;
}
- 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 )
+
+ myAverageSize = -1;
+ if ( aHypoSet->toUseCommonSize() && !getAverageSize( myAverageSize ))
+ return;
+
+ int maxDim = -1;
+ for ( int isAlgo = 1; isAlgo >= 0; --isAlgo )
+ for ( aHypoSet->init( isAlgo, setType ); aHypoSet->more(); aHypoSet->next() )
{
- mainHyp = false;
- index = myAvailableHypData[aDim][AddHyp].indexOf( aHypData );
+ QString aHypoTypeName = aHypoSet->current();
+ HypothesisData* aHypData = SMESH::GetHypothesisData( aHypoTypeName );
+ if (!aHypData)
+ continue;
+
+ myDim = aHypData->Dim[0];
+ // create or/and set
+ if ( isAlgo )
+ {
+ int index = myAvailableHypData[myDim][Algo].indexOf( aHypData );
+ if ( index >= 0 )
+ {
+ setCurrentHyp( myDim, Algo, index );
+ onAlgoSelected( index, myDim );
+ maxDim = Max( maxDim, myDim );
+ }
+ }
+ else
+ {
+ myType = MainHyp;
+ int index = myAvailableHypData[myDim][MainHyp].indexOf( aHypData );
+ if ( index < 0 )
+ {
+ myType = AddHyp;
+ index = myAvailableHypData[myDim][AddHyp].indexOf( aHypData );
+ }
+ if ( index >= 0 )
+ {
+ if ( myAverageSize > 0 )
+ {
+ SMESH::HypInitParams params = { 2, myAverageSize, aHypoSet->isQuadDominated() };
+ SMESH::SMESH_Hypothesis_var hyp =
+ getInitParamsHypothesis( aHypData->TypeName, aHypData->ServerLibName, & params );
+
+ QString hypName = GetUniqueName( getHypoNames(), aHypData->Label );
+ SALOMEDS::SObject_wrap so =
+ SMESHGUI::GetSMESHGen()->PublishInStudy( SALOMEDS::SObject::_nil(), hyp,
+ hypName.toUtf8().data() );
+ onHypoCreated(2);
+ }
+ else
+ {
+ createHypothesis( myDim, myType, aHypoTypeName );
+ }
+ }
+ }
}
- if (index >= 0)
- createHypothesis(aDim, mainHyp ? MainHyp : AddHyp, aHypoTypeName);
- else
- processSet();
- }
+
+ if ( maxDim > 0 )
+ myDlg->setCurrentTab( maxDim );
+
+ 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 )
if ( aSMESHGen->_is_nil() )
return false;
- SMESH::SMESH_Mesh_var aMeshVar= aSMESHGen->CreateEmptyMesh();
- if ( aMeshVar->_is_nil() )
+ SMESH::SMESH_Mesh_var aMesh= aSMESHGen->CreateEmptyMesh();
+ 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() );
namePrefix += "_";
}
QStringList::Iterator it = aList.begin();
- for ( int i = 0; it!=aList.end(); it++, ++i )
+ 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() );
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 ) {
theEntryList.append( aMeshSO->GetID().c_str() );
if ( i > 0 ) setDefaultName( namePrefix );
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 );
+ }
+
+
+ if ( myDlg->toCreateAllGroups() && !aGeomVar->_is_nil() )
+ {
+ // Create groups on all geom groups
+
+ GEOM::GEOM_Gen_var geomGen = aGeomVar->GetGen();
+ GEOM::GEOM_IShapesOperations_wrap op = geomGen->GetIShapesOperations();
+ GEOM::ListOfGO_var geomGroups = op->GetExistingSubObjects( aGeomVar,
+ /*groupsOnly=*/false );
+ SMESH::SMESH_GroupOnGeom_var meshGroup;
+ for ( CORBA::ULong iG = 0; iG < geomGroups->length(); ++iG )
+ {
+ SMESH::ElementType elemType = SMESHGUI_GroupOnShapeOp::ElementType( geomGroups[ iG ] );
+ if ( elemType == SMESH::ALL )
+ continue;
+ if ( elemType == SMESH::ELEM0D )
+ elemType = SMESH::NODE;
+
+ CORBA::String_var name = geomGroups[ iG ]->GetName();
+ meshGroup = aMesh->CreateGroupFromGEOM( elemType, name, geomGroups[ iG ]);
+ // if ( elemType != SMESH::NODE )
+ // meshGroup = aMesh->CreateGroupFromGEOM( SMESH::NODE, name, geomGroups[ iG ]);
+ }
}
+
+ createSubMeshOnInternalEdges( aMesh, aGeomVar );
+
}
+
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 )
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<SMESH::SMESH_Mesh>( myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh ));
+ if ( aMesh->_is_nil() && myIsInvalidSubMesh )
+ {
+ SMESH::SMESH_subMesh_var aSMVar =
+ SMESH::EntryToInterface<SMESH::SMESH_subMesh>( 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);
{
//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_wrap op =
- geomGen->GetIGroupOperations(aStudy->StudyId());
- if (!op->_is_nil()) {
+ GEOM::GEOM_Gen_var geomGen = mainGeom->GetGen();
+ 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
int iSubSh = 0;
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();
// publish the GEOM group in study
QString aNewGeomGroupName ("Auto_group_for_");
aNewGeomGroupName += aName;
- SALOMEDS::Study_var aStudyVar = _CAST(Study, aStudy)->GetStudy();
SALOMEDS::SObject_wrap aNewGroupSO =
- geomGen->AddInStudy( aStudyVar, aGeomVar,
- aNewGeomGroupName.toLatin1().data(), mainGeom);
+ geomGen->AddInStudy( aGeomVar,
+ aNewGeomGroupName.toUtf8().data(), mainGeom);
}
}
}
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() );
}
selectObject( _PTR(SObject)() );
selectionDone();
- checkSubMeshConcurrency( aMeshVar, aSubMeshVar, /*askUser=*/true );
+ 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;
}
//================================================================================
{
QString aResName;
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+ _PTR(Study) aStudy = SMESH::getStudy();
int i = 1;
QString aPrefix = thePrefix;
do
{
aResName = aPrefix + QString::number( i++ );
- anObj = aStudy->FindObject( aResName.toLatin1().data() );
+ anObj = aStudy->FindObject( aResName.toUtf8().data() );
}
while ( anObj );
QString aHypName = dataList[ aHypIndex ]->TypeName;
// get existing algorithms
- _PTR(SObject) pObj = SMESH::GetActiveStudyDocument()->FindComponent("SMESH");
+ _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 ];
{
// Call hypothesis creation server method (without GUI)
SMESH::SMESH_Hypothesis_var aHyp =
- SMESH::CreateHypothesis(aHypName, aHypName, true);
+ SMESH::CreateHypothesis(aHypName, aHypData->Label, true);
aHyp.out();
}
else
aCreator->create( true, aHypName, myDlg, 0, QString::null );
else {
SMESH::SMESH_Hypothesis_var aHyp =
- SMESH::CreateHypothesis(aHypName, aHypName, true);
+ 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 ] );
}
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( aMeshVar, aSubMeshVar );
+ myHasConcurrentSubBefore = checkSubMeshConcurrency( aMesh, subMesh );
}
- // Get name of geometry object
- CORBA::String_var name = SMESH::GetGeomName( pObj );
- if ( name.in() )
- myDlg->setObjectText( SMESHGUI_MeshDlg::Geom, name.in() );
+ if ( !myIsInvalidSubMesh )
+ {
+ // 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 lastDim = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_3D;
+ QStringList anExisting, anAvailable;
bool algoFound = false;
- for ( int dim = SMESH::DIM_3D; dim >= lastDim; --dim )
+ 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( SMESH::toQStr( aVar->GetName() ));
- aHypIndex = myAvailableHypData[ dim ][ Algo ].indexOf ( algoData );
+ 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 );
// }
algoFound = ( aHypIndex > -1 );
}
+ myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable );
setCurrentHyp( dim, Algo, aHypIndex );
// set existing and available hypothesis according to the selected algo
if ( aHypIndex > -1 || !algoFound )
// get hypotheses
bool hypWithoutAlgo = false;
- for ( int dim = SMESH::DIM_3D; dim >= lastDim; --dim )
+ for ( int dim = dim1st; dim <= SMESH::DIM_3D; ++dim )
{
for ( int hypType = MainHyp; hypType <= AddHyp; hypType++ )
{
}
// 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 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 )
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;
// 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++ )
SALOMEDS_SObject* aSObject = _CAST(SObject, pObj);
CORBA::Object_var anObject = aSObject->GetObject();
- SMESH::SMESH_Mesh_var aMeshVar = SMESH::SMESH_Mesh::_narrow( anObject );
+ SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( anObject );
SMESH::SMESH_subMesh_var aSubMeshVar = SMESH::SMESH_subMesh::_narrow( anObject );
- bool isMesh = !aMeshVar->_is_nil();
+ bool isMesh = !aMesh->_is_nil();
if ( !isMesh && !aSubMeshVar->_is_nil() )
- aMeshVar = aSubMeshVar->GetFather();
+ aMesh = aSubMeshVar->GetFather();
// Assign new algorithms and hypotheses
for ( int dim = aDim; dim <= SMESH::DIM_3D; dim++ )
myObjHyps[ dim ][ Algo ].count() == 0 ) // no algo assigned
{
if ( isMesh )
- SMESH::AddHypothesisOnMesh( aMeshVar, anAlgoVar );
+ SMESH::AddHypothesisOnMesh( aMesh, anAlgoVar );
else if ( !aSubMeshVar->_is_nil() )
SMESH::AddHypothesisOnSubMesh( aSubMeshVar, anAlgoVar );
if ( !isAssigned )
{
if ( isMesh )
- SMESH::AddHypothesisOnMesh (aMeshVar, hyp );
+ SMESH::AddHypothesisOnMesh (aMesh, hyp );
else if ( !aSubMeshVar->_is_nil() )
SMESH::AddHypothesisOnSubMesh ( aSubMeshVar, hyp );
}
}
}
+ if ( aSubMeshVar->_is_nil() )
+ {
+ GEOM::GEOM_Object_var mainGeom = aMesh->GetShapeToMesh();
+ createSubMeshOnInternalEdges( aMesh, mainGeom );
+ }
+
myHasConcurrentSubBefore =
- checkSubMeshConcurrency( aMeshVar, aSubMeshVar, /*askUser=*/!myHasConcurrentSubBefore );
+ checkSubMeshConcurrency( aMesh, aSubMeshVar, /*askUser=*/!myHasConcurrentSubBefore );
return true;
}
*
* 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.
*/
//================================================================================
}
// 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();
}
}
if ( !aGeomVar->_is_nil() )
{
QString ID = SMESH::toQStr( aGeomVar->GetStudyEntry() );
- if ( _PTR(SObject) aGeomSO = studyDS()->FindObjectID( ID.toLatin1().data() )) {
+ if ( _PTR(SObject) aGeomSO = SMESH::getStudy()->FindObjectID( ID.toUtf8().data() )) {
selectObject( aGeomSO );
selectionDone();
}
}
//================================================================================
/*!
- * \brief Create available list types of mesh
- * \param theTypeMesh - Output list of available types of mesh
+ * \brief Update available list of mesh types
*/
//================================================================================
-void SMESHGUI_MeshOp::createMeshTypeList( QStringList& theTypeMesh)
+void SMESHGUI_MeshOp::updateMeshTypeList()
{
- theTypeMesh.clear();
- theTypeMesh.append( tr( "MT_ANY" ) );
+ QStringList meshTypes;
+ meshTypes.append( tr( "MT_ANY" ) );
if ( myMaxShapeDim >= 2 || myMaxShapeDim == -1 )
{
- theTypeMesh.append( tr( "MT_TRIANGULAR" ) );
- theTypeMesh.append( tr( "MT_QUADRILATERAL" ) );
+ meshTypes.append( tr( "MT_TRIANGULAR" ) );
+ meshTypes.append( tr( "MT_QUADRILATERAL" ) );
}
if ( myMaxShapeDim == 3 || myMaxShapeDim == -1 )
{
- theTypeMesh.append( tr( "MT_TETRAHEDRAL" ) );
- theTypeMesh.append( tr( "MT_HEXAHEDRAL" ) );
+ meshTypes.append( tr( "MT_TETRAHEDRAL" ) );
+ meshTypes.append( tr( "MT_HEXAHEDRAL" ) );
}
-}
-//================================================================================
-/*!
- * \brief Set available types of mesh
- * \param theTypeMesh - List of available types of mesh
- */
-//================================================================================
-void SMESHGUI_MeshOp::setAvailableMeshType( const QStringList& theTypeMesh )
-{
- myDlg->setAvailableMeshType( theTypeMesh );
+ myDlg->setAvailableMeshType( meshTypes );
}
//================================================================================
/*!
- * \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
+ * \brief Update available list of hypothesis sets
*/
//================================================================================
-void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int theTabIndex, const int theIndex )
+void SMESHGUI_MeshOp::updateHypoSets()
{
- setFilteredAlgoData( theTabIndex, theIndex);
-}
+ // 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 ] );
-//================================================================================
-/*!
- * \brief Set a filtered list of available algorithms by mesh type
- * \param theTabIndex - Index of current active tab
- * \param theIndex - Index of current type of mesh
- */
-//================================================================================
-void SMESHGUI_MeshOp::setFilteredAlgoData( const int theTabIndex, const int theIndex )
-{
- QStringList anAvailableAlgs;
- QString anCompareType = currentMeshTypeName( theIndex );
- int anCurrentAvailableAlgo = -1;
- bool isNone = true;
- int aDim = SMESH::DIM_3D;
- if ( theIndex == MT_TRIANGULAR || theIndex == MT_QUADRILATERAL)
- aDim = SMESH::DIM_2D;
- if ( anCompareType == "ANY" )
- {
- bool isReqDisBound = false;
- int aReqDim = SMESH::DIM_3D;
- for ( int dim = SMESH::DIM_3D; dim >= SMESH::DIM_2D; dim-- )
- {
- anCurrentAvailableAlgo = -1;
- isNone = currentHyp( dim, Algo ) < 0;
- //return current algo in current tab and set new algorithm list
- HypothesisData* algoCur = 0;
- if ( !isNone && !myAvailableHypData[dim][Algo].empty() ) {
- algoCur = myAvailableHypData[dim][Algo].at( currentHyp( dim, Algo ) );
- }
- HypothesisData* prevAlgo = 0;
- HypothesisData* nextAlgo = 0;
- if ( dim == SMESH::DIM_2D ) {
- prevAlgo = hypData( SMESH::DIM_1D, Algo, currentHyp( SMESH::DIM_1D, Algo ) );
- if ( aDim == SMESH::DIM_3D )
- nextAlgo = hypData( SMESH::DIM_3D, Algo, currentHyp( SMESH::DIM_3D, Algo ) );
- }
- // retrieves a list of available algorithms from resources
- availableHyps( dim, Algo, anAvailableAlgs, myAvailableHypData[dim][Algo], prevAlgo, nextAlgo, anCompareType);
- anCurrentAvailableAlgo = myAvailableHypData[dim][Algo].indexOf( algoCur );
- myDlg->tab( dim )->setAvailableHyps( Algo, anAvailableAlgs );
- setCurrentHyp( dim, Algo, anCurrentAvailableAlgo );
- if ( anCurrentAvailableAlgo > -1 )
- isReqDisBound = algoCur->InputTypes.isEmpty();
- if ( isReqDisBound ) {
- aReqDim = dim;
- break;
- }
- }
- if ( !myIsOnGeometry )
- for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ ) {
- if ( i < SMESH::DIM_3D ) myDlg->disableTab( i );
- else myDlg->enableTab( i );
- }
- else
- for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ ) {
- if ( i > myMaxShapeDim || ( isReqDisBound && i < aReqDim ) ) myDlg->disableTab( i );
- else myDlg->enableTab( i );
- }
- myDlg->setCurrentTab( theTabIndex );
- }
- else
- {
- HypothesisData* anCurrentAlgo = 0;
- bool isReqDisBound = true;
- QString anCurrentCompareType = anCompareType;
- isNone = currentHyp( aDim, Algo ) < 0;
- if ( !isNone && !myAvailableHypData[aDim][Algo].empty() )
- isReqDisBound = myAvailableHypData[aDim][Algo].at( currentHyp( aDim, Algo ) )->InputTypes.isEmpty();
- for ( int dim = aDim; dim >= SMESH::DIM_2D; dim-- )
- {
- bool isNoneAlg = currentHyp( dim, Algo ) < 0;
- anCurrentAvailableAlgo = -1;
- HypothesisData* prevAlgo = 0;
- HypothesisData* nextAlgo = 0;
- if ( dim == SMESH::DIM_2D ) {
- prevAlgo = hypData( SMESH::DIM_1D, Algo, currentHyp( SMESH::DIM_1D, Algo ) );
- if ( aDim == SMESH::DIM_3D )
- nextAlgo = hypData( SMESH::DIM_3D, Algo, currentHyp( SMESH::DIM_3D, Algo ) );
- }
- // finding algorithm which is selected
- if ( !isNoneAlg ) {
- anCurrentAlgo = myAvailableHypData[dim][Algo].at( currentHyp( dim, Algo ) );
- }
- // retrieves a list of available algorithms from resources
- availableHyps( dim, Algo, anAvailableAlgs, myAvailableHypData[dim][Algo], prevAlgo, nextAlgo, anCurrentCompareType );
- // finding and adding algorithm depending on the type mesh
- anCurrentAvailableAlgo = myAvailableHypData[dim][Algo].indexOf( anCurrentAlgo );
- //set new algorithm list and select the current algorithm
- myDlg->tab( dim )->setAvailableHyps( Algo, anAvailableAlgs );
- anCurrentCompareType = ( anCompareType == "HEXA" || anCompareType == "QUAD" ) ? "QUAD" : "TRIA";
- setCurrentHyp( dim, Algo, anCurrentAvailableAlgo, /*updateHyps=*/true );
- }
-
- for ( int i = myMaxShapeDim; i >= SMESH::DIM_0D; i-- ) {
- bool isNoneAlg = currentHyp( i, Algo ) < 0;
- if ( !isNoneAlg )
- isReqDisBound = myAvailableHypData[i][Algo].at( currentHyp( i, Algo ) )->InputTypes.isEmpty();
- else
- isReqDisBound = true;
- if ( isReqDisBound && !isNoneAlg && i <= aDim) {
- for (int j = myMaxShapeDim; j >= SMESH::DIM_0D; j--) {
- if ( currentHyp( j, Algo ) < 0 ) {
- myDlg->disableTab( j );
- setCurrentHyp( j , Algo, -1, /*updateHyps=*/true );
- }
- }
- break;
- }
- else {
- myDlg->enableTab( i );
- }
- }
- if ( aDim == SMESH::DIM_2D) {
- setCurrentHyp( SMESH::DIM_3D, Algo, -1, /*updateHyps=*/true );
- myDlg->disableTab( SMESH::DIM_3D );
- }
-
- int currentTab = ( theTabIndex <= aDim ) ? theTabIndex : aDim;
- myDlg->setCurrentTab( currentTab );
- }
THypDataList anAvailableAlgsData;
- QStringList aHypothesesSetsList = SMESH::GetHypothesesSets( aDim );
+ QStringList aHypothesesSetsList = SMESH::GetHypothesesSets( myMaxShapeDim );
QStringList aFilteredHypothesesSetsList;
- aFilteredHypothesesSetsList.clear();
QStringList::const_iterator inHypoSetName = aHypothesesSetsList.begin();
- for ( ; inHypoSetName != aHypothesesSetsList.end(); ++inHypoSetName ) {
+ for ( ; inHypoSetName != aHypothesesSetsList.end(); ++inHypoSetName )
+ {
HypothesesSet* currentHypoSet = SMESH::GetHypothesesSet( *inHypoSetName );
- bool isAvailable = false;
- currentHypoSet->init( true );
- while ( currentHypoSet->next(), currentHypoSet->more() ) {
- isAvailable = false;
- if ( HypothesisData* algoDataIn = SMESH::GetHypothesisData( currentHypoSet->current() )) {
- for (int i = SMESH::DIM_0D; i <= myMaxShapeDim; i++) {
- int anCurrentAvailableAlgo = myAvailableHypData[i][Algo].indexOf( algoDataIn );
- if ( anCurrentAvailableAlgo > -1 ) {
- isAvailable = true;
- break;
+ HypothesesSet::SetType sType;
+ for ( sType = HypothesesSet::MAIN; sType <= HypothesesSet::ALT; SMESHUtils::Increment( sType ))
+ {
+ bool isAvailable = false;
+ for ( currentHypoSet->init( true, sType ); currentHypoSet->more(); currentHypoSet->next() )
+ {
+ isAvailable = false;
+ if ( HypothesisData* algoDataIn = SMESH::GetHypothesisData( currentHypoSet->current() )) {
+ for ( int dim = SMESH::DIM_0D; dim <= myMaxShapeDim; dim++) {
+ int aCurrentAvailableAlgo = myAvailableHypData[dim][Algo].indexOf( algoDataIn );
+ if ( aCurrentAvailableAlgo > -1 ) {
+ isAvailable = true;
+ break;
+ }
}
+ if ( !isAvailable )
+ break;
}
- if ( !isAvailable )
- break;
}
+ currentHypoSet->setAlgoAvailable( sType, isAvailable );
}
- if ( isAvailable )
+ if ( currentHypoSet->hasAlgo( HypothesesSet::MAIN ) &&
+ currentHypoSet->hasAlgo( HypothesesSet::ALT ))
+ {
+ HypothesesSet::SetType setType = HypothesesSet::getPreferredHypType();
+ if ( !currentHypoSet->getAlgoAvailable( setType ))
+ continue; // not add if a preferred type not available currently
+ }
+
+ if ( currentHypoSet->getAlgoAvailable( HypothesesSet::MAIN ) ||
+ currentHypoSet->getAlgoAvailable( HypothesesSet::ALT ))
+ {
aFilteredHypothesesSetsList.append( *inHypoSetName );
+ }
}
myDlg->setHypoSets( aFilteredHypothesesSetsList );
}
//================================================================================
/*!
- * \brief Get current name types of mesh
- * \param theIndex - current index types of mesh
- * \retval QString - result
+ * \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
*/
//================================================================================
-QString SMESHGUI_MeshOp::currentMeshTypeName( const int theIndex ) const
+void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int /*theTabIndex*/, const int /*theIndex*/ )
{
- QString aMeshType = "";
- switch ( theIndex ) {
- case MT_ANY:
- aMeshType = "ANY";
- break;
- case MT_TRIANGULAR:
- aMeshType = "TRIA";
- break;
- case MT_QUADRILATERAL:
- aMeshType = "QUAD";
- break;
- case MT_TETRAHEDRAL:
- aMeshType = "TETRA";
- break;
- case MT_HEXAHEDRAL:
- aMeshType = "HEXA";
- break;
- default:;
- }
- return aMeshType;
+ setFilteredAlgoData();
}
-
