Fix for the issue #2573: Wrong position of created part

[modules/shaper.git] / src / Model / Model_AttributeDouble.cpp

diff --git a/src/Model/Model_AttributeDouble.cpp b/src/Model/Model_AttributeDouble.cpp
index 91cebf7363bb3e18b96c3841b973795deab2bbf1..3b123c3f3d0168105a0c1184b7ce5af7122fbb0c 100644 (file)
--- a/src/Model/Model_AttributeDouble.cpp
+++ b/src/Model/Model_AttributeDouble.cpp
@@ -1,19 +1,47 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModelAPI_AttributeDouble.cxx
-// Created:     2 Apr 2014
-// Author:      Mikhail PONIKAROV
+// 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>
+//
 
 #include "Model_AttributeDouble.h"
 
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Events.h>
-#include <ModelAPI_Expression.h>
-#include <ModelAPI_Feature.h>
+#include <Model_Expression.h>
+#include <ModelAPI_Object.h>
 
 Model_AttributeDouble::Model_AttributeDouble(TDF_Label& theLabel)
 {
-  myIsInitialized = true;
+  TDF_Label anExpressionLab = theLabel.FindChild(1);
+  myExpression.reset(new Model_ExpressionDouble(anExpressionLab));
+  myIsInitialized = myExpression->isInitialized();
+}
+
+void Model_AttributeDouble::reinit()
+{
+  myExpression->reinit();
+  myIsInitialized = myExpression->isInitialized();
+}
+
+void Model_AttributeDouble::reset()
+{
+  myExpression->reset();
+  myIsInitialized = false;
 }
 
 void Model_AttributeDouble::setCalculatedValue(const double theValue)
@@ -38,7 +66,7 @@ void Model_AttributeDouble::setText(const std::string& theValue)
 {
   if (text() != theValue) {
     myExpression->setText(theValue);
-    // Send it to evaluator to convert into the double and store in the attribute
+    // Send it to evaluator to convert text to double and store in the attribute
     ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
     owner()->data()->sendAttributeUpdated(this);
   }