#include "GeometryGUI.h"
#include "SalomeApp_Tools.h"
+#include "SalomeApp_Application.h"
#include "SALOMEDSClient_Study.hxx"
#include "SALOMEDSClient_AttributeIOR.hxx"
#include "SALOMEDSClient_AttributeName.hxx"
GLOBAL_HYPO_TAG =2,
LOCAL_ALGO_TAG =2,
LOCAL_HYPO_TAG =1,
+ SUBMESH_ON_VERTEX_TAG =4,
SUBMESH_ON_EDGE_TAG =5,
SUBMESH_ON_WIRE_TAG =6,
SUBMESH_ON_FACE_TAG =7,
if( !myDlg )
{
myDlg = new SMESHGUI_MeshDlg( myToCreate, myIsMesh );
- for ( int i = SMESH::DIM_1D; i <= SMESH::DIM_3D; i++ )
+ for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ )
{
connect( myDlg->tab( i ), SIGNAL( createHyp( const int, const int ) ),
this, SLOT( onCreateHyp( const int, const int ) ) );
}
SMESHGUI_SelectionOp::startOperation();
- // iterate through dimensions and get available algoritms,
- // set them to the dialog
+ // iterate through dimensions and get available algoritms, set them to the dialog
_PTR(SComponent) aFather = SMESH::GetActiveStudyDocument()->FindComponent( "SMESH" );
- for ( int i = SMESH::DIM_1D; i <= SMESH::DIM_3D; i++ )
+ for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ )
{
SMESHGUI_MeshTab* aTab = myDlg->tab( i );
QStringList hypList;
if ( !myToCreate || myIsMesh ) // not submesh creation
return false;
+ // mesh
QString aMeshEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Mesh );
- QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
_PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.latin1() );
- _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() );
- if ( pMesh && pGeom ) {
- SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( pMesh );
- if ( !mesh->_is_nil() ) {
- GEOM::GEOM_Object_var mainGeom, subGeom;
- mainGeom = mesh->GetShapeToMesh();
- subGeom = SMESH::SObjectToInterface<GEOM::GEOM_Object>( pGeom );
- if ( !mainGeom->_is_nil() && !subGeom->_is_nil() ) {
- TopoDS_Shape mainShape, subShape;
- if ( GEOMBase::GetShape( mainGeom, mainShape ) &&
- GEOMBase::GetShape( subGeom, subShape ) )
- {
- int index = GEOMBase::GetIndex( subShape, mainShape, 0 );
- if ( index > 0 ) {
- // 1 is index of mainShape itself
- return index > 1; // it is a subshape
- }
- // is it a group?
- GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
- if ( !geomGen->_is_nil() && aStudy ) {
- GEOM::GEOM_IGroupOperations_var op =
- geomGen->GetIGroupOperations( aStudy->StudyId() );
- if ( ! op->_is_nil() ) {
- GEOM::GEOM_Object_var mainObj = op->GetMainShape( subGeom );
- if ( !mainObj->_is_nil() )
- return ( string( mainObj->GetEntry() ) == string( mainGeom->GetEntry() ));
- }
- }
- }
+ if (!pMesh) return false;
+
+ SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( pMesh );
+ if (mesh->_is_nil()) return false;
+
+ // main shape of the mesh
+ GEOM::GEOM_Object_var mainGeom = mesh->GetShapeToMesh();
+ if (mainGeom->_is_nil()) return false;
+
+ // geometry
+ QStringList aGEOMs;
+ 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_IGroupOperations_var op =
+ geomGen->GetIGroupOperations(aStudy->StudyId());
+ if (op->_is_nil()) return false;
+
+ // check all selected shapes
+ QStringList::const_iterator aSubShapesIter = aGEOMs.begin();
+ for (; aSubShapesIter != aGEOMs.end(); aSubShapesIter++) {
+ QString aSubGeomEntry = (*aSubShapesIter);
+ _PTR(SObject) pSubGeom = studyDS()->FindObjectID(aSubGeomEntry.latin1());
+ if (!pSubGeom) return false;
+
+ GEOM::GEOM_Object_var aSubGeomVar =
+ GEOM::GEOM_Object::_narrow(_CAST(SObject,pSubGeom)->GetObject());
+ if (aSubGeomVar->_is_nil()) return false;
+
+ // skl for NPAL14695 - implementation of searching of mainObj
+ GEOM::GEOM_Object_var mainObj = op->GetMainShape(aSubGeomVar);
+ //if (mainObj->_is_nil() ||
+ // string(mainObj->GetEntry()) != string(mainGeom->GetEntry())) return false;
+ while(1) {
+ if(mainObj->_is_nil())
+ return false;
+ if( string(mainObj->GetEntry()) == string(mainGeom->GetEntry()) )
+ return true;
+ mainObj = op->GetMainShape(mainObj);
}
}
+ //return true;
}
+
return false;
}
if ( !geom->_is_nil() ) {
int tag = -1;
switch ( geom->GetShapeType() ) {
+ case GEOM::VERTEX: tag = SUBMESH_ON_VERTEX_TAG ; break;
case GEOM::EDGE: tag = SUBMESH_ON_EDGE_TAG ; break;
case GEOM::WIRE: tag = SUBMESH_ON_WIRE_TAG ; break;
case GEOM::FACE: tag = SUBMESH_ON_FACE_TAG ; break;
//================================================================================
void SMESHGUI_MeshOp::selectionDone()
{
- if ( !dlg()->isShown() )
+ if ( !dlg()->isShown() || !myDlg->isEnabled() )
return;
SMESHGUI_SelectionOp::selectionDone();
int shapeDim = 3;
- GEOM::GEOM_Object_var aGeomVar;
- QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
- _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() );
- if ( pGeom ) {
- aGeomVar = GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() );
- }
- else {
+ 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.latin1());
+ GEOM::GEOM_Object_var aSubGeomVar =
+ GEOM::GEOM_Object::_narrow(_CAST(SObject,pSubGeom)->GetObject());
+ aSeq[iSubSh] = aSubGeomVar;
+ }
+ } else {
+ // get geometry by selected sub-mesh
QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj );
_PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.latin1() );
- aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj );
+ GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj );
+ if (!aGeomVar->_is_nil()) {
+ aSeq->length(1);
+ aSeq[0] = aGeomVar;
+ }
}
- if ( !aGeomVar->_is_nil() ) {
+
+ if (aSeq->length() > 0) {
shapeDim = 0;
- switch ( aGeomVar->GetShapeType() ) {
- case GEOM::SOLID:
- case GEOM::SHELL: shapeDim = 3; break;
- case GEOM::FACE: shapeDim = 2; break;
- case GEOM::WIRE:
- case GEOM::EDGE: shapeDim = 1; break;
- case GEOM::VERTEX: shapeDim = 0; break;
- default:
- TopoDS_Shape aShape;
- if ( GEOMBase::GetShape(aGeomVar, aShape)) {
- TopExp_Explorer exp( aShape, TopAbs_SHELL );
- if ( exp.More() )
- shapeDim = 3;
- else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() )
- shapeDim = 2;
- else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() )
- shapeDim = 1;
- else
- shapeDim = 0;
+ for (int iss = 0; iss < aSeq->length() && shapeDim < 3; iss++) {
+ GEOM::GEOM_Object_var aGeomVar = aSeq[iss];
+ switch ( aGeomVar->GetShapeType() ) {
+ case GEOM::SOLID:
+ case GEOM::SHELL: shapeDim = 3; break;
+ case GEOM::FACE: shapeDim = (shapeDim < 2) ? 2 : shapeDim; break;
+ case GEOM::WIRE:
+ case GEOM::EDGE: shapeDim = (shapeDim < 1) ? 1 : shapeDim; break;
+ case GEOM::VERTEX: break;
+ default:
+ TopoDS_Shape aShape;
+ if ( GEOMBase::GetShape(aGeomVar, aShape)) {
+ TopExp_Explorer exp( aShape, TopAbs_SHELL );
+ if ( exp.More() )
+ shapeDim = 3;
+ else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() )
+ shapeDim = (shapeDim < 2) ? 2 : shapeDim;
+ else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() )
+ shapeDim = (shapeDim < 1) ? 1 : shapeDim;
+ else
+ ;//shapeDim = 0;
+ }
}
}
}
static int getTabDim (const QObject* tab, SMESHGUI_MeshDlg* dlg )
{
int aDim = -1;
- for (int i = SMESH::DIM_1D; i <= SMESH::DIM_3D; i++)
+ for (int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++)
if (tab == dlg->tab(i))
aDim = i;
return aDim;
// with values used to mesh a subshape
SMESH::SMESH_Hypothesis_var initParamHyp =
getInitParamsHypothesis(theTypeName, aData->ServerLibName);
+ myDlg->setEnabled( false );
aCreator->create(initParamHyp, myDlg);
+ myDlg->setEnabled( true );
} else {
SMESH::CreateHypothesis(theTypeName, aData->Label, false);
}
char* aTypeName = aHyp->GetName();
SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator( aTypeName );
- if ( aCreator )
+ if ( aCreator ) {
+ myDlg->setEnabled( false );
aCreator->edit( aHyp.in(), dlg() );
+ myDlg->setEnabled( true );
+ }
}
//================================================================================
const int theHypType,
const int theIndex)
{
- if ( theDim > -1 && theDim < 3 &&
+ if ( theDim > -1 && theDim <= SMESH::DIM_3D &&
theHypType > -1 && theHypType < NbHypTypes &&
theIndex > -1 && theIndex < myAvailableHypData[ theDim ][ theHypType ].count() )
return myAvailableHypData[ theDim ][ theHypType ][ theIndex ];
// find highest available dimension, all algos of this dimension are available for choice
int aTopDim = -1;
- for (int i = SMESH::DIM_1D; i <= SMESH::DIM_3D; i++)
+ for (int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++)
if (isAccessibleDim( i ))
aTopDim = i;
if (aTopDim == -1)
const bool isSubmesh = ( myToCreate ? !myIsMesh : myDlg->isObjectShown( SMESHGUI_MeshDlg::Mesh ));
HypothesisData* algoData = hypData( aDim, Algo, theIndex );
- HypothesisData* algoByDim[3];
+ HypothesisData* algoByDim[4];
algoByDim[ aDim ] = algoData;
QStringList anAvailable;
{
int dim = aDim + 1, lastDim = SMESH::DIM_3D, dir = 1;
if ( !forward ) {
- dim = aDim - 1; lastDim = SMESH::DIM_1D; dir = -1;
+ dim = aDim - 1; lastDim = SMESH::DIM_0D; dir = -1;
}
HypothesisData* prevAlgo = algoData;
bool noCompatible = false;
// restore previously selected algo
algoIndex = myAvailableHypData[dim][Algo].findIndex( curAlgo );
- if ( !isSubmesh && algoIndex < 0 && soleCompatible && !forward )
+ if ( !isSubmesh && algoIndex < 0 && soleCompatible && !forward && dim != SMESH::DIM_0D)
// select the sole compatible algo
algoIndex = myAvailableHypData[dim][Algo].findIndex( soleCompatible );
setCurrentHyp( dim, Algo, algoIndex );
_PTR(SObject) pObj = SMESH::GetActiveStudyDocument()->FindComponent("SMESH");
- for ( int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++ )
+ for ( int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++ )
{
if ( !isAccessibleDim( dim ))
continue;
if (!aHypoSet) return;
// clear all hyps
- for (int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++) {
+ for (int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++) {
setCurrentHyp(dim, Algo, -1);
setCurrentHyp(dim, AddHyp, -1);
setCurrentHyp(dim, MainHyp, -1);
if ( aMeshSO )
SMESH::SetName( aMeshSO, myDlg->objectText( SMESHGUI_MeshDlg::Obj ).latin1() );
- for ( int aDim = SMESH::DIM_1D; aDim <= SMESH::DIM_3D; aDim++ ) {
+ for ( int aDim = SMESH::DIM_0D; aDim <= SMESH::DIM_3D; aDim++ ) {
if ( !isAccessibleDim( aDim )) continue;
// assign hypotheses
_PTR(SObject) pMesh = studyDS()->FindObjectID( aMeshEntry.latin1() );
SMESH::SMESH_Mesh_var aMeshVar =
SMESH::SMESH_Mesh::_narrow( _CAST( SObject,pMesh )->GetObject() );
+ if (aMeshVar->_is_nil())
+ return false;
+
+ // GEOM shape of the main mesh
+ GEOM::GEOM_Object_var mainGeom = aMeshVar->GetShapeToMesh();
+
+ // Name for the new sub-mesh
+ QString aName = myDlg->objectText(SMESHGUI_MeshDlg::Obj);
// get geom object
- QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
- _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() );
- GEOM::GEOM_Object_var aGeomVar =
- GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() );
+ GEOM::GEOM_Object_var aGeomVar;
+ QStringList aGEOMs;
+ myDlg->selectedObject(SMESHGUI_MeshDlg::Geom, aGEOMs);
+ if (aGEOMs.count() == 1)
+ {
+ //QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
+ QString aGeomEntry = aGEOMs.first();
+ _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() );
+ aGeomVar = GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() );
+ }
+ else if (aGEOMs.count() > 1)
+ {
+ // create a GEOM group
+ GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
+ _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+ if (!geomGen->_is_nil() && aStudy) {
+ GEOM::GEOM_IGroupOperations_var op =
+ geomGen->GetIGroupOperations(aStudy->StudyId());
+ if (!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;
+ TopAbs_ShapeEnum aGroupType = TopAbs_SHAPE;
+ GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
+ aSeq->length(aGEOMs.count());
+ QStringList::const_iterator aSubShapesIter = aGEOMs.begin();
+ for (; aSubShapesIter != aGEOMs.end(); aSubShapesIter++, iSubSh++) {
+ QString aSubGeomEntry = (*aSubShapesIter);
+ _PTR(SObject) pSubGeom = studyDS()->FindObjectID(aSubGeomEntry.latin1());
+ GEOM::GEOM_Object_var aSubGeomVar =
+ GEOM::GEOM_Object::_narrow(_CAST(SObject,pSubGeom)->GetObject());
+ TopAbs_ShapeEnum aSubShapeType = (TopAbs_ShapeEnum)aSubGeomVar->GetShapeType();
+ if (iSubSh == 0) {
+ aGroupType = aSubShapeType;
+ } else {
+ if (aSubShapeType != aGroupType)
+ aGroupType = TopAbs_SHAPE;
+ }
+ aSeq[iSubSh] = aSubGeomVar;
+ }
+ // create a group
+ GEOM::GEOM_Object_var aGroupVar = op->CreateGroup(mainGeom, aGroupType);
+ op->UnionList(aGroupVar, aSeq);
+
+ if (op->IsDone()) {
+ aGeomVar = aGroupVar;
+
+ // publish the GEOM group in study
+ QString aNewGeomGroupName ("Auto_group_for_");
+ aNewGeomGroupName += aName;
+ SALOMEDS::SObject_var aNewGroupSO =
+ geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGeomVar, aNewGeomGroupName, mainGeom);
+ }
+ }
+ }
+ }
+ else {
+ }
+ if (aGeomVar->_is_nil())
+ return false;
SUIT_OverrideCursor aWaitCursor;
// create sub-mesh
- QString aName = myDlg->objectText( SMESHGUI_MeshDlg::Obj );
SMESH::SMESH_subMesh_var aSubMeshVar = aMeshVar->GetSubMesh( aGeomVar, aName.latin1() );
- for ( int aDim = SMESH::DIM_1D; aDim <= SMESH::DIM_3D; aDim++ )
+ for ( int aDim = SMESH::DIM_0D; aDim <= SMESH::DIM_3D; aDim++ )
{
if ( !isAccessibleDim( aDim )) continue;
}
}
- // deselect geometry: next submesh sould be created on other subshape
- myDlg->selectObject( "", SMESHGUI_MeshDlg::Geom, "" );
+ // deselect geometry: next submesh should be created on other subshape
+ myDlg->clearSelection( SMESHGUI_MeshDlg::Geom );
selectObject( _PTR(SObject)() );
selectionDone();
// Get hypotheses and algorithms assigned to the mesh/sub-mesh
QStringList anExisting;
- for ( int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++ )
+ for ( int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++ )
{
// get algorithm
existingHyps( dim, Algo, pObj, anExisting, myObjHyps[ dim ][ Algo ] );
// get hypotheses
bool hypWithoutAlgo = false;
- for ( int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++ )
+ for ( int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++ )
{
for ( int hypType = MainHyp; hypType <= AddHyp; hypType++ )
{
// Set new name
SMESH::SetName( pObj, myDlg->objectText( SMESHGUI_MeshDlg::Obj ).latin1() );
- // Assign new hypotheses and algorithms
- for ( int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++ )
+ // First, remove old algos in order to avoid messages on algorithm hiding
+ for ( int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++ )
+ {
+ if ( isAccessibleDim( dim ) && myObjHyps[ dim ][ Algo ].count() > 0 )
+ {
+ SMESH::SMESH_Hypothesis_var anOldAlgo = myObjHyps[ dim ][ Algo ].first();
+ SMESH::SMESH_Hypothesis_var anAlgoVar = getAlgo( dim );
+ if ( anAlgoVar->_is_nil() || // no new algo selected or
+ strcmp(anOldAlgo->GetName(), anAlgoVar->GetName()) ) // algo change
+ {
+ // remove old algorithm
+ SMESH::RemoveHypothesisOrAlgorithmOnMesh ( pObj, myObjHyps[ dim ][ Algo ].first() );
+ myObjHyps[ dim ][ Algo ].clear();
+ }
+ }
+ }
+
+ // Assign new algorithms and hypotheses
+ for ( int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++ )
{
if ( !isAccessibleDim( dim )) continue;
// find or create algorithm
- bool toDelete = false, toAdd = true;
SMESH::SMESH_Hypothesis_var anAlgoVar = getAlgo( dim );
- if ( anAlgoVar->_is_nil() ) {
- toAdd = false;
- }
- if ( myObjHyps[ dim ][ Algo ].count() > 0 ) {
- SMESH::SMESH_Hypothesis_var anOldAlgo = myObjHyps[ dim ][ Algo ].first();
- if ( toAdd ) {
- if ( strcmp(anOldAlgo->GetName(), anAlgoVar->GetName()) == 0 ) {
- toAdd = false;
- } else {
- toDelete = true;
- }
- } else {
- toDelete = true;
- }
- }
- // remove old algorithm
- if ( toDelete ) {
- SMESH::RemoveHypothesisOrAlgorithmOnMesh ( pObj, myObjHyps[ dim ][ Algo ].first() );
- myObjHyps[ dim ][ Algo ].clear();
- }
// assign new algorithm
- if ( toAdd ) {
+ if ( !anAlgoVar->_is_nil() && // some algo selected and
+ myObjHyps[ dim ][ Algo ].count() == 0 ) // no algo assigned
+ {
SMESH::SMESH_Mesh_var aMeshVar =
SMESH::SMESH_Mesh::_narrow( _CAST(SObject,pObj)->GetObject() );
bool isMesh = !aMeshVar->_is_nil();
{
int aNewHypIndex = currentHyp( dim, hypType );
int anOldHypIndex = -1;
+
+ // remove old hypotheses
if ( myObjHyps[ dim ][ hypType ].count() > 0 )
+ {
anOldHypIndex = find( myObjHyps[ dim ][ hypType ].first(),
myExistingHyps[ dim ][ hypType ] );
- if ( aNewHypIndex != anOldHypIndex )
- {
- // remove old hypotheses
- if ( anOldHypIndex >= 0 ) {
- SMESH::RemoveHypothesisOrAlgorithmOnMesh(
- pObj, myExistingHyps[ dim ][ hypType ][ anOldHypIndex ] );
+ if ( aNewHypIndex != anOldHypIndex || // different hyps
+ anOldHypIndex == -1 ) // hyps of different algos
+ {
+ SMESH::RemoveHypothesisOrAlgorithmOnMesh
+ ( pObj, myObjHyps[ dim ][ hypType ].first() );
myObjHyps[ dim ][ hypType ].clear();
}
+ }
- // assign new hypotheses
- if ( aNewHypIndex != -1 )
+ // assign new hypotheses
+ if ( aNewHypIndex != anOldHypIndex && aNewHypIndex != -1 )
+ {
+ SMESH::SMESH_Mesh_var aMeshVar =
+ SMESH::SMESH_Mesh::_narrow( _CAST(SObject,pObj)->GetObject() );
+ bool isMesh = !aMeshVar->_is_nil();
+ if ( isMesh )
{
- SMESH::SMESH_Mesh_var aMeshVar =
- SMESH::SMESH_Mesh::_narrow( _CAST(SObject,pObj)->GetObject() );
- bool isMesh = !aMeshVar->_is_nil();
- if ( isMesh )
- {
- SMESH::AddHypothesisOnMesh(
- aMeshVar, myExistingHyps[ dim ][ hypType ][ aNewHypIndex ] );
- }
- else
- {
- SMESH::SMESH_subMesh_var aVar =
- SMESH::SMESH_subMesh::_narrow( _CAST(SObject,pObj)->GetObject() );
- if ( !aVar->_is_nil() )
- SMESH::AddHypothesisOnSubMesh(
- aVar, myExistingHyps[ dim ][ hypType ][ aNewHypIndex ] );
- }
+ SMESH::AddHypothesisOnMesh
+ (aMeshVar, myExistingHyps[ dim ][ hypType ][ aNewHypIndex ] );
+ }
+ else
+ {
+ SMESH::SMESH_subMesh_var aVar =
+ SMESH::SMESH_subMesh::_narrow( _CAST(SObject,pObj)->GetObject() );
+ if ( !aVar->_is_nil() )
+ SMESH::AddHypothesisOnSubMesh
+ ( aVar, myExistingHyps[ dim ][ hypType ][ aNewHypIndex ] );
}
- // reread all hypotheses of mesh if necessary
- QStringList anExisting;
- existingHyps( dim, hypType, pObj, anExisting, myObjHyps[ dim ][ hypType ] );
}
+ // reread all hypotheses of mesh if necessary
+ QStringList anExisting;
+ existingHyps( dim, hypType, pObj, anExisting, myObjHyps[ dim ][ hypType ] );
}
}
void SMESHGUI_MeshOp::onPublishShapeByMeshDlg(SUIT_Operation* op)
{
if ( myShapeByMeshOp == op ) {
+ SMESHGUI::GetSMESHGUI()->getApp()->updateObjectBrowser(); //MZN: 24.11.2006 IPAL13980 - Object Browser update added
myDlg->show();
// Select a found geometry object
GEOM::GEOM_Object_var aGeomVar = myShapeByMeshOp->GetShape();
