X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.h;h=2aa587a1d8f0819a5e8f5e9b4cf86c3752a3a41b;hb=b5893b0a30fac08134c24de4565cb513a43affa6;hp=71c663e90e26a84b59171a346ae08531c261e359;hpb=f8c36784f4699f0e3d04f4e8e067c7bd317b4a1c;p=modules%2Fshaper.git diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h index 71c663e90..2aa587a1d 100644 --- a/src/GeomData/GeomData_Point.h +++ b/src/GeomData/GeomData_Point.h @@ -12,7 +12,7 @@ #include -class ModelAPI_Expression; +class ModelAPI_ExpressionDouble; /**\class GeomData_Point * \ingroup DataModel @@ -21,7 +21,8 @@ class ModelAPI_Expression; class GeomData_Point : public GeomDataAPI_Point { enum { NUM_COMPONENTS = 3 }; - std::shared_ptr myExpression[NUM_COMPONENTS]; ///< Expressions for X, Y and Z + /// Expressions for X, Y and Z + std::shared_ptr myExpression[NUM_COMPONENTS]; public: /// Defines the double value GEOMDATA_EXPORT virtual void setValue(const double theX, const double theY, const double theZ); @@ -38,7 +39,8 @@ class GeomData_Point : public GeomDataAPI_Point GEOMDATA_EXPORT virtual std::shared_ptr pnt(); /// Defines the calculated double value - GEOMDATA_EXPORT virtual void setCalculatedValue(const double theX, const double theY, const double theZ); + GEOMDATA_EXPORT virtual + void setCalculatedValue(const double theX, const double theY, const double theZ); /// Defines the text values GEOMDATA_EXPORT virtual void setText(const std::string& theX, @@ -65,7 +67,7 @@ class GeomData_Point : public GeomDataAPI_Point GEOMDATA_EXPORT virtual std::string expressionError(int theComponent); /// Defines the used parameters - GEOMDATA_EXPORT virtual void setUsedParameters(int theComponent, + GEOMDATA_EXPORT virtual void setUsedParameters(int theComponent, const std::set& theUsedParameters); /// Returns the used parameters @@ -73,7 +75,9 @@ class GeomData_Point : public GeomDataAPI_Point protected: /// Initializes attributes - GEOMDATA_EXPORT GeomData_Point(TDF_Label& theLabel); + GEOMDATA_EXPORT GeomData_Point(); + /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc) + virtual void reinit(); friend class Model_Data; };