Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

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

diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index d498bc42ba2e89b968102edf14e6da4685a0d2a2..951c99613ad1f0640acd05890c1c9607dc3841a6 100644 (file)
--- a/src/Model/Model_AttributeDouble.h
+++ b/src/Model/Model_AttributeDouble.h
@@ -1,35 +1,46 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Model_AttributeDouble.h
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeDouble_HeaderFile
-#define Model_AttributeDouble_HeaderFile
+#ifndef Model_AttributeDouble_H_
+#define Model_AttributeDouble_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeDouble.h"
 #include <TDataStd_Real.hxx>
 #include <TDF_Label.hxx>
 
+#include <TDataStd_Name.hxx>
+
 /**\class Model_AttributeDouble
  * \ingroup DataModel
  * \brief Attribute that contains real value with double precision.
  */
 
-class MODEL_EXPORT Model_AttributeDouble : public ModelAPI_AttributeDouble
+class Model_AttributeDouble : public ModelAPI_AttributeDouble
 {
-  Handle_TDataStd_Real myReal; ///< double is Real attribute
-public:
+  Handle_TDataStd_Real myReal;  ///< double is Real attribute
+  Handle_TDataStd_Name myText;  ///< Text representation of the attribute (may differ for parametres)
+ public:
+  /// Defines the double value
+  MODEL_EXPORT virtual void setValue(const double theValue);
+
+  /// Returns the double value
+  MODEL_EXPORT virtual double value();
+
   /// Defines the double value
-  virtual void setValue(const double theValue);
+  MODEL_EXPORT virtual void setText(const std::string& theText);
 
   /// Returns the double value
-  virtual double value();
+  MODEL_EXPORT virtual std::string text();
 
-protected:
+ protected:
   /// Initializes attibutes
   Model_AttributeDouble(TDF_Label& theLabel);
 
-  friend class Model_Object;
+  friend class Model_Data;
 };
 
 #endif