ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

23615: EDF 17317 - Fit All when display one mesh

Browse Source 
Pb: no FitAll at 1st mesh compute
This commit is contained in:
eap 2018-12-05 14:55:28 +03:00
parent 7f7311ca93
commit a18e579603
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SMESHGUI/SMESHGUI.cxx
View File

@ -5474,13 +5474,13 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
std::string aWarning; std::string aWarning;
SUIT_ResourceMgr* aResourceMgr = SMESH::GetResourceMgr(this); SUIT_ResourceMgr* aResourceMgr = SMESH::GetResourceMgr(this);
if ( name== "selection_object_color" || if ( name == "selection_object_color" ||
name=="selection_element_color" || name == "selection_element_color" ||
name== "highlight_color" || name == "highlight_color" ||
name=="selection_precision_node" || name == "selection_precision_node" ||
name=="selection_precision_element" || name == "selection_precision_element" ||
name=="selection_precision_object" || name == "selection_precision_object" ||
name=="selection_increment") name == "selection_increment")
{ {
SMESH::UpdateSelectionProp( this ); SMESH::UpdateSelectionProp( this );
} }

11
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -988,21 +988,20 @@ void SMESHGUI_BaseComputeOp::computeMesh()
try { try {
OCC_CATCH_SIGNALS; OCC_CATCH_SIGNALS;
bool toDisplay = false; bool toDisplay = false;
std::string entry = (*anIter).second->GetID();
if ( !aMesh->_is_nil() ) // display only a mesh if ( !aMesh->_is_nil() ) // display only a mesh
{ {
toDisplay = true; toDisplay = true;
SMESH_Actor *anActor = SMESH::FindActorByObject( aMesh ); SMESH_Actor *anActor = SMESH::FindActorByObject( aMesh );
if ( !anActor ) anActor = SMESH::CreateActor( (*anIter).second->GetID().c_str(), if ( !anActor ) anActor = SMESH::CreateActor( entry.c_str(), /*clearLog =*/true );
/*clearLog =*/ true );
if ( anActor ) // actor is not created for an empty mesh if ( anActor ) // actor is not created for an empty mesh
{ {
anActor->SetEntityMode( entities ); anActor->SetEntityMode( entities );
SMESH::DisplayActor( SMESH::GetActiveWindow(), anActor ); //SMESH::DisplayActor( SMESH::GetActiveWindow(), anActor ); -- 23615
} }
} }
Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject if ( toDisplay )
( (*anIter).second->GetID().c_str(), "SMESH", (*anIter).second->GetName().c_str() ); SMESH::UpdateView( SMESH::eDisplay, entry.c_str() );
SMESH::Update(anIO, toDisplay);
if ( SVTK_ViewWindow* vtkWnd = SMESH::GetVtkViewWindow(SMESH::GetActiveWindow() )) if ( SVTK_ViewWindow* vtkWnd = SMESH::GetVtkViewWindow(SMESH::GetActiveWindow() ))
if ( vtkWnd->getRenderer() ) if ( vtkWnd->getRenderer() )

2
src/SMESHGUI/SMESHGUI_VTKUtils.cxx
View File

@ -896,7 +896,7 @@ namespace SMESH
SMESH_ActorProps::props()->reset(); SMESH_ActorProps::props()->reset();
QColor QColor
aHiColor = mgr->colorValue( "SMESH", "selection_object_color", Qt::white ), //aHiColor = mgr->colorValue( "SMESH", "selection_object_color", Qt::white ),
aSelColor = mgr->colorValue( "SMESH", "selection_element_color", Qt::yellow ), aSelColor = mgr->colorValue( "SMESH", "selection_element_color", Qt::yellow ),
aPreColor = mgr->colorValue( "SMESH", "highlight_color", Qt::cyan ); aPreColor = mgr->colorValue( "SMESH", "highlight_color", Qt::cyan );