Fix for exception on deletion of a Part from PartSet when it is active

[modules/shaper.git] / src / Model / Model_Expression.h

diff --git a/src/Model/Model_Expression.h b/src/Model/Model_Expression.h
index 4e48d15cc6cdcb378082a5b04e952d430c058325..2c5b2cd7a4fcd82b0456b391f75a12a4654f6f9b 100644 (file)
--- a/src/Model/Model_Expression.h
+++ b/src/Model/Model_Expression.h
@@ -50,8 +50,7 @@ class Model_Expression : public virtual ModelAPI_Expression
   Handle_TDataStd_Name myText; ///< Text representation of the attribute (may differ for parameters)
   Handle_TDataStd_Comment myError; ///< Error of expression of the text attribute
   Handle_TDataStd_ExtStringList myUsedParameters; ///< Parameters used in expression
-
-  friend class Model_Data;
+  TDF_Label myLab; ///< if attribute is not initialized, store label here
 };
 
 
@@ -64,6 +63,36 @@ class Model_ExpressionDouble :
     public ModelAPI_ExpressionDouble
 {
  public:
+  /// Sets the text of this Expression
+  MODEL_EXPORT virtual void setText(const std::string& theText) {
+    Model_Expression::setText(theText);
+  };
+
+  /// Returns the text of this Expression
+  MODEL_EXPORT virtual std::string text() const {
+    return Model_Expression::text();
+  };
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  MODEL_EXPORT virtual void setError(const std::string& theError) {
+    Model_Expression::setError(theError);
+  };
+
+  /// Returns an expression error
+  MODEL_EXPORT virtual std::string error() {
+    return Model_Expression::error();
+  };
+
+  /// Defines the used parameters (by the parameters listener)
+  MODEL_EXPORT virtual void setUsedParameters(const std::set<std::string>& theUsedParameters) {
+    Model_Expression::setUsedParameters(theUsedParameters);
+  };
+
+  /// Returns the used parameters
+  MODEL_EXPORT virtual std::set<std::string> usedParameters() const {
+    return Model_Expression::usedParameters();
+  };
+
   /// Defines the double value
   MODEL_EXPORT virtual void setValue(const double theValue);
 
@@ -79,7 +108,10 @@ class Model_ExpressionDouble :
  protected:
   /// Initializes attributes
   Model_ExpressionDouble(TDF_Label& theLabel);
+  /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
+  virtual void reinit();
 
+  friend class Model_AttributeDouble;
   friend class Model_Data;
 
  private:
@@ -96,6 +128,36 @@ class Model_ExpressionInteger :
     public ModelAPI_ExpressionInteger
 {
  public:
+  /// Sets the text of this Expression
+  MODEL_EXPORT virtual void setText(const std::string& theText) {
+    Model_Expression::setText(theText);
+  };
+
+  /// Returns the text of this Expression
+  MODEL_EXPORT virtual std::string text() const {
+    return Model_Expression::text();
+  };
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  MODEL_EXPORT virtual void setError(const std::string& theError) {
+    Model_Expression::setError(theError);
+  };
+
+  /// Returns an expression error
+  MODEL_EXPORT virtual std::string error() {
+    return Model_Expression::error();
+  };
+
+  /// Defines the used parameters (by the parameters listener)
+  MODEL_EXPORT virtual void setUsedParameters(const std::set<std::string>& theUsedParameters) {
+    Model_Expression::setUsedParameters(theUsedParameters);
+  };
+
+  /// Returns the used parameters
+  MODEL_EXPORT virtual std::set<std::string> usedParameters() const {
+    return Model_Expression::usedParameters();
+  };
+
   /// Defines the integer value
   MODEL_EXPORT virtual void setValue(const int theValue);
 
@@ -111,8 +173,10 @@ class Model_ExpressionInteger :
  protected:
   /// Initializes attributes
   Model_ExpressionInteger(TDF_Label& theLabel);
+  /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
+  virtual void reinit();
 
-  friend class Model_Data;
+  friend class Model_AttributeInteger;
 
  private:
   Handle_TDataStd_Integer myInteger;