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

diff --git a/src/Model/Model_Expression.h b/src/Model/Model_Expression.h
index 2963afd36..4e48d15cc 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,31 +22,15 @@
  * \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
-  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
  public:
-  /// 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();
-
   /// Allows to set expression (text) error (by the parameters listener)
   MODEL_EXPORT virtual void setError(const std::string& theError);
 
@@ -62,7 +47,75 @@ class Model_Expression : public ModelAPI_Expression
   /// 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;
 };
 
-#endif
+
+/**\class Model_ExpressionDouble
+ * \ingroup DataModel
+ * \brief Implementation of ModelAPI_ExpressionDouble.
+ */
+class Model_ExpressionDouble :
+    public Model_Expression, // implementation inheritance
+    public ModelAPI_ExpressionDouble
+{
+ public:
+  /// Defines the double value
+  MODEL_EXPORT virtual void setValue(const double theValue);
+
+  /// Returns the double value
+  MODEL_EXPORT virtual double 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_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:
+  /// 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_ExpressionInteger(TDF_Label& theLabel);
+
+  friend class Model_Data;
+
+ private:
+  Handle_TDataStd_Integer myInteger;
+};
+
+#endif // Model_Expression_H_