X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.cpp;h=0d1ff198f41dec8874ff0705fb052862a75c88a0;hb=ea593bc59e7e9461f6c4e2afd3f24d621edb1011;hp=7ae96b859bb5ddf46a17392e669e785868ff625a;hpb=f003def34d1a3dd56e87329920d1950f080c58d1;p=modules%2Fshaper.git diff --git a/src/GeomData/GeomData_Point.cpp b/src/GeomData/GeomData_Point.cpp index 7ae96b859..0d1ff198f 100644 --- a/src/GeomData/GeomData_Point.cpp +++ b/src/GeomData/GeomData_Point.cpp @@ -1,28 +1,64 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: GeomData_Point.cxx -// Created: 24 Apr 2014 -// Author: Mikhail PONIKAROV +// 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 +// #include "GeomData_Point.h" + #include -#include + #include #include +#include +#include -using namespace std; +#include -void GeomData_Point::setValue(const double theX, const double theY, const double theZ) +GeomData_Point::GeomData_Point() +{ + myIsInitialized = false; +} + +void GeomData_Point::reinit() { - 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); + myIsInitialized = true; + for (int aComponent = 0; aComponent < NUM_COMPONENTS; ++aComponent) { + myExpression[aComponent]->reinit(); + myIsInitialized = myIsInitialized && myExpression[aComponent]->isInitialized(); + } +} + +void GeomData_Point::setCalculatedValue(const double theX, const double theY, const double 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& thePoint) { setValue(thePoint->x(), thePoint->y(), thePoint->z()); @@ -30,23 +66,57 @@ void GeomData_Point::setValue(const std::shared_ptr& 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(); } +void GeomData_Point::setX(const double theX) +{ + if (!myIsInitialized) { + setCalculatedValue(theX, 0, 0); + } else if (x() != theX) { + myExpression[0]->setValue(theX); + myExpression[0]->setText(""); // uninitialize the text + owner()->data()->sendAttributeUpdated(this); + } +} + +void GeomData_Point::setY(const double theY) +{ + if (!myIsInitialized) { + setCalculatedValue(0, theY, 0); + } else if (y() != theY) { + myExpression[1]->setValue(theY); + myExpression[1]->setText(""); // uninitialize the text + owner()->data()->sendAttributeUpdated(this); + } +} + +void GeomData_Point::setZ(const double theZ) +{ + if (!myIsInitialized) { + setCalculatedValue(0, 0, theZ); + } + else if (z() != theZ) { + myExpression[2]->setValue(theZ); + myExpression[2]->setText(""); // uninitialize the text + owner()->data()->sendAttributeUpdated(this); + } +} + + std::shared_ptr GeomData_Point::pnt() { - std::shared_ptr aResult( - new GeomAPI_Pnt(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2))); + std::shared_ptr aResult(new GeomAPI_Pnt(x(), y(), z())); return aResult; } @@ -54,65 +124,106 @@ 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); + } +} + +void GeomData_Point::setTextX(const std::string& theX) +{ + if (!myIsInitialized) { + static const std::string aDefaultText = "0"; + setText(theX, aDefaultText, aDefaultText); + } + else if (textX() != theX) { + myExpression[0]->setText(theX); + // 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); + } +} + +void GeomData_Point::setTextY(const std::string& theY) +{ + if (!myIsInitialized) { + static const std::string aDefaultText = "0"; + setText(aDefaultText, theY, aDefaultText); + } + else if (textY() != theY) { + myExpression[1]->setText(theY); + // 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); + } +} + +void GeomData_Point::setTextZ(const std::string& theZ) +{ + if (!myIsInitialized) { + static const std::string aDefaultText = "0"; + setText(aDefaultText, aDefaultText, theZ); + } + else if (textZ() != theZ) { + 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& theUsedParameters) +{ + assert(theComponent >= 0 && theComponent < NUM_COMPONENTS); + myExpression[theComponent]->setUsedParameters(theUsedParameters); +} + +std::set GeomData_Point::usedParameters(int theComponent) const +{ + assert(theComponent >= 0 && theComponent < NUM_COMPONENTS); + return myExpression[theComponent]->usedParameters(); }