Salome HOME
Updated copyright comment
[modules/gui.git] / src / SVTK / SVTK_View.cxx
index 9ee31b1803a78f48ecd3696248ec22f6d7a4e0a3..b450b732e674e1071530c87a20c192ce4dd10b39 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -201,7 +201,7 @@ void
 SVTK_View
 ::highlight( const Handle(SALOME_InteractiveObject)& theIO, 
              bool theIsHighlight, 
-             bool theIsUpdate ) 
+             bool /*theIsUpdate*/ ) 
 {
   using namespace SVTK;
   VTK::ActorCollectionCopy aCopy(getRenderer()->GetActors());
@@ -335,7 +335,7 @@ SVTK_View
   ForEachIf<SALOME_Actor>(aCopy.GetActors(),
                           TIsSameIObject<SALOME_Actor>(theIObject),
                           TSetFunction<SALOME_Actor,const char*,const char*>
-                          (&SALOME_Actor::setName,theName.toLatin1().data()));
+                          (&SALOME_Actor::setName,theName.toUtf8().data()));
 }
 
 /*!
@@ -765,40 +765,40 @@ SVTK_View
                           (&SALOME_Actor::SetMaterial,aProps));
 }
 
-/*!\r
-  Get current front material\r
-  \param theIObject - object\r
-  \return property contained front material properties of the given object\r
-*/\r
-vtkProperty* \r
-SVTK_View\r
-::GetFrontMaterial(const Handle(SALOME_InteractiveObject)& theIObject)\r
-{\r
-  using namespace SVTK;\r
-  VTK::ActorCollectionCopy aCopy(getRenderer()->GetActors());\r
-  SALOME_Actor* anActor = \r
-    Find<SALOME_Actor>(aCopy.GetActors(),\r
-                       TIsSameIObject<SALOME_Actor>(theIObject));\r
-  if(anActor)\r
-    return anActor->GetFrontMaterial();\r
-  return NULL;\r
-}\r
-\r
-/*!\r
-  Get current back material\r
-  \param theIObject - object\r
-  \return property contained back material properties of the given object\r
-*/\r
-vtkProperty* \r
-SVTK_View\r
-::GetBackMaterial(const Handle(SALOME_InteractiveObject)& theIObject)\r
-{\r
-  using namespace SVTK;\r
-  VTK::ActorCollectionCopy aCopy(getRenderer()->GetActors());\r
-  SALOME_Actor* anActor = \r
-    Find<SALOME_Actor>(aCopy.GetActors(),\r
-                       TIsSameIObject<SALOME_Actor>(theIObject));\r
-  if(anActor)\r
+/*!
+  Get current front material
+  \param theIObject - object
+  \return property contained front material properties of the given object
+*/
+vtkProperty* 
+SVTK_View
+::GetFrontMaterial(const Handle(SALOME_InteractiveObject)& theIObject)
+{
+  using namespace SVTK;
+  VTK::ActorCollectionCopy aCopy(getRenderer()->GetActors());
+  SALOME_Actor* anActor = 
+    Find<SALOME_Actor>(aCopy.GetActors(),
+                       TIsSameIObject<SALOME_Actor>(theIObject));
+  if(anActor)
+    return anActor->GetFrontMaterial();
+  return NULL;
+}
+
+/*!
+  Get current back material
+  \param theIObject - object
+  \return property contained back material properties of the given object
+*/
+vtkProperty* 
+SVTK_View
+::GetBackMaterial(const Handle(SALOME_InteractiveObject)& theIObject)
+{
+  using namespace SVTK;
+  VTK::ActorCollectionCopy aCopy(getRenderer()->GetActors());
+  SALOME_Actor* anActor = 
+    Find<SALOME_Actor>(aCopy.GetActors(),
+                       TIsSameIObject<SALOME_Actor>(theIObject));
+  if(anActor)
     return anActor->GetBackMaterial();
   return NULL;
 }