X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Expression.h;h=fa2be8f75736468a3c40bd5ea24a6cf9b049008d;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=2963afd3667ecd5b325aa6efb9cfe3b6e23304a3;hpb=f8c36784f4699f0e3d04f4e8e067c7bd317b4a1c;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Expression.h b/src/Model/Model_Expression.h
index 2963afd36..fa2be8f75 100644
--- a/src/Model/Model_Expression.h
+++ b/src/Model/Model_Expression.h
@@ -12,6 +12,7 @@
 
 #include <TDataStd_Comment.hxx>
 #include <TDataStd_ExtStringList.hxx>
+#include <TDataStd_Integer.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDataStd_Real.hxx>
 
@@ -21,48 +22,160 @@
  * \ingroup DataModel
  * \brief Implementation of ModelAPI_Expression.
  */
-class Model_Expression : public ModelAPI_Expression
+class Model_Expression : public virtual ModelAPI_Expression
 {
-  Handle_TDataStd_Real myReal; ///< double is Real attribute
+ public:
+  /// Sets the text of this Expression
+  MODEL_EXPORT virtual void setText(const std::string& theText);
+
+  /// Returns the text of this Expression
+  MODEL_EXPORT virtual std::string text() const;
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  MODEL_EXPORT virtual void setError(const std::string& theError);
+
+  /// Returns an expression error
+  MODEL_EXPORT virtual std::string error();
+
+  /// Defines the used parameters (by the parameters listener)
+  MODEL_EXPORT virtual void setUsedParameters(const std::set<std::string>& theUsedParameters);
+
+  /// Returns the used parameters
+  MODEL_EXPORT virtual std::set<std::string> usedParameters() const;
+
+ protected:
+  /// Initializes attributes
+  Model_Expression(TDF_Label& theLabel);
+
   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;
+};
+
+
+/**\class Model_ExpressionDouble
+ * \ingroup DataModel
+ * \brief Implementation of ModelAPI_ExpressionDouble.
+ */
+class Model_ExpressionDouble :
+    public Model_Expression, // implementation inheritance
+    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);
 
   /// Returns the double value
   MODEL_EXPORT virtual double value();
 
-  /// Sets the text of this Expression
-  MODEL_EXPORT virtual void setText(const std::string& theText);
-
-  /// Returns the text of this Expression
-  MODEL_EXPORT virtual std::string text() const;
-
   /// Allows to set expression (text) as invalid (by the parameters listener)
   MODEL_EXPORT virtual void setInvalid(const bool theFlag);
 
   /// Returns true if text is invalid
   MODEL_EXPORT virtual bool isInvalid();
 
+ protected:
+  /// Initializes attributes
+  Model_ExpressionDouble(TDF_Label& theLabel);
+
+  friend class Model_Data;
+
+ private:
+  Handle_TDataStd_Real myReal; ///< double is Real attribute
+};
+
+
+/**\class Model_ExpressionInteger
+ * \ingroup DataModel
+ * \brief Implementation of ModelAPI_ExpressionInteger.
+ */
+class Model_ExpressionInteger :
+    public Model_Expression, // implementation inheritance
+    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_EXPORT virtual void setError(const std::string& theError) {
+    Model_Expression::setError(theError);
+  };
 
   /// Returns an expression error
-  MODEL_EXPORT virtual std::string 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_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;
+  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);
+
+  /// Returns the integer value
+  MODEL_EXPORT virtual int value();
+
+  /// Allows to set expression (text) as invalid (by the parameters listener)
+  MODEL_EXPORT virtual void setInvalid(const bool theFlag);
+
+  /// Returns true if text is invalid
+  MODEL_EXPORT virtual bool isInvalid();
 
  protected:
   /// Initializes attributes
-  Model_Expression(TDF_Label& theLabel);
+  Model_ExpressionInteger(TDF_Label& theLabel);
 
   friend class Model_Data;
+
+ private:
+  Handle_TDataStd_Integer myInteger;
 };
 
-#endif
+#endif // Model_Expression_H_