diff --git a/src/DDataStd/DDataStd.cxx b/src/DDataStd/DDataStd.cxx index db43c3f816..17eed9346e 100644 --- a/src/DDataStd/DDataStd.cxx +++ b/src/DDataStd/DDataStd.cxx @@ -68,10 +68,12 @@ void DDataStd::DumpConstraint (const Handle(TDataXtd_Constraint)& CTR, Standard_ anOS << " V ("; TDF_Tool::Entry(CTR->GetValue()->Label(),S); anOS << S << ") "; - TDataStd_RealEnum t = CTR->GetValue()->GetDimension(); + Standard_DISABLE_DEPRECATION_WARNINGS + TDataStd_RealEnum t = CTR->GetValue()->GetDimension(); TDataStd::Print(t,anOS); Standard_Real val = CTR->GetValue()->Get(); if (t == TDataStd_ANGULAR) val = (180.*val)/M_PI; + Standard_ENABLE_DEPRECATION_WARNINGS anOS << " "; anOS << val; } diff --git a/src/DDataStd/DDataStd_DrawDriver.cxx b/src/DDataStd/DDataStd_DrawDriver.cxx index 250aa700c9..3d793bb3be 100644 --- a/src/DDataStd/DDataStd_DrawDriver.cxx +++ b/src/DDataStd/DDataStd_DrawDriver.cxx @@ -339,7 +339,9 @@ Handle(Draw_Drawable3D) DDataStd_DrawDriver::DrawableConstraint (const Handle(TD if (!D.IsNull()) { if (!A->GetValue().IsNull()) { Standard_Real val = A->GetValue()->Get(); - if (A->GetValue()->GetDimension() == TDataStd_ANGULAR) val = (180.*val)/M_PI; + Standard_DISABLE_DEPRECATION_WARNINGS + if (A->GetValue()->GetDimension() == TDataStd_ANGULAR) val = (180. * val) / M_PI; + Standard_ENABLE_DEPRECATION_WARNINGS D->SetValue(val); } // unverified constraints are red (default is white) diff --git a/src/StdLPersistent/StdLPersistent_Real.hxx b/src/StdLPersistent/StdLPersistent_Real.hxx index 409051effb..4b6dfe6805 100644 --- a/src/StdLPersistent/StdLPersistent_Real.hxx +++ b/src/StdLPersistent/StdLPersistent_Real.hxx @@ -37,9 +37,11 @@ public: //! Import transient attribuite from the persistent data. void Import (const Handle(TDataStd_Real)& theAttribute) const { - theAttribute->Set (myValue); + theAttribute->Set (myValue); + Standard_DISABLE_DEPRECATION_WARNINGS theAttribute->SetDimension (static_cast (myDimension)); - theAttribute->SetID(TDataStd_Real::GetID()); + Standard_ENABLE_DEPRECATION_WARNINGS + theAttribute->SetID (TDataStd_Real::GetID()); } private: diff --git a/src/TDataStd/TDataStd_Real.cxx b/src/TDataStd/TDataStd_Real.cxx index fe5ab4d982..4f4f229983 100644 --- a/src/TDataStd/TDataStd_Real.cxx +++ b/src/TDataStd/TDataStd_Real.cxx @@ -204,7 +204,9 @@ void TDataStd_Real::Restore(const Handle(TDF_Attribute)& With) { Handle(TDataStd_Real) R = Handle(TDataStd_Real)::DownCast (With); myValue = R->Get(); + Standard_DISABLE_DEPRECATION_WARNINGS myDimension = R->GetDimension(); + Standard_ENABLE_DEPRECATION_WARNINGS myID = R->ID(); } @@ -220,7 +222,9 @@ void TDataStd_Real::Paste (const Handle(TDF_Attribute)& Into, { Handle(TDataStd_Real) R = Handle(TDataStd_Real)::DownCast (Into); R->Set(myValue); + Standard_DISABLE_DEPRECATION_WARNINGS R->SetDimension(myDimension); + Standard_ENABLE_DEPRECATION_WARNINGS R->SetID(myID); } @@ -232,7 +236,9 @@ void TDataStd_Real::Paste (const Handle(TDF_Attribute)& Into, Standard_OStream& TDataStd_Real::Dump (Standard_OStream& anOS) const { anOS << "Real "; - TDataStd::Print(GetDimension(),anOS); + Standard_DISABLE_DEPRECATION_WARNINGS + TDataStd::Print(GetDimension(), anOS); + Standard_ENABLE_DEPRECATION_WARNINGS anOS << myValue; Standard_Character sguid[Standard_GUID_SIZE_ALLOC]; myID.ToCString(sguid); diff --git a/src/TDataStd/TDataStd_Real.hxx b/src/TDataStd/TDataStd_Real.hxx index 049be3aa53..d20e0588c7 100644 --- a/src/TDataStd/TDataStd_Real.hxx +++ b/src/TDataStd/TDataStd_Real.hxx @@ -63,8 +63,14 @@ public: Standard_EXPORT TDataStd_Real(); + //! Obsolete method that will be removed in next versions. + //! This field is not supported in the persistence mechanism. + Standard_DEPRECATED("TDataStd_Real::SetDimension() is deprecated. Please avoid usage of this method.") Standard_EXPORT void SetDimension (const TDataStd_RealEnum DIM); + //! Obsolete method that will be removed in next versions. + //! This field is not supported in the persistence mechanism. + Standard_DEPRECATED("TDataStd_Real::GetDimension() is deprecated. Please avoid usage of this method.") Standard_EXPORT TDataStd_RealEnum GetDimension() const; @@ -107,6 +113,7 @@ private: Standard_Real myValue; + //! An obsolete field that will be removed in next versions. TDataStd_RealEnum myDimension; Standard_GUID myID; diff --git a/src/TDataStd/TDataStd_Variable.cxx b/src/TDataStd/TDataStd_Variable.cxx index 37a9e7327d..59f5818ce1 100644 --- a/src/TDataStd/TDataStd_Variable.cxx +++ b/src/TDataStd/TDataStd_Variable.cxx @@ -114,6 +114,18 @@ Handle(TDataStd_Real) TDataStd_Variable::Real() const return R; } + +//======================================================================= +//function : Set +//purpose : +//======================================================================= + +void TDataStd_Variable::Set (const Standard_Real value) const +{ + Handle(TDataStd_Real) R = TDataStd_Real::Set(Label(), value); +} + + //======================================================================= //function : Set //purpose : @@ -123,7 +135,9 @@ void TDataStd_Variable::Set (const Standard_Real value, const TDataStd_RealEnum { if (!IsValued()) { Handle(TDataStd_Real) R = TDataStd_Real::Set(Label(),value); + Standard_DISABLE_DEPRECATION_WARNINGS R->SetDimension (dimension); + Standard_ENABLE_DEPRECATION_WARNINGS } else { Handle(TDataStd_Real) R = TDataStd_Real::Set(Label(),value); diff --git a/src/TDataStd/TDataStd_Variable.hxx b/src/TDataStd/TDataStd_Variable.hxx index 4ae0279cd6..0a437f709c 100644 --- a/src/TDataStd/TDataStd_Variable.hxx +++ b/src/TDataStd/TDataStd_Variable.hxx @@ -76,12 +76,16 @@ public: //! returns string stored in the associated Name //! attribute. Standard_EXPORT const TCollection_ExtendedString& Name() const; - + //! retrieve or create the associated real attribute and - //! set the value . if creation, dimension is - //! written. - Standard_EXPORT void Set (const Standard_Real value, const TDataStd_RealEnum dimension = TDataStd_SCALAR) const; + //! set the value . + Standard_EXPORT void Set (const Standard_Real value) const; + //! Obsolete method that will be removed in next versions. + //! The dimension argument is not supported in the persistence mechanism. + Standard_DEPRECATED("TDataStd_Variable::Set(value, dimension) is deprecated. Please use TDataStd_Variable::Set(value) instead.") + Standard_EXPORT void Set (const Standard_Real value, const TDataStd_RealEnum dimension) const; + //! returns True if a Real attribute is associated. Standard_EXPORT Standard_Boolean IsValued() const;