diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx index 44b838a494..a04d586f7d 100644 --- a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx +++ b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx @@ -119,14 +119,14 @@ Standard_Boolean BinMXCAFDoc_LocationDriver::Translate(const BinObjMgt_Persisten Standard_Real aScaleFactor; theSource >> aScaleFactor; - aTrsf._CSFDB_Setgp_Trsfscale(aScaleFactor); + aTrsf.SetScaleFactor(aScaleFactor); Standard_Integer aForm; theSource >> aForm; - aTrsf._CSFDB_Setgp_Trsfshape((gp_TrsfForm)aForm); + aTrsf.SetForm((gp_TrsfForm)aForm); Standard_Integer R, C; - gp_Mat& aMat = (gp_Mat&)aTrsf._CSFDB_Getgp_Trsfmatrix(); + gp_Mat& aMat = (gp_Mat&)aTrsf.HVectorialPart(); for(R = 1; R <= 3; R++) for(C = 1; C <= 3; C++) { Standard_Real aVal; @@ -136,7 +136,7 @@ Standard_Boolean BinMXCAFDoc_LocationDriver::Translate(const BinObjMgt_Persisten Standard_Real x, y, z; theSource >> x >> y >> z; - gp_XYZ& aLoc = (gp_XYZ&)aTrsf._CSFDB_Getgp_Trsfloc(); + gp_XYZ& aLoc = (gp_XYZ&)aTrsf.TranslationPart(); aLoc.SetX(x); aLoc.SetY(y); aLoc.SetZ(z); diff --git a/src/Draw/Draw_Color.cdl b/src/Draw/Draw_Color.cdl index a022382c74..fc178c12a5 100644 --- a/src/Draw/Draw_Color.cdl +++ b/src/Draw/Draw_Color.cdl @@ -14,7 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Color from Draw inherits Storable +class Color from Draw ---Purpose: diff --git a/src/Extrema/Extrema_Point.cdl b/src/Extrema/Extrema_Point.cdl index 09975469be..d4c023eb48 100644 --- a/src/Extrema/Extrema_Point.cdl +++ b/src/Extrema/Extrema_Point.cdl @@ -15,7 +15,6 @@ -- commercial license or contractual agreement. generic class Point from Extrema (Pnt as any) - inherits Storable from Standard ---Purpose: Definition of a point on curve. diff --git a/src/GccAna/GccAna_Circ2dTanOnRad.cdl b/src/GccAna/GccAna_Circ2dTanOnRad.cdl index a21a0b8d3f..0df04db9bc 100644 --- a/src/GccAna/GccAna_Circ2dTanOnRad.cdl +++ b/src/GccAna/GccAna_Circ2dTanOnRad.cdl @@ -40,8 +40,6 @@ from GccAna -- distance between C1 and OnLine is lower than or -- equal Tolerance. ---inherits Storable from Standard - uses Pnt2d from gp, Lin2d from gp, Circ2d from gp, diff --git a/src/GccAna/GccAna_Lin2dTanObl.cdl b/src/GccAna/GccAna_Lin2dTanObl.cdl index 3fca5fbe72..d8a8fe3f0f 100644 --- a/src/GccAna/GccAna_Lin2dTanObl.cdl +++ b/src/GccAna/GccAna_Lin2dTanObl.cdl @@ -27,8 +27,6 @@ from GccAna -- Its direction is making an angle Angle with the -- second argument. ---inherits Storable from Standard - uses Lin2d from gp, Pnt2d from gp, QualifiedCirc from GccEnt, diff --git a/src/GccAna/GccAna_Lin2dTanPer.cdl b/src/GccAna/GccAna_Lin2dTanPer.cdl index cc3eb15c0c..b75aff72c2 100644 --- a/src/GccAna/GccAna_Lin2dTanPer.cdl +++ b/src/GccAna/GccAna_Lin2dTanPer.cdl @@ -29,8 +29,6 @@ from GccAna -- - defining the construction of 2D line(s), -- - implementing the construction algorithm, and -- - consulting the result(s). - ---inherits Storable from Standard uses Pnt2d from gp, Lin2d from gp, diff --git a/src/GccAna/GccAna_LinPnt2dBisec.cdl b/src/GccAna/GccAna_LinPnt2dBisec.cdl index 599330f92d..df198f3568 100644 --- a/src/GccAna/GccAna_LinPnt2dBisec.cdl +++ b/src/GccAna/GccAna_LinPnt2dBisec.cdl @@ -29,8 +29,6 @@ from GccAna -- - implementing the construction algorithm, and -- - consulting the result. ---inherits Storable from Standard - uses Lin2d from gp, Pnt2d from gp, Bisec from GccInt diff --git a/src/GccEnt/GccEnt_QualifiedCirc.cdl b/src/GccEnt/GccEnt_QualifiedCirc.cdl index d59b70df1e..e202c95018 100644 --- a/src/GccEnt/GccEnt_QualifiedCirc.cdl +++ b/src/GccEnt/GccEnt_QualifiedCirc.cdl @@ -26,8 +26,6 @@ from GccEnt -- - is enclosed by the circle, or -- - is built so that both the circle and it are external to one another, or -- - is undefined (all solutions apply). - -inherits Storable from Standard uses Position from GccEnt, Circ2d from gp diff --git a/src/GccEnt/GccEnt_QualifiedLin.cdl b/src/GccEnt/GccEnt_QualifiedLin.cdl index f05cdaf852..acaf78ca47 100644 --- a/src/GccEnt/GccEnt_QualifiedLin.cdl +++ b/src/GccEnt/GccEnt_QualifiedLin.cdl @@ -18,8 +18,6 @@ class QualifiedLin from GccEnt -inherits Storable from Standard - --- Purpose: Describes a qualified 2D line. -- A qualified 2D line is a line (gp_Lin2d line) with a -- qualifier which specifies whether the solution of a diff --git a/src/IGESData/IGESData_DefSwitch.cdl b/src/IGESData/IGESData_DefSwitch.cdl index 5828f92f11..d80d866fe5 100644 --- a/src/IGESData/IGESData_DefSwitch.cdl +++ b/src/IGESData/IGESData_DefSwitch.cdl @@ -14,7 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class DefSwitch from IGESData inherits Storable +class DefSwitch from IGESData ---Purpose : description of a directory componant which can be either -- undefined (let Void), defined as a Reference to an entity, diff --git a/src/IGESData/IGESData_DirPart.cdl b/src/IGESData/IGESData_DirPart.cdl index a31825fbab..59b4023ca2 100644 --- a/src/IGESData/IGESData_DirPart.cdl +++ b/src/IGESData/IGESData_DirPart.cdl @@ -14,7 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class DirPart from IGESData inherits Storable -- for Array +class DirPart from IGESData -- for Array ---Purpose : litteral/numeric description of an entity's directory section, -- taken from file diff --git a/src/IntAna2d/IntAna2d_IntPoint.cdl b/src/IntAna2d/IntAna2d_IntPoint.cdl index 92b9214a73..38e59dfa3d 100644 --- a/src/IntAna2d/IntAna2d_IntPoint.cdl +++ b/src/IntAna2d/IntAna2d_IntPoint.cdl @@ -14,7 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class IntPoint from IntAna2d inherits Storable from Standard +class IntPoint from IntAna2d ---Purpose: Geometrical intersection between two 2d elements. diff --git a/src/IntRes2d/IntRes2d_IntersectionPoint.cdl b/src/IntRes2d/IntRes2d_IntersectionPoint.cdl index dea859a6d0..3c3d651efd 100644 --- a/src/IntRes2d/IntRes2d_IntersectionPoint.cdl +++ b/src/IntRes2d/IntRes2d_IntersectionPoint.cdl @@ -19,9 +19,6 @@ class IntersectionPoint from IntRes2d ---Purpose: Definition of an intersection point between two -- 2D curves. - -inherits Storable from Standard - uses Pnt2d from gp, Transition from IntRes2d is diff --git a/src/IntRes2d/IntRes2d_IntersectionSegment.cdl b/src/IntRes2d/IntRes2d_IntersectionSegment.cdl index 3513c6fe86..42df5921f9 100644 --- a/src/IntRes2d/IntRes2d_IntersectionSegment.cdl +++ b/src/IntRes2d/IntRes2d_IntersectionSegment.cdl @@ -19,9 +19,6 @@ class IntersectionSegment from IntRes2d ---Purpose: Definition of an intersection curve between -- two 2D curves. - -inherits Storable from Standard - uses IntersectionPoint from IntRes2d raises DomainError from Standard diff --git a/src/IntRes2d/IntRes2d_Transition.cdl b/src/IntRes2d/IntRes2d_Transition.cdl index 8f741224a7..20d83eb6f0 100644 --- a/src/IntRes2d/IntRes2d_Transition.cdl +++ b/src/IntRes2d/IntRes2d_Transition.cdl @@ -16,8 +16,6 @@ class Transition from IntRes2d -inherits Storable from Standard - ---Purpose: Definition of the type of transition near an -- intersection point between two curves. The transition -- is either a "true transition", which means that one of diff --git a/src/Interface/Interface_EntityList.cdl b/src/Interface/Interface_EntityList.cdl index 5bbeb87f45..502d775fbc 100644 --- a/src/Interface/Interface_EntityList.cdl +++ b/src/Interface/Interface_EntityList.cdl @@ -14,7 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class EntityList from Interface -- inherits Storable +class EntityList from Interface ---Purpose : This class defines a list of Entities (Transient Objects), -- it can be used as a field of other Transient classes, with diff --git a/src/Quantity/Quantity_Color.cdl b/src/Quantity/Quantity_Color.cdl index 875c3358e2..526e6e791b 100644 --- a/src/Quantity/Quantity_Color.cdl +++ b/src/Quantity/Quantity_Color.cdl @@ -14,7 +14,6 @@ -- commercial license or contractual agreement. class Color from Quantity -inherits Storable ---Purpose: This class allows the definition of a colour. -- The names of the colours are from the X11 specification. diff --git a/src/Quantity/Quantity_Date.cdl b/src/Quantity/Quantity_Date.cdl index 41c76170ef..d53ad2cfcc 100644 --- a/src/Quantity/Quantity_Date.cdl +++ b/src/Quantity/Quantity_Date.cdl @@ -14,9 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Date from Quantity - -inherits Storable from Standard +class Date from Quantity ---Purpose: This class provides services to manage date information. -- A date represents the following time intervals: diff --git a/src/Quantity/Quantity_Period.cdl b/src/Quantity/Quantity_Period.cdl index 814a1c306b..07fbdb5cd5 100644 --- a/src/Quantity/Quantity_Period.cdl +++ b/src/Quantity/Quantity_Period.cdl @@ -20,8 +20,6 @@ class Period from Quantity -- gives the interval between two dates. -- A period is expressed in seconds and microseconds. -inherits Storable from Standard - raises PeriodDefinitionError is diff --git a/src/Standard/Standard.cdl b/src/Standard/Standard.cdl index 311f32dec6..f3f468adcb 100644 --- a/src/Standard/Standard.cdl +++ b/src/Standard/Standard.cdl @@ -73,19 +73,19 @@ is class AncestorIterator; - deferred class Storable ; - primitive Boolean inherits Storable; - primitive Character inherits Storable; - primitive ExtCharacter inherits Storable; - primitive Integer inherits Storable; - primitive Byte inherits Storable; - primitive Real inherits Storable; - primitive ShortReal inherits Storable; - primitive Time inherits Storable; - primitive OId inherits Storable; + primitive Boolean; + primitive Character; + primitive ExtCharacter; + primitive Integer; + primitive Byte; + primitive Real; + primitive ShortReal; + primitive Time; + primitive OId; + + class GUID; - deferred class Persistent ; -- inherits Storable - class GUID; -- inherits Storable + deferred class Persistent ; deferred class Transient ; class Type; -- inherits Transient diff --git a/src/Standard/Standard_GUID.cdl b/src/Standard/Standard_GUID.cdl index 6a15a597ba..9b720341eb 100644 --- a/src/Standard/Standard_GUID.cdl +++ b/src/Standard/Standard_GUID.cdl @@ -14,9 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class GUID from Standard - -inherits Storable from Standard +class GUID from Standard is Create returns GUID from Standard; diff --git a/src/Standard/Standard_Persistent.cdl b/src/Standard/Standard_Persistent.cdl index d0e5156788..091ce8dfc2 100644 --- a/src/Standard/Standard_Persistent.cdl +++ b/src/Standard/Standard_Persistent.cdl @@ -15,8 +15,6 @@ -- commercial license or contractual agreement. deferred class Persistent from Standard -inherits - Storable from Standard ---Purpose: -- The root of the entire persistent class hierarchy. @@ -59,7 +57,7 @@ uses is - Delete (me: mutable) is redefined; + Delete (me: mutable) is virtual; ---Purpose: Deletes this object. diff --git a/src/Standard/Standard_PrimitiveTypes.hxx b/src/Standard/Standard_PrimitiveTypes.hxx index ab186f42b5..342f6615bb 100644 --- a/src/Standard/Standard_PrimitiveTypes.hxx +++ b/src/Standard/Standard_PrimitiveTypes.hxx @@ -34,7 +34,6 @@ class Standard_Transient; #include #include #include -#include __Standard_API Standard_Integer HashCode(const Standard_Address, const Standard_Integer, diff --git a/src/Standard/Standard_Real.hxx b/src/Standard/Standard_Real.hxx index b70687c561..1dc7008c23 100644 --- a/src/Standard/Standard_Real.hxx +++ b/src/Standard/Standard_Real.hxx @@ -31,7 +31,6 @@ // ================================== // Methods implemeted in Standard_Real.cxx // ================================== -//.... Herited from Standard_Storable __Standard_API Standard_Integer HashCode (const Standard_Real, const Standard_Integer); __Standard_API Standard_Real ACos (const Standard_Real ); diff --git a/src/Standard/Standard_ShortReal.hxx b/src/Standard/Standard_ShortReal.hxx index 6549839262..1c4d9c5ca8 100644 --- a/src/Standard/Standard_ShortReal.hxx +++ b/src/Standard/Standard_ShortReal.hxx @@ -141,7 +141,6 @@ inline Standard_ShortReal Min (const Standard_ShortReal Val1, // ================================== // Methods implemeted in Standard_ShortReal.cxx // ================================== -//.... Herited from Standard_Storable __Standard_API Standard_Integer HashCode (const Standard_ShortReal, const Standard_Integer); //------------------------------------------------------------------- diff --git a/src/Standard/Standard_Storable.cdl b/src/Standard/Standard_Storable.cdl deleted file mode 100644 index 6210692945..0000000000 --- a/src/Standard/Standard_Storable.cdl +++ /dev/null @@ -1,53 +0,0 @@ --- Created on: 1991-09-05 --- Created by: jean pierre TIRAULT --- Copyright (c) 1991-1999 Matra Datavision --- Copyright (c) 1999-2014 OPEN CASCADE SAS --- --- This file is part of Open CASCADE Technology software library. --- --- This library is free software; you can redistribute it and/or modify it under --- the terms of the GNU Lesser General Public License version 2.1 as published --- by the Free Software Foundation, with special exception defined in the file --- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT --- distribution for complete text of the license and disclaimer of any warranty. --- --- Alternatively, this file may be used under the terms of Open CASCADE --- commercial license or contractual agreement. - -deferred class Storable from Standard - - ---Purpose: This class Storable is an abstract class that allows built-in - -- primitive types to be extended. They are not themselves - -- persistent, but are known by the database, therefore can be used - -- to define the internal representation of persistent objects. - -- Otherwise, all the fields of subclasses of Object MUST inherit - -- from Storable. - -- - -- This class provides also a framework for copying, comparing and - -- printing. - -is - Delete ( me : out ) is virtual; - ---C++: alias "Standard_EXPORT virtual ~Standard_Storable(){Delete();}" - - HashCode (me; Upper : Integer ) returns Integer is virtual; - ---Purpose: Returns a hashed value denoting . This value is in - -- the range 1... - ---C++: function call - ---Level: Advanced - - IsEqual (me; Other : Storable) returns Boolean - ---Purpose: Returns true if the direct contents of and - -- are memberwise equal. - ---C++: alias operator == - ---Level: Public - is static; - - IsSimilar (me; Other : Storable) returns Boolean; - ---Purpose: Returns true if the Deep contents of and - -- are memberwise equal. - ---C++: function call - ---Level: Public - -end Storable; - diff --git a/src/Standard/Standard_Storable.cxx b/src/Standard/Standard_Storable.cxx deleted file mode 100644 index 0c34cdfb1b..0000000000 --- a/src/Standard/Standard_Storable.cxx +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -void Standard_Storable::Delete() -{} - -//======================================================================== -Standard_Integer Standard_Storable::HashCode(const Standard_Integer Upper)const -{ - return ::HashCode((Standard_Address) this, Upper, STANDARD_TYPE(Standard_Storable)); -} - -//======================================================================== -Standard_Boolean Standard_Storable::IsEqual(const Standard_Storable& ) const -{ - return Standard_True; -} - -//======================================================================== -Standard_Boolean Standard_Storable::IsSimilar(const Standard_Storable& ) const -{ - return Standard_True; -} diff --git a/src/StepData/StepData_SelectType.cdl b/src/StepData/StepData_SelectType.cdl index 8c95e60f40..c22d212248 100644 --- a/src/StepData/StepData_SelectType.cdl +++ b/src/StepData/StepData_SelectType.cdl @@ -14,7 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -deferred class SelectType from StepData -- inherits Storable +deferred class SelectType from StepData ---Purpose : SelectType is the basis used for SELECT_TYPE definitions from -- the EXPRESS form. A SELECT_TYPE in EXPRESS is an enumeration @@ -22,8 +22,8 @@ deferred class SelectType from StepData -- inherits Storable -- no specific Methods, and no exclusivity (a given Type can be -- member of several SELECT_TYPES, plus be itself a SUB_TYPE). -- - -- A SelectType can be field of a Transient Entity (it is itself - -- Storable) or only used to control an input Argument + -- A SelectType can be field of a Transient Entity or only used + -- to control an input Argument -- -- This class implies to designate each member Type by a Case -- Number which is a positive Integer value (this allows a faster diff --git a/src/Storage/FILES b/src/Storage/FILES index cda112b25b..4895e42890 100755 --- a/src/Storage/FILES +++ b/src/Storage/FILES @@ -1,4 +1,3 @@ Storage_Macros.hxx Storage_BucketOfPersistent.hxx Storage_Position.hxx -Storage_Container.hxx diff --git a/src/Storage/Storage.cdl b/src/Storage/Storage.cdl index cdb172530b..5797b2ae80 100644 --- a/src/Storage/Storage.cdl +++ b/src/Storage/Storage.cdl @@ -109,8 +109,6 @@ is ReadSolve end; - primitive Container inherits Storable from Standard; - imported BucketOfPersistent; imported Position; -- typedef long diff --git a/src/Storage/Storage_Container.hxx b/src/Storage/Storage_Container.hxx deleted file mode 100644 index eaec1a40f2..0000000000 --- a/src/Storage/Storage_Container.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Storage_Container_HeaderFile -#define _Storage_Container_HeaderFile - -class Storage_BaseDriver; - -typedef Storage_BaseDriver* Storage_Container; - -Storage_Container& Storage_CurrentContainer(); - -#endif - diff --git a/src/XmlMNaming/XmlMNaming_Shape1.cdl b/src/XmlMNaming/XmlMNaming_Shape1.cdl index 6a43059a81..49d81f5399 100644 --- a/src/XmlMNaming/XmlMNaming_Shape1.cdl +++ b/src/XmlMNaming/XmlMNaming_Shape1.cdl @@ -13,7 +13,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Shape1 from XmlMNaming inherits Storable +class Shape1 from XmlMNaming ---Purpose: The XmlMNaming_Shape1 is the Persistent view of a TopoDS_Shape. -- diff --git a/src/XmlObjMgt/XmlObjMgt_GP.cxx b/src/XmlObjMgt/XmlObjMgt_GP.cxx index cba7f8ad55..096c029a6e 100644 --- a/src/XmlObjMgt/XmlObjMgt_GP.cxx +++ b/src/XmlObjMgt/XmlObjMgt_GP.cxx @@ -78,19 +78,19 @@ Standard_Boolean XmlObjMgt_GP::Translate Standard_Real aScaleFactor = Standard_Real(Strtod (aStr, &ptr)); if (ptr != aStr && errno != ERANGE && errno != EINVAL) { - T._CSFDB_Setgp_Trsfscale(aScaleFactor); + T.SetScaleFactor(aScaleFactor); aStr = ptr; Standard_Integer aForm = Standard_Integer(strtol(aStr, &ptr, 10)); if (ptr != aStr && errno != ERANGE && errno != EINVAL) { - T._CSFDB_Setgp_Trsfshape((gp_TrsfForm)aForm); + T.SetForm((gp_TrsfForm)aForm); aStr = ptr; // gp_Mat aMatr; - aStr = ::Translate(aStr, (gp_Mat&)T._CSFDB_Getgp_Trsfmatrix()); + aStr = ::Translate(aStr, (gp_Mat&)T.HVectorialPart()); if (aStr) { // gp_XYZ aTransl; - ::Translate(aStr, (gp_XYZ&)T._CSFDB_Getgp_Trsfloc()); + ::Translate(aStr, (gp_XYZ&)T.TranslationPart()); aResult = Standard_True; } } diff --git a/src/gp/gp_Ax1.cdl b/src/gp/gp_Ax1.cdl index 0b21744800..2988eaeead 100644 --- a/src/gp/gp_Ax1.cdl +++ b/src/gp/gp_Ax1.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Ax1 from gp inherits Storable +class Ax1 from gp --- Purpose : Describes an axis in 3D space. -- An axis is defined by: diff --git a/src/gp/gp_Ax2.cdl b/src/gp/gp_Ax2.cdl index e2441b87cd..5553b4a311 100644 --- a/src/gp/gp_Ax2.cdl +++ b/src/gp/gp_Ax2.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Ax2 from gp inherits Storable +class Ax2 from gp --- Purpose : -- Describes a right-handed coordinate system in 3D space. diff --git a/src/gp/gp_Ax22d.cdl b/src/gp/gp_Ax22d.cdl index a66aafa374..a2cf04ccbf 100644 --- a/src/gp/gp_Ax22d.cdl +++ b/src/gp/gp_Ax22d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Ax22d from gp inherits Storable +class Ax22d from gp --- Purpose : -- Describes a coordinate system in a plane (2D space). -- A coordinate system is defined by: diff --git a/src/gp/gp_Ax2d.cdl b/src/gp/gp_Ax2d.cdl index e471d5295d..d9a34fe67d 100644 --- a/src/gp/gp_Ax2d.cdl +++ b/src/gp/gp_Ax2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Ax2d from gp inherits Storable +class Ax2d from gp ---Purpose: -- Describes an axis in the plane (2D space). diff --git a/src/gp/gp_Ax3.cdl b/src/gp/gp_Ax3.cdl index 7ffc93b25d..1b473ad083 100644 --- a/src/gp/gp_Ax3.cdl +++ b/src/gp/gp_Ax3.cdl @@ -14,7 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Ax3 from gp inherits Storable +class Ax3 from gp --- Purpose : Describes a coordinate system in 3D space. Unlike a -- gp_Ax2 coordinate system, a gp_Ax3 can be diff --git a/src/gp/gp_Circ.cdl b/src/gp/gp_Circ.cdl index 58ebfc5345..c8ba5b6df2 100644 --- a/src/gp/gp_Circ.cdl +++ b/src/gp/gp_Circ.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Circ from gp inherits Storable +class Circ from gp --- Purpose : -- Describes a circle in 3D space. diff --git a/src/gp/gp_Circ2d.cdl b/src/gp/gp_Circ2d.cdl index 48a6e1ff34..2fd75888d1 100644 --- a/src/gp/gp_Circ2d.cdl +++ b/src/gp/gp_Circ2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Circ2d from gp inherits Storable +class Circ2d from gp --- Purpose : Describes a circle in the plane (2D space). -- A circle is defined by its radius and positioned in the -- plane with a coordinate system (a gp_Ax22d object) as follows: diff --git a/src/gp/gp_Cone.cdl b/src/gp/gp_Cone.cdl index 26b9f8bb42..053b9adfd1 100644 --- a/src/gp/gp_Cone.cdl +++ b/src/gp/gp_Cone.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Cone from gp inherits Storable +class Cone from gp diff --git a/src/gp/gp_Cylinder.cdl b/src/gp/gp_Cylinder.cdl index 1712d90ed9..ebfd3c9406 100644 --- a/src/gp/gp_Cylinder.cdl +++ b/src/gp/gp_Cylinder.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Cylinder from gp inherits Storable +class Cylinder from gp --- Purpose : -- Describes an infinite cylindrical surface. diff --git a/src/gp/gp_Dir.cdl b/src/gp/gp_Dir.cdl index 529dd2d510..9f737c2dc6 100644 --- a/src/gp/gp_Dir.cdl +++ b/src/gp/gp_Dir.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Dir from gp inherits Storable +class Dir from gp ---Purpose: -- Describes a unit vector in 3D space. This unit vector is also called "Direction". -- See Also diff --git a/src/gp/gp_Dir2d.cdl b/src/gp/gp_Dir2d.cdl index 2f06f32044..9be18bd577 100644 --- a/src/gp/gp_Dir2d.cdl +++ b/src/gp/gp_Dir2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Dir2d from gp inherits Storable +class Dir2d from gp ---Purpose: Describes a unit vector in the plane (2D space). This unit -- vector is also called "Direction". diff --git a/src/gp/gp_Elips.cdl b/src/gp/gp_Elips.cdl index 53e405eba8..0a197de5d5 100644 --- a/src/gp/gp_Elips.cdl +++ b/src/gp/gp_Elips.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Elips from gp inherits Storable +class Elips from gp --- Purpose : -- Describes an ellipse in 3D space. -- An ellipse is defined by its major and minor radii and diff --git a/src/gp/gp_Elips2d.cdl b/src/gp/gp_Elips2d.cdl index 84cd6d312e..51d01e1aa1 100644 --- a/src/gp/gp_Elips2d.cdl +++ b/src/gp/gp_Elips2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Elips2d from gp inherits Storable +class Elips2d from gp --- Purpose : -- Describes an ellipse in the plane (2D space). diff --git a/src/gp/gp_GTrsf.cdl b/src/gp/gp_GTrsf.cdl index 55fdda1644..676dc8e00d 100644 --- a/src/gp/gp_GTrsf.cdl +++ b/src/gp/gp_GTrsf.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class GTrsf from gp inherits Storable +class GTrsf from gp --- Purpose : -- Defines a non-persistent transformation in 3D space. diff --git a/src/gp/gp_GTrsf2d.cdl b/src/gp/gp_GTrsf2d.cdl index e4ca670aad..8bdd1a8115 100644 --- a/src/gp/gp_GTrsf2d.cdl +++ b/src/gp/gp_GTrsf2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class GTrsf2d from gp inherits Storable +class GTrsf2d from gp --- Purpose : diff --git a/src/gp/gp_Hypr.cdl b/src/gp/gp_Hypr.cdl index 541ae3de9e..eceda2bbdf 100644 --- a/src/gp/gp_Hypr.cdl +++ b/src/gp/gp_Hypr.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Hypr from gp inherits Storable +class Hypr from gp --- Purpose : Describes a branch of a hyperbola in 3D space. -- A hyperbola is defined by its major and minor radii and diff --git a/src/gp/gp_Hypr2d.cdl b/src/gp/gp_Hypr2d.cdl index 825d3cd86c..5bea95442e 100644 --- a/src/gp/gp_Hypr2d.cdl +++ b/src/gp/gp_Hypr2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Hypr2d from gp inherits Storable +class Hypr2d from gp ---Purpose: -- Describes a branch of a hyperbola in the plane (2D space). diff --git a/src/gp/gp_Lin.cdl b/src/gp/gp_Lin.cdl index e04ae75f11..a919f1a3c7 100644 --- a/src/gp/gp_Lin.cdl +++ b/src/gp/gp_Lin.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Lin from gp inherits Storable +class Lin from gp ---Purpose: -- Describes a line in 3D space. diff --git a/src/gp/gp_Lin2d.cdl b/src/gp/gp_Lin2d.cdl index 16ddf25f47..31c90e5634 100644 --- a/src/gp/gp_Lin2d.cdl +++ b/src/gp/gp_Lin2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Lin2d from gp inherits Storable +class Lin2d from gp ---Purpose: Describes a line in 2D space. -- A line is positioned in the plane with an axis (a gp_Ax2d diff --git a/src/gp/gp_Mat.cdl b/src/gp/gp_Mat.cdl index 256960b2df..24f1691e58 100644 --- a/src/gp/gp_Mat.cdl +++ b/src/gp/gp_Mat.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Mat from gp inherits Storable +class Mat from gp ---Purpose: -- Describes a three column, three row matrix. This sort of -- object is used in various vectorial or matrix computations. diff --git a/src/gp/gp_Mat2d.cdl b/src/gp/gp_Mat2d.cdl index 21ab851e33..072e5500b9 100644 --- a/src/gp/gp_Mat2d.cdl +++ b/src/gp/gp_Mat2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Mat2d from gp inherits Storable +class Mat2d from gp ---Purpose: -- Describes a two column, two row matrix. This sort of -- object is used in various vectorial or matrix computations. diff --git a/src/gp/gp_Parab.cdl b/src/gp/gp_Parab.cdl index 7ae7086ddb..675d488f53 100644 --- a/src/gp/gp_Parab.cdl +++ b/src/gp/gp_Parab.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Parab from gp inherits Storable +class Parab from gp ---Purpose: -- Describes a parabola in 3D space. diff --git a/src/gp/gp_Parab2d.cdl b/src/gp/gp_Parab2d.cdl index 55a6101b29..3fa8a5ca84 100644 --- a/src/gp/gp_Parab2d.cdl +++ b/src/gp/gp_Parab2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Parab2d from gp inherits Storable +class Parab2d from gp ---Purpose: Describes a parabola in the plane (2D space). -- A parabola is defined by its focal length (that is, the diff --git a/src/gp/gp_Pln.cdl b/src/gp/gp_Pln.cdl index d45df56cd3..367a55e322 100644 --- a/src/gp/gp_Pln.cdl +++ b/src/gp/gp_Pln.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Pln from gp inherits Storable +class Pln from gp --- Purpose :Describes a plane. diff --git a/src/gp/gp_Pnt.cdl b/src/gp/gp_Pnt.cdl index f3c403057a..21f72a8771 100644 --- a/src/gp/gp_Pnt.cdl +++ b/src/gp/gp_Pnt.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Pnt from gp inherits Storable +class Pnt from gp --- Purpose : Defines a 3D cartesian point. diff --git a/src/gp/gp_Pnt2d.cdl b/src/gp/gp_Pnt2d.cdl index b4092b67e7..506a8b7795 100644 --- a/src/gp/gp_Pnt2d.cdl +++ b/src/gp/gp_Pnt2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Pnt2d from gp inherits Storable +class Pnt2d from gp --- Purpose : Defines a non-persistent 2D cartesian point. diff --git a/src/gp/gp_Sphere.cdl b/src/gp/gp_Sphere.cdl index 54abb567fe..7b0f9eda0f 100644 --- a/src/gp/gp_Sphere.cdl +++ b/src/gp/gp_Sphere.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Sphere from gp inherits Storable +class Sphere from gp --- Purpose : diff --git a/src/gp/gp_Torus.cdl b/src/gp/gp_Torus.cdl index 154aec42db..097df8d4e1 100644 --- a/src/gp/gp_Torus.cdl +++ b/src/gp/gp_Torus.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Torus from gp inherits Storable +class Torus from gp --- Purpose : -- Describes a torus. diff --git a/src/gp/gp_Trsf.cdl b/src/gp/gp_Trsf.cdl index 6ea6f21c68..72e8ed6422 100644 --- a/src/gp/gp_Trsf.cdl +++ b/src/gp/gp_Trsf.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Trsf from gp inherits Storable +class Trsf from gp --- Purpose: Defines a non-persistent transformation in 3D space. -- The following transformations are implemented : @@ -200,6 +200,8 @@ is raises ConstructionError from Standard is static; + + SetForm (me : in out; P : TrsfForm from gp) is static; SetValues(me : in out; a11, a12, a13, a14, diff --git a/src/gp/gp_Trsf.lxx b/src/gp/gp_Trsf.lxx index 3c280b0db6..c502da7a05 100644 --- a/src/gp/gp_Trsf.lxx +++ b/src/gp/gp_Trsf.lxx @@ -54,6 +54,11 @@ inline void gp_Trsf::SetTranslation(const gp_Pnt& P1, loc = (P2.XYZ()).Subtracted (P1.XYZ()); } +inline void gp_Trsf::SetForm(const gp_TrsfForm P) +{ + shape = P; +} + inline Standard_Boolean gp_Trsf::IsNegative() const { return (scale < 0.0); } diff --git a/src/gp/gp_Trsf2d.cdl b/src/gp/gp_Trsf2d.cdl index 98c7f0c972..3e42e55709 100644 --- a/src/gp/gp_Trsf2d.cdl +++ b/src/gp/gp_Trsf2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Trsf2d from gp inherits Storable +class Trsf2d from gp --- Purpose : -- Defines a non-persistent transformation in 2D space. diff --git a/src/gp/gp_Vec.cdl b/src/gp/gp_Vec.cdl index 2c49d65e4d..f322cbbb9f 100644 --- a/src/gp/gp_Vec.cdl +++ b/src/gp/gp_Vec.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Vec from gp inherits Storable +class Vec from gp --- Purpose : -- Defines a non-persistent vector in 3D space. diff --git a/src/gp/gp_Vec2d.cdl b/src/gp/gp_Vec2d.cdl index f1b99e7482..b4f1b7c6ac 100644 --- a/src/gp/gp_Vec2d.cdl +++ b/src/gp/gp_Vec2d.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class Vec2d from gp inherits Storable +class Vec2d from gp --- Purpose : -- Defines a non-persistent vector in 2D space. diff --git a/src/gp/gp_XY.cdl b/src/gp/gp_XY.cdl index 800c10d1aa..e40eaab168 100644 --- a/src/gp/gp_XY.cdl +++ b/src/gp/gp_XY.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class XY from gp inherits Storable +class XY from gp --- Purpose : -- This class describes a cartesian coordinate entity in 2D diff --git a/src/gp/gp_XYZ.cdl b/src/gp/gp_XYZ.cdl index a775fdb70a..9ede304e64 100644 --- a/src/gp/gp_XYZ.cdl +++ b/src/gp/gp_XYZ.cdl @@ -12,7 +12,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class XYZ from gp inherits Storable +class XYZ from gp --- Purpose : -- This class describes a cartesian coordinate entity in