ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-26 11:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

INT PAL 0052786: <None> 2D algorithm shown when mesh edition invoked

Browse Source
This commit is contained in:
imn 2015-06-29 19:34:27 +03:00
parent 897fdb92b6
commit 2295213e66
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -1496,24 +1496,32 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
if ( anAvailable.count() == 1 ) if ( anAvailable.count() == 1 )
soleCompatible = myAvailableHypData[dim][Algo][0]; soleCompatible = myAvailableHypData[dim][Algo][0];
if ( dim == aTopDim && prevAlgo ) {// all available algoritms should be selectable any way if ( dim == aTopDim && prevAlgo ) {// all available algoritms should be selectable any way
if (aTopDim == SMESH::DIM_2D) { if (aTopDim == SMESH::DIM_2D && myFilteredAlgoData[dim].count() > 0) {
anAvailable.clear(); anAvailable.clear();
for (int i = 0; i < myFilteredAlgoData[dim].count(); ++i) { for (int i = 0; i < myFilteredAlgoData[dim].count(); ++i) {
HypothesisData* aCurAlgo = myFilteredAlgoData[dim][ i ]; HypothesisData* aCurAlgo = myFilteredAlgoData[dim][ i ];
anAvailable.append( aCurAlgo->Label ); anAvailable.append( aCurAlgo->Label );
} }
} }
if (aTopDim == SMESH::DIM_3D) if (aTopDim == SMESH::DIM_3D && myDlg->currentMeshType() == MT_ANY)
availableHyps( dim, Algo, anAvailable, myAvailableHypData[dim][Algo], 0 ); availableHyps( dim, Algo, anAvailable, myAvailableHypData[dim][Algo], 0 );
} }
myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable ); myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable );
noCompatible = anAvailable.isEmpty(); noCompatible = anAvailable.isEmpty();
// restore previously selected algo // restore previously selected algo
if (dim == aTopDim && prevAlgo && aTopDim == SMESH::DIM_2D) if (dim == aTopDim && prevAlgo && aTopDim == SMESH::DIM_2D && myFilteredAlgoData[dim].count() > 0) {
algoIndex = myFilteredAlgoData[dim].indexOf( curAlgo ); algoIndex = myFilteredAlgoData[dim].indexOf( curAlgo );
else setCurrentHyp( dim, Algo, algoIndex);
if (algoIndex >= 0)
prevAlgo = algoByDim[ dim ] = myFilteredAlgoData[dim][algoIndex];
else
prevAlgo = algoByDim[ dim ] = 0;
continue;
}
else {
algoIndex = myAvailableHypData[dim][Algo].indexOf( curAlgo ); algoIndex = myAvailableHypData[dim][Algo].indexOf( curAlgo );
}
if ( !isSubmesh && algoIndex < 0 && soleCompatible && !forward && dim != SMESH::DIM_0D) if ( !isSubmesh && algoIndex < 0 && soleCompatible && !forward && dim != SMESH::DIM_0D)
// select the sole compatible algo // select the sole compatible algo
algoIndex = myAvailableHypData[dim][Algo].indexOf( soleCompatible ); algoIndex = myAvailableHypData[dim][Algo].indexOf( soleCompatible );