X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDS%2FSALOMEDS_AttributeTextHighlightColor_i.cxx;h=c0a1da12e05d769cfc455b42d16b5de1f22daa57;hb=ac393028ba1a7ca2c20eab672c4e6ccfb8da48c1;hp=9ba430ba897524b118378b059a0ffab0b703f4f5;hpb=102608ce8b69dd1ea798169e30223b67742ec26d;p=modules%2Fyacs.git

diff --git a/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx
index 9ba430ba8..c0a1da12e 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx
@@ -1,57 +1,58 @@
-//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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, 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
+// 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_AttributeTextHighlightColor_i.cxx
-//  Author : Yves FRICAUD
+//  Author : Sergey RUIN
 //  Module : SALOME
-//  $Header$
-
-using namespace std;
+//
 #include "SALOMEDS_AttributeTextHighlightColor_i.hxx"
-#include "SALOMEDS_SObject_i.hxx"
-#include <TColStd_HArray1OfReal.hxx>
+#include "SALOMEDS.hxx"
+#include <vector>
 
-SALOMEDS::Color SALOMEDS_AttributeTextHighlightColor_i::TextHighlightColor() {
+SALOMEDS::Color SALOMEDS_AttributeTextHighlightColor_i::TextHighlightColor() 
+{
+  SALOMEDS::Locker lock;
   SALOMEDS::Color TextHighlightColor;
-  Handle(TColStd_HArray1OfReal) anArray = Handle(SALOMEDS_TextHighlightColorAttribute)::DownCast(_myAttr)->Array();
-  if (anArray.IsNull() || anArray->Length()!=3) { 
+  std::vector<double> anArray = dynamic_cast<SALOMEDSImpl_AttributeTextHighlightColor*>(_impl)->TextHighlightColor();
+  if (anArray.size()!=3) { 
     TextHighlightColor.R = 0;
     TextHighlightColor.G = 0;
     TextHighlightColor.B = 0;
   }
   else {
-    TextHighlightColor.R = anArray->Value(1);
-    TextHighlightColor.G = anArray->Value(2);
-    TextHighlightColor.B = anArray->Value(3);
+    TextHighlightColor.R = anArray[0];
+    TextHighlightColor.G = anArray[1];
+    TextHighlightColor.B = anArray[2];
   }
   return TextHighlightColor;
 }
 
-void SALOMEDS_AttributeTextHighlightColor_i::SetTextHighlightColor(const SALOMEDS::Color& value) {
+void SALOMEDS_AttributeTextHighlightColor_i::SetTextHighlightColor(const SALOMEDS::Color& value) 
+{
+  SALOMEDS::Locker lock;
   CheckLocked();
-  Handle(TColStd_HArray1OfReal) anArray = new TColStd_HArray1OfReal(1,3);
-  anArray->SetValue(1,  value.R);
-  anArray->SetValue(2, value.G);
-  anArray->SetValue(3, value.B);
-  Handle(SALOMEDS_TextHighlightColorAttribute)::DownCast(_myAttr)->ChangeArray(anArray);
+  std::vector<double> anArray;
+  anArray.push_back(value.R);
+  anArray.push_back(value.G);
+  anArray.push_back(value.B);
+  dynamic_cast<SALOMEDSImpl_AttributeTextHighlightColor*>(_impl)->ChangeArray(anArray);
 }