Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0054465: TC9.2.0: SMESH: mesh presentation is not fully restored after Controls ...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Displayer.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Displayer.cxx
b/src/SMESHGUI/SMESHGUI_Displayer.cxx
index 153c34825e4849db45783e65dea27c1a173bec08..eb9852486164194e6bfae9d9e91880ab965e2406 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Displayer.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Displayer.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-66,13
+66,13
@@
SALOME_Prs* SMESHGUI_Displayer::buildPresentation( const QString& entry, SALOME_
if( vtk_viewer )
{
SUIT_ViewWindow* wnd = vtk_viewer->getViewManager()->getActiveView();
if( vtk_viewer )
{
SUIT_ViewWindow* wnd = vtk_viewer->getViewManager()->getActiveView();
- SMESH_Actor* anActor = SMESH::FindActorByEntry( wnd, entry.to
Latin1
().data() );
+ SMESH_Actor* anActor = SMESH::FindActorByEntry( wnd, entry.to
Utf8
().data() );
if( !anActor )
if( !anActor )
- anActor = SMESH::CreateActor(
study()->studyDS(), entry.toLatin1
().data(), true );
+ anActor = SMESH::CreateActor(
entry.toUtf8
().data(), true );
if( anActor )
{
SMESH::DisplayActor( wnd, anActor );
if( anActor )
{
SMESH::DisplayActor( wnd, anActor );
- prs = LightApp_Displayer::buildPresentation( entry.to
Latin1
().data(), aViewFrame );
+ prs = LightApp_Displayer::buildPresentation( entry.to
Utf8
().data(), aViewFrame );
}
if( prs )
UpdatePrs( prs );
}
if( prs )
UpdatePrs( prs );
@@
-94,12
+94,7
@@
bool SMESHGUI_Displayer::canBeDisplayed( const QString& entry, const QString& vi
if(viewer_type != SVTK_Viewer::Type())
return res;
if(viewer_type != SVTK_Viewer::Type())
return res;
- SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>( myApp->activeStudy() );
- if( !study )
- return res;
-
-
- _PTR(SObject) obj = study->studyDS()->FindObjectID( (const char*)entry.toLatin1() );
+ _PTR(SObject) obj = SMESH::getStudy()->FindObjectID( (const char*)entry.toUtf8() );
CORBA::Object_var anObj = SMESH::SObjectToObject( obj );
/*
CORBA::Object_var anObj = SMESH::SObjectToObject( obj );
/*