ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable 'Fineness' at 'curvature' switch on

Browse Source
This commit is contained in:
eap 2014-05-07 14:56:51 +04:00
parent 67c76bbea8
commit e69bcd9018
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
View File

@ -330,14 +330,7 @@ void NETGENPluginGUI_HypothesisCreator::retrieveParams() const
myFuseEdges->setChecked( data.myFuseEdges ); myFuseEdges->setChecked( data.myFuseEdges );
// update widgets // update widgets
bool isCustom = (myFineness->currentIndex() == UserDefined); ((NETGENPluginGUI_HypothesisCreator*) this )-> onSurfaceCurvatureChanged();
bool isSurfaceCurvature = (mySurfaceCurvature ? mySurfaceCurvature->checkState() == Qt::Checked : true);
myFineness->setEnabled(isSurfaceCurvature);
myGrowthRate->setEnabled(isCustom && isSurfaceCurvature);
if ( myNbSegPerEdge )
myNbSegPerEdge->setEnabled(isCustom && isSurfaceCurvature);
if ( myNbSegPerRadius )
myNbSegPerRadius->setEnabled(isCustom && isSurfaceCurvature);
if ( myLocalSizeTable ) if ( myLocalSizeTable )
{ {
@ -566,6 +559,7 @@ void NETGENPluginGUI_HypothesisCreator::onSurfaceCurvatureChanged()
{ {
bool isSurfaceCurvature = (mySurfaceCurvature ? mySurfaceCurvature->isChecked() : true); bool isSurfaceCurvature = (mySurfaceCurvature ? mySurfaceCurvature->isChecked() : true);
bool isCustom = (myFineness->currentIndex() == UserDefined); bool isCustom = (myFineness->currentIndex() == UserDefined);
myFineness->setEnabled(isSurfaceCurvature);
myGrowthRate->setEnabled(isCustom); myGrowthRate->setEnabled(isCustom);
if ( myNbSegPerEdge ) if ( myNbSegPerEdge )
myNbSegPerEdge->setEnabled(isCustom && isSurfaceCurvature); myNbSegPerEdge->setEnabled(isCustom && isSurfaceCurvature);

10
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -1672,12 +1672,12 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh,
// element size (regression on issue 0020452, note 0010898) // element size (regression on issue 0020452, note 0010898)
int iPrev = SMESH_MesherHelper::WrapIndex( i-1, nbSegments ); int iPrev = SMESH_MesherHelper::WrapIndex( i-1, nbSegments );
int iNext = SMESH_MesherHelper::WrapIndex( i+1, nbSegments ); int iNext = SMESH_MesherHelper::WrapIndex( i+1, nbSegments );
double sunH = segLen[ iPrev ] + segLen[ i ] + segLen[ iNext ]; double sumH = segLen[ iPrev ] + segLen[ i ] + segLen[ iNext ];
int nbSeg = ( int( segLen[ iPrev ] > sunH / 100.) + int nbSeg = ( int( segLen[ iPrev ] > sumH / 100.) +
int( segLen[ i ] > sunH / 100.) + int( segLen[ i ] > sumH / 100.) +
int( segLen[ iNext ] > sunH / 100.)); int( segLen[ iNext ] > sumH / 100.));
if ( nbSeg > 0 ) if ( nbSeg > 0 )
RestrictLocalSize( ngMesh, 0.5*(np1+np2), sunH / nbSeg ); RestrictLocalSize( ngMesh, 0.5*(np1+np2), sumH / nbSeg );
} }
if ( isInternalWire ) if ( isInternalWire )
{ {