X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.cpp;h=f6becd98da1e7c418eecb0e0b61df4396371cb88;hb=383021cb51c4720904096ca851db5ee79255b402;hp=e76498c00db8fbfcd830d8bfa98fbc7f918685f6;hpb=b719c47b37c8dde30c075260dd1457d8f8a00f72;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point.cpp b/src/GeomData/GeomData_Point.cpp
index e76498c00..f6becd98d 100644
--- a/src/GeomData/GeomData_Point.cpp
+++ b/src/GeomData/GeomData_Point.cpp
@@ -5,23 +5,38 @@
 // Author:      Mikhail PONIKAROV
 
 #include "GeomData_Point.h"
+
 #include <GeomAPI_Pnt.h>
-#include <ModelAPI_Feature.h>
+
 #include <ModelAPI_Data.h>
+#include <ModelAPI_Events.h>
+#include <ModelAPI_Expression.h>
+#include <ModelAPI_Feature.h>
 
-using namespace std;
+#include <cassert>
 
-void GeomData_Point::setValue(const double theX, const double theY, const double theZ)
+GeomData_Point::GeomData_Point()
+{
+  myIsInitialized = false;
+}
+
+void GeomData_Point::setCalculatedValue(const double theX, const double theY, const double theZ)
 {
-  if (!myIsInitialized || myCoords->Value(0) != theX || myCoords->Value(1) != theY
-      || myCoords->Value(2) != theZ) {
-    myCoords->SetValue(0, theX);
-    myCoords->SetValue(1, theY);
-    myCoords->SetValue(2, theZ);
+  if (!myIsInitialized || x() != theX || y() != theY || z() != theZ) {
+    myExpression[0]->setValue(theX);
+    myExpression[1]->setValue(theY);
+    myExpression[2]->setValue(theZ);
     owner()->data()->sendAttributeUpdated(this);
   }
 }
 
+void GeomData_Point::setValue(const double theX, const double theY, const double theZ)
+{
+  setCalculatedValue(textX().empty() ? theX : x(),
+                     textY().empty() ? theY : y(),
+                     textZ().empty() ? theZ : z());
+}
+
 void GeomData_Point::setValue(const std::shared_ptr<GeomAPI_Pnt>& thePoint)
 {
   setValue(thePoint->x(), thePoint->y(), thePoint->z());
@@ -29,23 +44,22 @@ void GeomData_Point::setValue(const std::shared_ptr<GeomAPI_Pnt>& thePoint)
 
 double GeomData_Point::x() const
 {
-  return myCoords->Value(0);
+  return myExpression[0]->value();
 }
 
 double GeomData_Point::y() const
 {
-  return myCoords->Value(1);
+  return myExpression[1]->value();
 }
 
 double GeomData_Point::z() const
 {
-  return myCoords->Value(2);
+  return myExpression[2]->value();
 }
 
 std::shared_ptr<GeomAPI_Pnt> GeomData_Point::pnt()
 {
-  std::shared_ptr<GeomAPI_Pnt> aResult(
-      new GeomAPI_Pnt(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
+  std::shared_ptr<GeomAPI_Pnt> aResult(new GeomAPI_Pnt(x(), y(), z()));
   return aResult;
 }
 
@@ -53,63 +67,63 @@ void GeomData_Point::setText(const std::string& theX,
                              const std::string& theY,
                              const std::string& theZ)
 {
-  TCollection_ExtendedString aX(theX.c_str());
-  TCollection_ExtendedString aY(theY.c_str());
-  TCollection_ExtendedString aZ(theZ.c_str());
-
-  if (!myIsInitialized ||
-      myTextArray->Value(0) != aX ||
-      myTextArray->Value(1) != aY ||
-      myTextArray->Value(2) != aZ) {
-    myTextArray->SetValue(0, aX);
-    myTextArray->SetValue(1, aY);
-    myTextArray->SetValue(2, aZ);
+  if (!myIsInitialized || textX() != theX || textY() != theY || textZ() != theZ) {
+    myExpression[0]->setText(theX);
+    myExpression[1]->setText(theY);
+    myExpression[2]->setText(theZ);
+    // Send it to evaluator to convert into the double and store in the attribute
+    ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
     owner()->data()->sendAttributeUpdated(this);
   }
 }
 
 std::string GeomData_Point::textX()
 {
-  return TCollection_AsciiString(myTextArray->Value(0)).ToCString();;
+  return myExpression[0]->text();
 }
 std::string GeomData_Point::textY()
 {
-  return TCollection_AsciiString(myTextArray->Value(1)).ToCString();;
+  return myExpression[1]->text();
 }
 std::string GeomData_Point::textZ()
 {
-  return TCollection_AsciiString(myTextArray->Value(2)).ToCString();;
+  return myExpression[2]->text();
 }
 
 void GeomData_Point::setExpressionInvalid(int theComponent, bool theFlag)
 {
-  if (!myIsInitialized || myExpressionInvalidArray->Value(theComponent) != theFlag) {
-    myExpressionInvalidArray->SetValue(theComponent, theFlag);
-  }
+  assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
+  if (!myIsInitialized || expressionInvalid(theComponent) != theFlag)
+    myExpression[theComponent]->setInvalid(theFlag);
 }
 
 bool GeomData_Point::expressionInvalid(int theComponent)
 {
-  return myExpressionInvalidArray->Value(theComponent);
+  assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
+  return myExpression[theComponent]->isInvalid();
 }
 
-GeomData_Point::GeomData_Point(TDF_Label& theLabel)
+void GeomData_Point::setExpressionError(int theComponent, const std::string& theError)
 {
-  myIsInitialized = true;
+  assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
+  if (expressionError(theComponent) != theError)
+    myExpression[theComponent]->setError(theError);
+}
 
-  if (theLabel.FindAttribute(TDataStd_RealArray::GetID(), myCoords) != Standard_True) {
-    // create attribute: not initialized by value yet, just zero
-    myCoords = TDataStd_RealArray::Set(theLabel, 0, 2);
-    myIsInitialized = false;
-  }
-  if (theLabel.FindAttribute(TDataStd_ExtStringArray::GetID(), myTextArray) != Standard_True) {
-    // create attribute: not initialized by value yet, just zero
-    myTextArray = TDataStd_ExtStringArray::Set(theLabel, 0, 2);
-    myIsInitialized = false;
-  }
-  if (theLabel.FindAttribute(TDataStd_BooleanArray::GetID(), myExpressionInvalidArray) != Standard_True) {
-    // create attribute: not initialized by value yet, just zero
-    myExpressionInvalidArray = TDataStd_BooleanArray::Set(theLabel, 0, 2);
-    myIsInitialized = false;
-  }
+std::string GeomData_Point::expressionError(int theComponent)
+{
+  assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
+  return myExpression[theComponent]->error();
+}
+
+void GeomData_Point::setUsedParameters(int theComponent, const std::set<std::string>& theUsedParameters)
+{
+  assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
+  myExpression[theComponent]->setUsedParameters(theUsedParameters);
+}
+
+std::set<std::string> GeomData_Point::usedParameters(int theComponent) const
+{
+  assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
+  return myExpression[theComponent]->usedParameters();
 }