-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
{
myLastEntry = *it;
vf->BeforeDisplay( this, prs );
- vf->Display( prs );
+ vf->Display( this, prs );
vf->AfterDisplay( this, prs );
if ( updateViewer )
delete prs; // delete presentation because displayer is its owner
setVisibilityState(*it, Qtx::ShownState);
}
-
}
}
QStringList::const_iterator it = list.constBegin();
for ( ; it != list.constEnd(); ++it)
{
- SALOME_Prs* prs = vf->CreatePrs( (*it).toLatin1().data() );
+ SALOME_Prs* prs = vf->CreatePrs( (*it).toUtf8().data() );
if ( prs ) {
myLastEntry = *it;
vf->BeforeErase( this, prs );
- vf->Erase( prs, forced );
+ vf->Erase( this, prs, forced );
vf->AfterErase( this, prs );
if ( updateViewer )
vf->Repaint();
\param updateViewer - is it necessary to update viewer
\param theViewFrame - view
*/
-void LightApp_Displayer::EraseAll( const bool forced, const bool updateViewer, SALOME_View* theViewFrame ) const
+void LightApp_Displayer::EraseAll( const bool forced, const bool updateViewer, SALOME_View* theViewFrame )
{
SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView();
if ( vf ) {
- vf->EraseAll( forced );
+ vf->EraseAll( this, forced );
if ( updateViewer )
vf->Repaint();
}
{
#ifndef DISABLE_SALOMEOBJECT
Handle( SALOME_InteractiveObject ) temp = new SALOME_InteractiveObject();
- temp->setEntry( entry.toLatin1() );
+ temp->setEntry( entry.toUtf8() );
res = vf->isVisible( temp );
#endif
}
SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView();
if ( vf )
- prs = vf->CreatePrs( entry.toLatin1() );
+ prs = vf->CreatePrs( entry.toUtf8() );
return prs;
}
/*!
\return displayer, corresponding to module
- \param mod_name - name of module
+ \param mod_name - name or title of module.
+ \note It is better to use name (component data type)
+ in any case when you are not sure the title is not empty.
\param load - is module has to be forced loaded
*/
LightApp_Displayer* LightApp_Displayer::FindDisplayer( const QString& mod_name, const bool load )
{
+ QString mname = LightApp_Application::moduleDisplayer( mod_name );
SUIT_Session* session = SUIT_Session::session();
SUIT_Application* sapp = session ? session->activeApplication() : 0;
LightApp_Application* app = dynamic_cast<LightApp_Application*>( sapp );
if( !app )
return 0;
- LightApp_Module* m = dynamic_cast<LightApp_Module*>( app ? app->module( mod_name ) : 0 );
+ LightApp_Module* m = dynamic_cast<LightApp_Module*>( app ? app->module( mname ) : 0 );
bool wasLoaded = false;
if( !m && load )
{
- m = dynamic_cast<LightApp_Module*>( app->loadModule( mod_name, false ) );
- if( m ) {
+ m = dynamic_cast<LightApp_Module*>( app->loadModule( mname, false ) );
+ if( m ) {
app->addModule( m );
- wasLoaded = true;
- }
+ wasLoaded = true;
+ }
}
if( m )
{
m->connectToStudy( dynamic_cast<CAM_Study*>( app->activeStudy() ) );
- if( wasLoaded )
- m->updateModuleVisibilityState();
+ if( wasLoaded )
+ m->updateModuleVisibilityState();
}
return m ? m->displayer() : 0;
}