X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelHighAPI%2FModelHighAPI_Double.cpp;h=aa02d3cdb6fb8a724f6456e1c588ee84a12575c0;hb=8faa9c7e36cd0d60d2b68c4acc27f571c11022e3;hp=ca1f661a9ca44f518c4361263d252302b77df48b;hpb=4f62ebbe5e87ffa4649a05690cdbaaade688deda;p=modules%2Fshaper.git

diff --git a/src/ModelHighAPI/ModelHighAPI_Double.cpp b/src/ModelHighAPI/ModelHighAPI_Double.cpp
index ca1f661a9..aa02d3cdb 100644
--- a/src/ModelHighAPI/ModelHighAPI_Double.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Double.cpp
@@ -1,32 +1,45 @@
-// Name   : ModelHighAPI_Double.cpp
-// Purpose: 
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
 //
-// History:
-// 29/03/16 - Sergey POKHODENKO - Creation of the file
 
-//--------------------------------------------------------------------------------------
 #include "ModelHighAPI_Double.h"
 
 #include <ModelAPI_AttributeDouble.h>
+#include <GeomDataAPI_Point.h>
 //--------------------------------------------------------------------------------------
 
 //--------------------------------------------------------------------------------------
-ModelHighAPI_Double::ModelHighAPI_Double()
-{
-}
-
 ModelHighAPI_Double::ModelHighAPI_Double(double theValue)
-: myValue(theValue)
+: myVariantType(VT_DOUBLE)
+, myDouble(theValue)
 {
 }
 
 ModelHighAPI_Double::ModelHighAPI_Double(const std::string & theValue)
-: myValue(theValue)
+: myVariantType(VT_STRING)
+, myString(theValue)
 {
 }
 
 ModelHighAPI_Double::ModelHighAPI_Double(const char * theValue)
-: myValue(theValue)
+: myVariantType(VT_STRING)
+, myString(theValue)
 {
 }
 
@@ -35,19 +48,31 @@ ModelHighAPI_Double::~ModelHighAPI_Double()
 }
 
 //--------------------------------------------------------------------------------------
-struct fill_visitor : boost::static_visitor<void>
+void ModelHighAPI_Double::fillAttribute(
+    const std::shared_ptr<ModelAPI_AttributeDouble> & theAttribute) const
 {
-  mutable std::shared_ptr<ModelAPI_AttributeDouble> myAttribute;
-
-  fill_visitor(std::shared_ptr<ModelAPI_AttributeDouble> & theAttribute)
-  : myAttribute(theAttribute) {}
-
-  void operator()(double theValue) const { myAttribute->setValue(theValue); }
-  void operator()(const std::string & theValue) const { myAttribute->setText(theValue); }
-};
+  switch(myVariantType) {
+    case VT_DOUBLE: theAttribute->setValue(myDouble); return;
+    case VT_STRING: theAttribute->setText(myString); return;
+  }
+}
 
 void ModelHighAPI_Double::fillAttribute(
-    std::shared_ptr<ModelAPI_AttributeDouble> & theAttribute) const
+  const std::shared_ptr<GeomDataAPI_Point> & thePoint,
+  const ModelHighAPI_Double & theX,
+  const ModelHighAPI_Double & theY,
+  const ModelHighAPI_Double & theZ) const
 {
-  boost::apply_visitor(fill_visitor(theAttribute), myValue);
+  switch (theX.myVariantType) {
+  case VT_DOUBLE: thePoint->setX(theX.myDouble); break;
+  case VT_STRING: thePoint->setTextX(theX.myString);
+  }
+  switch (theY.myVariantType) {
+  case VT_DOUBLE: thePoint->setY(theY.myDouble); break;
+  case VT_STRING: thePoint->setTextY(theY.myString);
+  }
+  switch (theZ.myVariantType) {
+  case VT_DOUBLE: thePoint->setZ(theZ.myDouble); break;
+  case VT_STRING: thePoint->setTextZ(theZ.myString);
+  }
 }