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

0021838: [CEA 653] createAndDisplayGO needs user action to set color

Browse Source
This commit is contained in:
vsr 2012-09-05 12:54:41 +00:00
parent bd850d68c8
commit f333eac72c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -269,7 +269,7 @@ void GEOMToolsGUI::OnDisableAutoColor()
aMainObject->SetAutoColor( false ); aMainObject->SetAutoColor( false );
} }
void GEOMToolsGUI::SetColor( const QString& entry, const QColor& color, bool /*updateViewer*/ ) void GEOMToolsGUI::SetColor( const QString& entry, const QColor& color, bool updateViewer )
{ {
if ( entry.isEmpty() || !color.isValid() ) return; if ( entry.isEmpty() || !color.isValid() ) return;
@ -300,11 +300,13 @@ void GEOMToolsGUI::SetColor( const QString& entry, const QColor& color, bool /*u
SVTK_View* aView = vtkVW->getView(); SVTK_View* aView = vtkVW->getView();
GEOMToolsGUI::setVtkColor( appStudy, mgrId, aView, IO, color ); GEOMToolsGUI::setVtkColor( appStudy, mgrId, aView, IO, color );
if ( updateViewer ) aView->Repaint();
} }
else if ( isOCC ) { else if ( isOCC ) {
OCCViewer_Viewer* vm = dynamic_cast<OCCViewer_Viewer*> ( window->getViewManager()->getViewModel() ); OCCViewer_Viewer* vm = dynamic_cast<OCCViewer_Viewer*> ( window->getViewManager()->getViewModel() );
Handle (AIS_InteractiveContext) ic = vm->getAISContext(); Handle (AIS_InteractiveContext) ic = vm->getAISContext();
GEOMToolsGUI::setOccColor( appStudy, mgrId, ic, IO, color ); GEOMToolsGUI::setOccColor( appStudy, mgrId, ic, IO, color );
if ( updateViewer ) ic->UpdateCurrentViewer();
} }
// mark study as modified // mark study as modified
@ -359,6 +361,7 @@ void GEOMToolsGUI::OnColor()
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
GEOMToolsGUI::setVtkColor( appStudy, mgrId, aView, It.Value(), color ); GEOMToolsGUI::setVtkColor( appStudy, mgrId, aView, It.Value(), color );
} }
aView->Repaint();
} }
else if ( isOCC ) { else if ( isOCC ) {
// find AIS interactive object (for first item in selection) // find AIS interactive object (for first item in selection)
@ -384,6 +387,7 @@ void GEOMToolsGUI::OnColor()
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
GEOMToolsGUI::setOccColor( appStudy, mgrId, ic, It.Value(), color ); GEOMToolsGUI::setOccColor( appStudy, mgrId, ic, It.Value(), color );
} }
ic->UpdateCurrentViewer();
} }
// mark study as modified // mark study as modified