IPAL52934: Elements are't not highlighted in vtk viewer after set id in measurements dialog box

Fix SMESHGUI_Measurements.cxx

In "Build Compound Mesh", set "Merge coincident nodes and elements" ON by default
after reflection about a question on the Forum http://www.salome-platform.org/forum/forum_11/866636535
  Change SMESHGUI_BuildCompoundDlg.cxx
This commit is contained in:
eap 2015-10-28 19:11:56 +03:00
parent 219f1c3410
commit 387ee09383
2 changed files with 13 additions and 4 deletions

View File

@ -228,7 +228,7 @@ void SMESHGUI_BuildCompoundDlg::Init()
ComboBoxUnion->addItem(tr("RENAME")); ComboBoxUnion->addItem(tr("RENAME"));
ComboBoxUnion->setCurrentIndex(0); ComboBoxUnion->setCurrentIndex(0);
CheckBoxMerge->setChecked(false); CheckBoxMerge->setChecked(true);
TextLabelTol->setEnabled(CheckBoxMerge->isChecked()); TextLabelTol->setEnabled(CheckBoxMerge->isChecked());
SpinBoxTol->SetValue(1e-05); SpinBoxTol->SetValue(1e-05);

View File

@ -198,6 +198,7 @@ SMESHGUI_MinDistance::SMESHGUI_MinDistance( QWidget* parent )
clear(); clear();
//setTarget( FirstTgt ); //setTarget( FirstTgt );
selectionChanged();
} }
/*! /*!
@ -500,14 +501,22 @@ void SMESHGUI_MinDistance::secondEdited()
setTarget( SecondTgt ); setTarget( SecondTgt );
if ( sender() == mySecondTgt ) if ( sender() == mySecondTgt )
clear(); clear();
QString text = mySecondTgt->text();
if ( !mySecondActor )
{
selectionChanged();
mySecondTgt->setText( text );
}
SVTK_Selector* selector = SMESH::GetViewWindow()->GetSelector(); SVTK_Selector* selector = SMESH::GetViewWindow()->GetSelector();
if ( mySecondActor && selector ) { if ( mySecondActor && selector ) {
Handle(SALOME_InteractiveObject) IO = mySecondActor->getIO(); Handle(SALOME_InteractiveObject) IO = mySecondActor->getIO();
if ( mySecond->checkedId() == NodeTgt || mySecond->checkedId() == ElementTgt ) { if ( mySecond->checkedId() == NodeTgt || mySecond->checkedId() == ElementTgt ) {
if ( !text.isEmpty() ) {
TColStd_MapOfInteger ID; TColStd_MapOfInteger ID;
ID.Add( mySecondTgt->text().toLong() ); ID.Add( text.toLong() );
selector->AddOrRemoveIndex( IO, ID, false ); selector->AddOrRemoveIndex( IO, ID, false );
} }
}
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow() ) if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow() )
aViewWindow->highlight( IO, true, true ); aViewWindow->highlight( IO, true, true );
} }