ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-28 09:20:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix submesh creation

Browse Source
This commit is contained in:
eap 2006-04-13 14:45:56 +00:00
parent 678874e0fe
commit 5130aaa522
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -249,6 +249,8 @@ void SMESHGUI_MeshOp::startOperation()
myDlg->show(); myDlg->show();
selectionDone(); selectionDone();
myIgnoreAlgoSelection = false;
} }
//================================================================================ //================================================================================
@ -472,8 +474,9 @@ void SMESHGUI_MeshOp::selectionDone()
} }
else else
{ {
selectObject( _PTR(SObject)() );
myDlg->selectObject( "", SMESHGUI_MeshDlg::Geom, "" ); myDlg->selectObject( "", SMESHGUI_MeshDlg::Geom, "" );
selectObject( _PTR(SObject)() );
selectionDone();
} }
} }
@ -957,6 +960,8 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
if (aTopDim == -1) if (aTopDim == -1)
return; return;
const bool isSubmesh = ( myToCreate ? !myIsMesh : myDlg->isObjectShown( SMESHGUI_MeshDlg::Mesh ));
HypothesisData* algoData = hypData( aDim, Algo, theIndex ); HypothesisData* algoData = hypData( aDim, Algo, theIndex );
HypothesisData* algoByDim[3]; HypothesisData* algoByDim[3];
algoByDim[ aDim ] = algoData; algoByDim[ aDim ] = algoData;
@ -1009,7 +1014,7 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
// restore previously selected algo // restore previously selected algo
algoIndex = myAvailableHypData[dim][Algo].findIndex( curAlgo ); algoIndex = myAvailableHypData[dim][Algo].findIndex( curAlgo );
if ( algoIndex < 0 && soleCompatible ) if ( !isSubmesh && algoIndex < 0 && soleCompatible )
// select the sole compatible algo // select the sole compatible algo
algoIndex = myAvailableHypData[dim][Algo].findIndex( soleCompatible ); algoIndex = myAvailableHypData[dim][Algo].findIndex( soleCompatible );
setCurrentHyp( dim, Algo, algoIndex ); setCurrentHyp( dim, Algo, algoIndex );
@ -1059,7 +1064,7 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
int hypIndex = -1; int hypIndex = -1;
if ( !curHyp->_is_nil() && !anExisting.isEmpty() ) if ( !curHyp->_is_nil() && !anExisting.isEmpty() )
hypIndex = this->find( curHyp, myExistingHyps[ dim ][ type ]); hypIndex = this->find( curHyp, myExistingHyps[ dim ][ type ]);
if ( hypIndex < 0 && anExisting.count() == 1 ) { if ( !isSubmesh && hypIndex < 0 && anExisting.count() == 1 ) {
// none is yet selected => select the sole existing if it is not optional // none is yet selected => select the sole existing if it is not optional
QString hypTypeName = myExistingHyps[ dim ][ type ][ 0 ]->GetName(); QString hypTypeName = myExistingHyps[ dim ][ type ][ 0 ]->GetName();
bool isOptional = true; bool isOptional = true;
@ -1076,7 +1081,7 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
//================================================================================ //================================================================================
/*! /*!
* \brief Creates and selects hypothesis of hypotheses set * \brief Creates and selects hypothesis of hypotheses set
* \param theSetName - The name of hypotheses set * \param theSetName - The name of hypotheses set
*/ */
//================================================================================ //================================================================================
void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName ) void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName )
@ -1233,6 +1238,12 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess )
} }
} }
} }
// deselect geometry: next submesh sould be created on other subshape
myDlg->selectObject( "", SMESHGUI_MeshDlg::Geom, "" );
selectObject( _PTR(SObject)() );
selectionDone();
return true; return true;
} }