X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDS%2FSALOMEDS_AttributePixMap_i.cxx;h=753b037a2b2854ccb0c44d2c4e79f8a6082877c8;hb=49b441a78055548171416d4e7a188f1b0e1bbef1;hp=b2dd7f6fe474e2476c4bf4207fe93c84aebde829;hpb=4655b0b0eb5345da6a86852021014b0cbae2ad30;p=modules%2Fkernel.git

diff --git a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx
index b2dd7f6fe..753b037a2 100644
--- a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx
@@ -1,31 +1,50 @@
-using namespace std;
-//  File      : SALOMEDS_AttributePixMap_i.cxx
-//  Created   : Fri Jul 05 14:38:10 2002
-//  Author    : Yves FRICAUD
-
-//  Project   : SALOME
-//  Module    : SALOMEDS
-//  Copyright : Open CASCADE 2002
-//  $Header$
-
+// Copyright (C) 2007-2013  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
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
+//  File   : SALOMEDS_AttributePixMap_i.cxx
+//  Author : Sergey RUIN
+//  Module : SALOME
+//
 #include "SALOMEDS_AttributePixMap_i.hxx"
-#include "SALOMEDS_SObject_i.hxx"
-#include <TCollection_AsciiString.hxx>
+#include "SALOMEDS.hxx"
 
-CORBA::Boolean SALOMEDS_AttributePixMap_i::HasPixMap() {
-  TCollection_ExtendedString S = Handle(SALOMEDS_PixMapAttribute)::DownCast(_myAttr)->Get();
-  if (strcmp(TCollection_AsciiString(S).ToCString(), "None") == 0) return Standard_False;
-  return Standard_True;
+CORBA::Boolean SALOMEDS_AttributePixMap_i::HasPixMap()
+{
+  SALOMEDS::Locker lock;
+  return dynamic_cast<SALOMEDSImpl_AttributePixMap*>(_impl)->HasPixMap();
 }
 
-char* SALOMEDS_AttributePixMap_i::GetPixMap() {
- CORBA::String_var S = CORBA::string_dup(TCollection_AsciiString(Handle(SALOMEDS_PixMapAttribute)::DownCast(_myAttr)->Get()).ToCString());
- return S._retn();
+char* SALOMEDS_AttributePixMap_i::GetPixMap()
+{
+  SALOMEDS::Locker lock;
+  CORBA::String_var S =
+    CORBA::string_dup(dynamic_cast<SALOMEDSImpl_AttributePixMap*>(_impl)->GetPixMap().c_str());
+  return S._retn();
 }
 
-void SALOMEDS_AttributePixMap_i::SetPixMap(const char* value) {
+void SALOMEDS_AttributePixMap_i::SetPixMap(const char* value)
+{
+  SALOMEDS::Locker lock;
   CheckLocked();
   CORBA::String_var Str = CORBA::string_dup(value);
-  Handle(TDataStd_Comment)::DownCast(_myAttr)->Set(TCollection_ExtendedString(Str));
+  dynamic_cast<SALOMEDSImpl_AttributePixMap*>(_impl)->SetPixMap(std::string(Str));
 }