X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelHighAPI%2FModelHighAPI_Integer.cpp;h=c76a3a963f59c4503957bdf0441374581ebb7d7f;hb=a13f87935d2a6f52f942790b6abc874f1016c9fc;hp=68a612302d16437915b6b6980d867458c8cde503;hpb=f853ca3afac47ae3b7e610af9d4eacef8f8739a5;p=modules%2Fshaper.git

diff --git a/src/ModelHighAPI/ModelHighAPI_Integer.cpp b/src/ModelHighAPI/ModelHighAPI_Integer.cpp
index 68a612302..c76a3a963 100644
--- a/src/ModelHighAPI/ModelHighAPI_Integer.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Integer.cpp
@@ -1,28 +1,45 @@
-// Name   : ModelHighAPI_Integer.cpp
-// Purpose: 
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// 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
 //
-// History:
-// 29/03/16 - Sergey POKHODENKO - Creation of the file
 
-//--------------------------------------------------------------------------------------
 #include "ModelHighAPI_Integer.h"
 
 #include <ModelAPI_AttributeInteger.h>
+
+#include <sstream>
 //--------------------------------------------------------------------------------------
 
 //--------------------------------------------------------------------------------------
 ModelHighAPI_Integer::ModelHighAPI_Integer(int theValue)
-: myValue(theValue)
+: myVariantType(VT_INT)
+, myInt(theValue)
 {
 }
 
 ModelHighAPI_Integer::ModelHighAPI_Integer(const std::string & theValue)
-: myValue(theValue)
+: myVariantType(VT_STRING)
+, myString(theValue)
 {
 }
 
 ModelHighAPI_Integer::ModelHighAPI_Integer(const char * theValue)
-: myValue(theValue)
+: myVariantType(VT_STRING)
+, myString(theValue)
 {
 }
 
@@ -31,19 +48,27 @@ ModelHighAPI_Integer::~ModelHighAPI_Integer()
 }
 
 //--------------------------------------------------------------------------------------
-struct fill_visitor : boost::static_visitor<void>
+void ModelHighAPI_Integer::fillAttribute(
+    const std::shared_ptr<ModelAPI_AttributeInteger> & theAttribute) const
 {
-  mutable std::shared_ptr<ModelAPI_AttributeInteger> myAttribute;
-
-  fill_visitor(const std::shared_ptr<ModelAPI_AttributeInteger> & theAttribute)
-  : myAttribute(theAttribute) {}
+  switch(myVariantType) {
+    case VT_INT: theAttribute->setValue(myInt); return;
+    case VT_STRING: theAttribute->setText(myString); return;
+  }
+}
 
-  void operator()(int theValue) const { myAttribute->setValue(theValue); }
-  void operator()(const std::string & theValue) const { myAttribute->setText(theValue); }
-};
+int ModelHighAPI_Integer::intValue() const
+{
+  // needed for array of integer, which supports no text
+  return myInt;
+}
 
-void ModelHighAPI_Integer::fillAttribute(
-    const std::shared_ptr<ModelAPI_AttributeInteger> & theAttribute) const
+std::string ModelHighAPI_Integer::string() const
 {
-  boost::apply_visitor(fill_visitor(theAttribute), myValue);
+  if (myVariantType == VT_STRING)
+    return myString;
+
+  std::ostringstream anOut;
+  anOut << myInt;
+  return anOut.str();
 }