OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0033099: Data Exchange, Step Import - Wrong PMI values in GDT

Browse Source 
measure_with_unit entity is changed to be translated as Handle(Standard_Transient) and to be processed later, depending on the underlying type being used.
This commit is contained in:
dpasukhi 2022-08-12 13:02:44 +01:00 committed by ika
parent 700ba20c7b
commit 49d628667b
102 changed files with 1100 additions and 977 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx
View File

@ -16,74 +16,72 @@
#include <RWStepBasic_RWConversionBasedUnit.hxx>
#include <StepBasic_ConversionBasedUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
RWStepBasic_RWConversionBasedUnit::RWStepBasic_RWConversionBasedUnit () {}
void RWStepBasic_RWConversionBasedUnit::ReadStep
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnit)& ent) const
void RWStepBasic_RWConversionBasedUnit::ReadStep(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnit)& ent) const
{
// --- Number of Parameter Control ---
// --- Number of Parameter Control ---
if (!data->CheckNbParams(num,3,ach,"conversion_based_unit")) return;
if (!data->CheckNbParams(num,3,ach,"conversion_based_unit")) return;
// --- inherited field : dimensions ---
// --- inherited field : dimensions ---
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
// --- own field : name ---
// --- own field : name ---
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadString (num,2,"name",ach,aName);
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadString (num,2,"name",ach,aName);
// --- own field : conversionFactor ---
// --- own field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 3,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity (num, 3, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
//--- Initialisation of the read entity ---
//--- Initialisation of the read entity ---
ent->Init(aDimensions, aName, aConversionFactor);
ent->Init(aDimensions, aName, aConversionFactor);
}
void RWStepBasic_RWConversionBasedUnit::WriteStep
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnit)& ent) const
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnit)& ent) const
{
// --- inherited field dimensions ---
// --- inherited field dimensions ---
SW.Send(ent->Dimensions());
SW.Send(ent->Dimensions());
// --- own field : name ---
// --- own field : name ---
SW.Send(ent->Name());
SW.Send(ent->Name());
// --- own field : conversionFactor ---
// --- own field : conversionFactor ---
SW.Send(ent->ConversionFactor());
SW.Send(ent->ConversionFactor());
}
void RWStepBasic_RWConversionBasedUnit::Share(const Handle(StepBasic_ConversionBasedUnit)& ent, Interface_EntityIterator& iter) const
{
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->ConversionFactor());
iter.GetOneItem(ent->ConversionFactor());
}

13
src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx
View File

@ -19,7 +19,6 @@
#include <RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx>
#include <StepBasic_ConversionBasedUnitAndAreaUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
@ -28,9 +27,9 @@ RWStepBasic_RWConversionBasedUnitAndAreaUnit::RWStepBasic_RWConversionBasedUnitA
}
void RWStepBasic_RWConversionBasedUnitAndAreaUnit::ReadStep(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent) const
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent) const
{
Standard_Integer num = num0;
//data->NamedForComplex("AREA_UNIT",num0,num,ach);
@ -43,15 +42,15 @@ void RWStepBasic_RWConversionBasedUnitAndAreaUnit::ReadStep(const Handle(StepDat
data->ReadString (num,1,"name",ach,aName);
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
num = data->NextForComplex(num);
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
Handle(StepBasic_DimensionalExponents) aDimensions;
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
ent->Init(aDimensions,aName,aConversionFactor);
ent->Init(aDimensions,aName, aConversionFactor);
}
void RWStepBasic_RWConversionBasedUnitAndAreaUnit::WriteStep(StepData_StepWriter& SW,

87
src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx
View File

@ -17,96 +17,95 @@
#include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_LengthUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
RWStepBasic_RWConversionBasedUnitAndLengthUnit::RWStepBasic_RWConversionBasedUnitAndLengthUnit () {}
void RWStepBasic_RWConversionBasedUnitAndLengthUnit::ReadStep
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const
{
Standard_Integer num = num0;
Standard_Integer num = num0;
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
// --- field : name ---
// --- field : name ---
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
// --- field : conversionFactor ---
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
num = data->NextForComplex(num);
num = data->NextForComplex(num);
// --- Instance of plex component LengthUnit ---
// --- Instance of plex component LengthUnit ---
if (!data->CheckNbParams(num,0,ach,"length_unit")) return;
if (!data->CheckNbParams(num,0,ach,"length_unit")) return;
num = data->NextForComplex(num);
num = data->NextForComplex(num);
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
// --- field : dimensions ---
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
// --- field : dimensions ---
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
//--- Initialisation of the red entity ---
//--- Initialisation of the red entity ---
ent->Init(aDimensions,aName,aConversionFactor);
ent->Init(aDimensions,aName,aConversionFactor);
}
void RWStepBasic_RWConversionBasedUnitAndLengthUnit::WriteStep
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const
{
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->ConversionFactor());
SW.Send(ent->ConversionFactor());
// --- Instance of plex component LengthUnit ---
// --- Instance of plex component LengthUnit ---
SW.StartEntity("LENGTH_UNIT");
SW.StartEntity("LENGTH_UNIT");
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.Send(ent->Dimensions());
SW.Send(ent->Dimensions());
}
void RWStepBasic_RWConversionBasedUnitAndLengthUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent, Interface_EntityIterator& iter) const
{
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->ConversionFactor());
iter.GetOneItem(ent->ConversionFactor());
}

15
src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx
View File

@ -17,7 +17,6 @@
#include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MassUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
@ -36,10 +35,10 @@ RWStepBasic_RWConversionBasedUnitAndMassUnit::RWStepBasic_RWConversionBasedUnitA
//=======================================================================
void RWStepBasic_RWConversionBasedUnitAndMassUnit::ReadStep
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent) const
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent) const
{
Standard_Integer num = num0;
@ -51,9 +50,9 @@ void RWStepBasic_RWConversionBasedUnitAndMassUnit::ReadStep
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
num = data->NextForComplex(num);
@ -70,7 +69,7 @@ void RWStepBasic_RWConversionBasedUnitAndMassUnit::ReadStep
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
//--- Initialisation of the red entity ---
ent->Init(aDimensions,aName,aConversionFactor);
ent->Init(aDimensions,aName, aConversionFactor);
}

82
src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx
View File

@ -17,7 +17,6 @@
#include <RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx>
#include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_PlaneAngleUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
@ -25,71 +24,72 @@
RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit () {}
void RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::ReadStep
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const
{
// sln 09.10.2001. BUC61003. Correction of looking for items of complex entity in case of them do not saticfy to alphabetical order
// CONVERSION_BASED_UNIT
Standard_Integer num = 0;//num0;
data->NamedForComplex("CONVERSION_BASED_UNIT", "CNBSUN",num0,num,ach);
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
Handle(TCollection_HAsciiString) aName;
data->ReadString (num,1,"name",ach,aName);
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
// NAMED_UNIT
//num = 0; //gka TRJ9 c2-id-214.stp
data->NamedForComplex("NAMED_UNIT", "NMDUNT",num0,num,ach);
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
Handle(StepBasic_DimensionalExponents) aDimensions;
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
Standard_Integer num = 0;//num0;
data->NamedForComplex("CONVERSION_BASED_UNIT", "CNBSUN",num0,num,ach);
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
Handle(TCollection_HAsciiString) aName;
data->ReadString (num,1,"name",ach,aName);
// PLANE_ANGLE_UNIT
//num = 0; //gka
data->NamedForComplex("PLANE_ANGLE_UNIT", "PLANUN",num0,num,ach);
if (!data->CheckNbParams(num,0,ach,"plane_angle_unit")) return;
ent->Init(aDimensions,aName,aConversionFactor);
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
// NAMED_UNIT
//num = 0; //gka TRJ9 c2-id-214.stp
data->NamedForComplex("NAMED_UNIT", "NMDUNT",num0,num,ach);
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
Handle(StepBasic_DimensionalExponents) aDimensions;
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
// PLANE_ANGLE_UNIT
//num = 0; //gka
data->NamedForComplex("PLANE_ANGLE_UNIT", "PLANUN",num0,num,ach);
if (!data->CheckNbParams(num,0,ach,"plane_angle_unit")) return;
ent->Init(aDimensions,aName,aConversionFactor);
}
void RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::WriteStep
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const
{
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->ConversionFactor());
SW.Send(ent->ConversionFactor());
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.Send(ent->Dimensions());
SW.Send(ent->Dimensions());
// --- Instance of plex component PlaneAngleUnit ---
// --- Instance of plex component PlaneAngleUnit ---
SW.StartEntity("PLANE_ANGLE_UNIT");
SW.StartEntity("PLANE_ANGLE_UNIT");
}
void RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent, Interface_EntityIterator& iter) const
{
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->ConversionFactor());
iter.GetOneItem(ent->ConversionFactor());
}

87
src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx
View File

@ -16,7 +16,6 @@
#include <RWStepBasic_RWConversionBasedUnitAndRatioUnit.hxx>
#include <StepBasic_ConversionBasedUnitAndRatioUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_RatioUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
@ -24,89 +23,89 @@
RWStepBasic_RWConversionBasedUnitAndRatioUnit::RWStepBasic_RWConversionBasedUnitAndRatioUnit () {}
void RWStepBasic_RWConversionBasedUnitAndRatioUnit::ReadStep
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const
{
Standard_Integer num = num0;
Standard_Integer num = num0;
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
// --- field : name ---
// --- field : name ---
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
// --- field : conversionFactor ---
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity(num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
num = data->NextForComplex(num);
num = data->NextForComplex(num);
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
// --- field : dimensions ---
// --- field : dimensions ---
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
num = data->NextForComplex(num);
num = data->NextForComplex(num);
// --- Instance of plex component RatioUnit ---
// --- Instance of plex component RatioUnit ---
if (!data->CheckNbParams(num,0,ach,"ratio_unit")) return;
if (!data->CheckNbParams(num,0,ach,"ratio_unit")) return;
//--- Initialisation of the red entity ---
//--- Initialisation of the red entity ---
ent->Init(aDimensions,aName,aConversionFactor);
ent->Init(aDimensions,aName, aConversionFactor);
}
void RWStepBasic_RWConversionBasedUnitAndRatioUnit::WriteStep
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const
{
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->ConversionFactor());
SW.Send(ent->ConversionFactor());
// --- Instance of plex component RatioUnit ---
// --- Instance of plex component RatioUnit ---
SW.StartEntity("RATIO_UNIT");
SW.StartEntity("RATIO_UNIT");
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.Send(ent->Dimensions());
SW.Send(ent->Dimensions());
}
void RWStepBasic_RWConversionBasedUnitAndRatioUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent, Interface_EntityIterator& iter) const
{
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->ConversionFactor());
iter.GetOneItem(ent->ConversionFactor());
}

87
src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx
View File

@ -16,7 +16,6 @@
#include <RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx>
#include <StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_SolidAngleUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
@ -24,89 +23,89 @@
RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit () {}
void RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::ReadStep
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const
{
Standard_Integer num = num0;
Standard_Integer num = num0;
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
// --- field : name ---
// --- field : name ---
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
// --- field : conversionFactor ---
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
num = data->NextForComplex(num);
num = data->NextForComplex(num);
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
// --- field : dimensions ---
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
// --- field : dimensions ---
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
num = data->NextForComplex(num);
num = data->NextForComplex(num);
// --- Instance of plex component SolidAngleUnit ---
// --- Instance of plex component SolidAngleUnit ---
if (!data->CheckNbParams(num,0,ach,"solid_angle_unit")) return;
if (!data->CheckNbParams(num,0,ach,"solid_angle_unit")) return;
//--- Initialisation of the red entity ---
//--- Initialisation of the red entity ---
ent->Init(aDimensions,aName,aConversionFactor);
ent->Init(aDimensions,aName,aConversionFactor);
}
void RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::WriteStep
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const
{
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->ConversionFactor());
SW.Send(ent->ConversionFactor());
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.Send(ent->Dimensions());
SW.Send(ent->Dimensions());
// --- Instance of plex component SolidAngleUnit ---
// --- Instance of plex component SolidAngleUnit ---
SW.StartEntity("SOLID_ANGLE_UNIT");
SW.StartEntity("SOLID_ANGLE_UNIT");
}
void RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent, Interface_EntityIterator& iter) const
{
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->ConversionFactor());
iter.GetOneItem(ent->ConversionFactor());
}

88
src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx
View File

@ -16,7 +16,6 @@
#include <RWStepBasic_RWConversionBasedUnitAndTimeUnit.hxx>
#include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_TimeUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
@ -24,89 +23,88 @@
RWStepBasic_RWConversionBasedUnitAndTimeUnit::RWStepBasic_RWConversionBasedUnitAndTimeUnit () {}
void RWStepBasic_RWConversionBasedUnitAndTimeUnit::ReadStep
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
{
Standard_Integer num = num0;
Standard_Integer num = num0;
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
// --- field : name ---
// --- field : name ---
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
Handle(TCollection_HAsciiString) aName;
//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
data->ReadString (num,1,"name",ach,aName);
// --- field : conversionFactor ---
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
num = data->NextForComplex(num);
num = data->NextForComplex(num);
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
// --- field : dimensions ---
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
// --- field : dimensions ---
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
Handle(StepBasic_DimensionalExponents) aDimensions;
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
num = data->NextForComplex(num);
num = data->NextForComplex(num);
// --- Instance of plex component TimeUnit ---
// --- Instance of plex component TimeUnit ---
if (!data->CheckNbParams(num,0,ach,"time_unit")) return;
if (!data->CheckNbParams(num,0,ach,"time_unit")) return;
//--- Initialisation of the red entity ---
//--- Initialisation of the red entity ---
ent->Init(aDimensions,aName,aConversionFactor);
ent->Init(aDimensions,aName, aConversionFactor);
}
void RWStepBasic_RWConversionBasedUnitAndTimeUnit::WriteStep
(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
void RWStepBasic_RWConversionBasedUnitAndTimeUnit::WriteStep(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
{
// --- Instance of plex component ConversionBasedUnit ---
// --- Instance of plex component ConversionBasedUnit ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.StartEntity("CONVERSION_BASED_UNIT");
// --- field : name ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->Name());
// --- field : conversionFactor ---
SW.Send(ent->ConversionFactor());
SW.Send(ent->ConversionFactor());
// --- Instance of plex component TimeUnit ---
// --- Instance of plex component TimeUnit ---
SW.StartEntity("TIME_UNIT");
SW.StartEntity("TIME_UNIT");
// --- Instance of common supertype NamedUnit ---
// --- Instance of common supertype NamedUnit ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.StartEntity("NAMED_UNIT");
// --- field : dimensions ---
SW.Send(ent->Dimensions());
SW.Send(ent->Dimensions());
}
void RWStepBasic_RWConversionBasedUnitAndTimeUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent, Interface_EntityIterator& iter) const
{
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->ConversionFactor());
iter.GetOneItem(ent->ConversionFactor());
}

17
src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx
View File

@ -19,7 +19,6 @@
#include <RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx>
#include <StepBasic_ConversionBasedUnitAndVolumeUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
@ -28,9 +27,9 @@ RWStepBasic_RWConversionBasedUnitAndVolumeUnit::RWStepBasic_RWConversionBasedUni
}
void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::ReadStep(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const
const Standard_Integer num0,
Handle(Interface_Check)& ach,
const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const
{
Standard_Integer num = num0;
// --- Instance of plex component ConversionBasedUnit ---
@ -39,8 +38,8 @@ void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::ReadStep(const Handle(StepD
data->ReadString (num,1,"name",ach,aName);
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
num = data->NextForComplex(num);
if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
@ -50,11 +49,11 @@ void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::ReadStep(const Handle(StepD
data->NamedForComplex("VOLUME_UNIT","VLMUNT",num0,num,ach);
if (!data->CheckNbParams(num,0,ach,"volume_unit")) return;
ent->Init(aDimensions,aName,aConversionFactor);
ent->Init(aDimensions,aName, aConversionFactor);
}
void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::WriteStep(StepData_StepWriter& SW,
const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const
const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const
{
SW.StartEntity("CONVERSION_BASED_UNIT");
SW.Send(ent->Name());
@ -65,7 +64,7 @@ void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::WriteStep(StepData_StepWrit
}
void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent,
Interface_EntityIterator& iter) const
Interface_EntityIterator& iter) const
{
iter.GetOneItem(ent->Dimensions());
iter.GetOneItem(ent->ConversionFactor());

7
src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWAngularityTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_AngularityTolerance.hxx>
@ -54,8 +53,8 @@ void RWStepDimTol_RWAngularityTolerance::ReadStep (const Handle(StepData_StepRea
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -78,7 +77,7 @@ void RWStepDimTol_RWAngularityTolerance::ReadStep (const Handle(StepData_StepRea
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aGeometricToleranceWithDatumReference_DatumSystem);
}

7
src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWCircularRunoutTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_CircularRunoutTolerance.hxx>
@ -54,8 +53,8 @@ void RWStepDimTol_RWCircularRunoutTolerance::ReadStep (const Handle(StepData_Ste
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -78,7 +77,7 @@ void RWStepDimTol_RWCircularRunoutTolerance::ReadStep (const Handle(StepData_Ste
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aGeometricToleranceWithDatumReference_DatumSystem);
}

7
src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWCoaxialityTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_CoaxialityTolerance.hxx>
@ -54,8 +53,8 @@ void RWStepDimTol_RWCoaxialityTolerance::ReadStep (const Handle(StepData_StepRea
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -78,7 +77,7 @@ void RWStepDimTol_RWCoaxialityTolerance::ReadStep (const Handle(StepData_StepRea
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aGeometricToleranceWithDatumReference_DatumSystem);
}

7
src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWConcentricityTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_ConcentricityTolerance.hxx>
@ -54,8 +53,8 @@ void RWStepDimTol_RWConcentricityTolerance::ReadStep (const Handle(StepData_Step
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -78,7 +77,7 @@ void RWStepDimTol_RWConcentricityTolerance::ReadStep (const Handle(StepData_Step
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aGeometricToleranceWithDatumReference_DatumSystem);
}

7
src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWCylindricityTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_CylindricityTolerance.hxx>
@ -52,8 +51,8 @@ void RWStepDimTol_RWCylindricityTolerance::ReadStep (const Handle(StepData_StepR
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -61,7 +60,7 @@ void RWStepDimTol_RWCylindricityTolerance::ReadStep (const Handle(StepData_StepR
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect);
}

8
src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWFlatnessTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_FlatnessTolerance.hxx>
@ -35,7 +34,6 @@ RWStepDimTol_RWFlatnessTolerance::RWStepDimTol_RWFlatnessTolerance ()
//function : ReadStep
//purpose :
//=======================================================================
void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReaderData)& data,
const Standard_Integer num,
Handle(Interface_Check)& ach,
@ -52,8 +50,8 @@ void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReade
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -61,7 +59,7 @@ void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReade
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect);
}

7
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@ -51,8 +50,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRef::ReadStep
data->ReadString (num, 1, "name", ach, aName);
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

7
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
#include <StepBasic_LengthMeasureWithUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@ -53,8 +52,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::ReadStep
data->ReadString (num, 1, "name", ach, aName);
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

7
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@ -52,8 +51,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod::ReadStep
data->ReadString (num, 1, "name", ach, aName);
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

7
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
View File

@ -15,7 +15,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@ -50,8 +49,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::ReadStep
data->ReadString (num, 1, "name", ach, aName);
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

6
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
View File

@ -51,8 +51,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::ReadStep
data->ReadString (num, 1, "name", ach, aName);
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

7
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx>
#include <StepBasic_LengthMeasureWithUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
@ -51,8 +50,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol::ReadStep
data->ReadString (num, 1, "name", ach, aName);
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

7
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
@ -50,8 +49,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMod::ReadStep
data->ReadString (num, 1, "name", ach, aName);
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

5
src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWGeometricTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricTolerance.hxx>
@ -52,8 +51,8 @@ void RWStepDimTol_RWGeometricTolerance::ReadStep (const Handle(StepData_StepRead
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

7
src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@ -53,8 +52,8 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::ReadStep (const Handle
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -77,7 +76,7 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::ReadStep (const Handle
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aDatumSystem);
}

5
src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <StepBasic_LengthMeasureWithUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx>
@ -53,8 +52,8 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit::
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

5
src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <StepBasic_LengthMeasureWithUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithDefinedUnit.hxx>
@ -52,8 +51,8 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedUnit::ReadStep (const Handle(St
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

5
src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
View File

@ -21,7 +21,6 @@
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithMaximumTolerance.hxx>
#include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
//=======================================================================
//function : RWStepDimTol_RWGeometricTolerance
@ -54,8 +53,8 @@ void RWStepDimTol_RWGeometricToleranceWithMaximumTolerance::
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

5
src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@ -54,8 +53,8 @@ void RWStepDimTol_RWGeometricToleranceWithModifiers::
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

7
src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWLineProfileTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_LineProfileTolerance.hxx>
@ -51,8 +50,8 @@ void RWStepDimTol_RWLineProfileTolerance::ReadStep (const Handle(StepData_StepRe
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -60,7 +59,7 @@ void RWStepDimTol_RWLineProfileTolerance::ReadStep (const Handle(StepData_StepRe
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect);
}

7
src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWModifiedGeometricTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_ModifiedGeometricTolerance.hxx>
@ -51,8 +50,8 @@ void RWStepDimTol_RWModifiedGeometricTolerance::ReadStep (const Handle(StepData_
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -72,7 +71,7 @@ void RWStepDimTol_RWModifiedGeometricTolerance::ReadStep (const Handle(StepData_
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aModifier);
}

7
src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWParallelismTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_ParallelismTolerance.hxx>
@ -52,8 +51,8 @@ void RWStepDimTol_RWParallelismTolerance::ReadStep (const Handle(StepData_StepRe
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -76,7 +75,7 @@ void RWStepDimTol_RWParallelismTolerance::ReadStep (const Handle(StepData_StepRe
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aGeometricToleranceWithDatumReference_DatumSystem);
}

7
src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWPerpendicularityTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_PerpendicularityTolerance.hxx>
@ -52,8 +51,8 @@ void RWStepDimTol_RWPerpendicularityTolerance::ReadStep (const Handle(StepData_S
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -76,7 +75,7 @@ void RWStepDimTol_RWPerpendicularityTolerance::ReadStep (const Handle(StepData_S
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aGeometricToleranceWithDatumReference_DatumSystem);
}

7
src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWPositionTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_PositionTolerance.hxx>
@ -51,8 +50,8 @@ void RWStepDimTol_RWPositionTolerance::ReadStep (const Handle(StepData_StepReade
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -60,7 +59,7 @@ void RWStepDimTol_RWPositionTolerance::ReadStep (const Handle(StepData_StepReade
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect);
}

7
src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWRoundnessTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_RoundnessTolerance.hxx>
@ -51,8 +50,8 @@ void RWStepDimTol_RWRoundnessTolerance::ReadStep (const Handle(StepData_StepRead
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -60,7 +59,7 @@ void RWStepDimTol_RWRoundnessTolerance::ReadStep (const Handle(StepData_StepRead
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect);
}

7
src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWStraightnessTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_StraightnessTolerance.hxx>
@ -51,8 +50,8 @@ void RWStepDimTol_RWStraightnessTolerance::ReadStep (const Handle(StepData_StepR
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -60,7 +59,7 @@ void RWStepDimTol_RWStraightnessTolerance::ReadStep (const Handle(StepData_StepR
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect);
}

7
src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWSurfaceProfileTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_SurfaceProfileTolerance.hxx>
@ -51,8 +50,8 @@ void RWStepDimTol_RWSurfaceProfileTolerance::ReadStep (const Handle(StepData_Ste
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -60,7 +59,7 @@ void RWStepDimTol_RWSurfaceProfileTolerance::ReadStep (const Handle(StepData_Ste
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect);
}

7
src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWSymmetryTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_SymmetryTolerance.hxx>
@ -52,8 +51,8 @@ void RWStepDimTol_RWSymmetryTolerance::ReadStep (const Handle(StepData_StepReade
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -76,7 +75,7 @@ void RWStepDimTol_RWSymmetryTolerance::ReadStep (const Handle(StepData_StepReade
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aGeometricToleranceWithDatumReference_DatumSystem);
}

7
src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx
View File

@ -18,7 +18,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepDimTol_RWTotalRunoutTolerance.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepDimTol_TotalRunoutTolerance.hxx>
@ -52,8 +51,8 @@ void RWStepDimTol_RWTotalRunoutTolerance::ReadStep (const Handle(StepData_StepRe
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@ -76,7 +75,7 @@ void RWStepDimTol_RWTotalRunoutTolerance::ReadStep (const Handle(StepData_StepRe
// Initialize entity
ent->Init(aGeometricTolerance_Name,
aGeometricTolerance_Description,
aGeometricTolerance_Magnitude,
aMagnitude,
aGeometricTolerance_TolerancedShapeAspect,
aGeometricToleranceWithDatumReference_DatumSystem);
}

4
src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
View File

@ -51,8 +51,8 @@ void RWStepDimTol_RWUnequallyDisposedGeometricTolerance::
Handle(TCollection_HAsciiString) aDescription;
data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
Handle(Standard_Transient) aMagnitude;
data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

5
src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepRepr_RWMakeFromUsageOption.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepRepr_MakeFromUsageOption.hxx>
@ -74,8 +73,8 @@ void RWStepRepr_RWMakeFromUsageOption::ReadStep (const Handle(StepData_StepReade
Handle(TCollection_HAsciiString) aRankingRationale;
data->ReadString (num, 7, "ranking_rationale", ach, aRankingRationale);
Handle(StepBasic_MeasureWithUnit) aQuantity;
data->ReadEntity (num, 8, "quantity", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aQuantity);
Handle(Standard_Transient) aQuantity;
data->ReadEntity (num, 8, "quantity", ach, STANDARD_TYPE(Standard_Transient), aQuantity);
// Initialize entity
ent->Init(aProductDefinitionRelationship_Id,

5
src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx
View File

@ -16,7 +16,6 @@
#include <RWStepRepr_RWParallelOffset.hxx>
#include <Interface_EntityIterator.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepRepr_ParallelOffset.hxx>
@ -62,8 +61,8 @@ void RWStepRepr_RWParallelOffset::ReadStep (const Handle(StepData_StepReaderData
// Own fields of ParallelOffset
Handle(StepBasic_MeasureWithUnit) anOffset;
data->ReadEntity (num, 5, "offset", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), anOffset);
Handle(Standard_Transient) anOffset;
data->ReadEntity(num, 5, "offset", ach, STANDARD_TYPE(Standard_Transient), anOffset);
// Initialize entity
ent->Init(aShapeAspect_Name,

5
src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
View File

@ -17,7 +17,6 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepRepr_QuantifiedAssemblyComponentUsage.hxx>
@ -79,8 +78,8 @@ void RWStepRepr_RWQuantifiedAssemblyComponentUsage::ReadStep (const Handle(StepD
// Own fields of QuantifiedAssemblyComponentUsage
Handle(StepBasic_MeasureWithUnit) aQuantity;
data->ReadEntity (num, 7, "quantity", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aQuantity);
Handle(Standard_Transient) aQuantity;
data->ReadEntity (num, 7, "quantity", ach, STANDARD_TYPE(Standard_Transient), aQuantity);
// Initialize entity
ent->Init(aProductDefinitionRelationship_Id,

67
src/RWStepShape/RWStepShape_RWMeasureQualification.cxx
View File

@ -15,7 +15,6 @@
#include <Interface_Check.hxx>
#include <Interface_EntityIterator.hxx>
#include <RWStepShape_RWMeasureQualification.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepShape_MeasureQualification.hxx>
@ -24,57 +23,53 @@
RWStepShape_RWMeasureQualification::RWStepShape_RWMeasureQualification () {}
void RWStepShape_RWMeasureQualification::ReadStep
(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num,
Handle(Interface_Check)& ach,
const Handle(StepShape_MeasureQualification)& ent) const
void RWStepShape_RWMeasureQualification::ReadStep(const Handle(StepData_StepReaderData)& data,
const Standard_Integer num,
Handle(Interface_Check)& ach,
const Handle(StepShape_MeasureQualification)& ent) const
{
// --- Number of Parameter Control ---
// --- Number of Parameter Control ---
if (!data->CheckNbParams(num,4,ach,"measure_qualification")) return;
if (!data->CheckNbParams(num,4,ach,"measure_qualification")) return;
// --- own field : name ---
// --- own field : name ---
Handle(TCollection_HAsciiString) aName;
data->ReadString (num,1,"name",ach,aName);
Handle(TCollection_HAsciiString) aName;
data->ReadString (num,1,"name",ach,aName);
// --- own field : description ---
// --- own field : description ---
Handle(TCollection_HAsciiString) aDescr;
data->ReadString (num,2,"description",ach,aDescr);
Handle(TCollection_HAsciiString) aDescr;
data->ReadString (num,2,"description",ach,aDescr);
// --- own field : qualified_measure ---
// --- own field : qualified_measure ---
Handle(Standard_Transient) aQualifiedMeasure;
data->ReadEntity (num, 3, "qualified_measure", ach, STANDARD_TYPE(Standard_Transient), aQualifiedMeasure);
Handle(StepBasic_MeasureWithUnit) aQM;
data->ReadEntity (num,3,"qualified_measure",ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),aQM);
// --- own field : qualifiers ---
// --- own field : qualifiers ---
Handle(StepShape_HArray1OfValueQualifier) quals;
Standard_Integer nsub4;
if (data->ReadSubList (num,4,"qualifiers",ach,nsub4)) {
Standard_Integer nb4 = data->NbParams(nsub4);
quals = new StepShape_HArray1OfValueQualifier (1,nb4);
for (Standard_Integer i4 = 1; i4 <= nb4; i4 ++) {
StepShape_ValueQualifier VQ;
if (data->ReadEntity (nsub4,i4,"qualifier",ach,VQ))
quals->SetValue (i4,VQ);
}
}
Handle(StepShape_HArray1OfValueQualifier) quals;
Standard_Integer nsub4;
if (data->ReadSubList (num,4,"qualifiers",ach,nsub4)) {
Standard_Integer nb4 = data->NbParams(nsub4);
quals = new StepShape_HArray1OfValueQualifier (1,nb4);
for (Standard_Integer i4 = 1; i4 <= nb4; i4 ++) {
StepShape_ValueQualifier VQ;
if (data->ReadEntity (nsub4,i4,"qualifier",ach,VQ))
quals->SetValue (i4,VQ);
}
}
//--- Initialisation of the read entity ---
//--- Initialisation of the read entity ---
ent->Init(aName, aDescr, aQM, quals);
ent->Init(aName, aDescr, aQualifiedMeasure, quals);
}
void RWStepShape_RWMeasureQualification::WriteStep
(StepData_StepWriter& SW,
const Handle(StepShape_MeasureQualification)& ent) const
void RWStepShape_RWMeasureQualification::WriteStep(StepData_StepWriter& SW,
const Handle(StepShape_MeasureQualification)& ent) const
{
SW.Send(ent->Name());
SW.Send(ent->Description());

53
src/RWStepShape/RWStepShape_RWToleranceValue.cxx
View File

@ -14,12 +14,9 @@
#include <Interface_EntityIterator.hxx>
#include <RWStepShape_RWToleranceValue.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx>
#include <StepShape_ToleranceValue.hxx>
#include <StepRepr_MeasureRepresentationItem.hxx>
#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
RWStepShape_RWToleranceValue::RWStepShape_RWToleranceValue () {}
@ -29,52 +26,26 @@ void RWStepShape_RWToleranceValue::ReadStep
Handle(Interface_Check)& ach,
const Handle(StepShape_ToleranceValue)& ent) const
{
// --- Number of Parameter Control ---
// --- Number of Parameter Control ---
if (!data->CheckNbParams(num,2,ach,"tolerance_value")) return;
if (!data->CheckNbParams(num,2,ach,"tolerance_value")) return;
// --- own field : lower_bound ---
// --- own field : lower_bound ---
Handle(Standard_Transient) LB;
if(!data->ReadEntity (num,1,"lower_bound",ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),LB))
{
Handle(StepRepr_MeasureRepresentationItem) aMSR;
Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU;
if(data->ReadEntity (num,1,"lower_bound",ach,
STANDARD_TYPE(StepRepr_MeasureRepresentationItem),aMSR) ||
data->ReadEntity (num,1,"lower_bound",ach,STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU))
{
if(!aMSR.IsNull())
LB = aMSR;
else if(!aRIMU.IsNull())
LB = aRIMU;
}
}
Handle(Standard_Transient) aLowerBound;
data->ReadEntity (num, 1, "lower_bound", ach, STANDARD_TYPE(Standard_Transient), aLowerBound);
// --- own field : upper_bound ---
Handle(Standard_Transient) UB;
if(!data->ReadEntity (num,2,"upper_bound",ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),UB))
{
Handle(StepRepr_MeasureRepresentationItem) aMSR1;
Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
if(data->ReadEntity (num,2,"upper_bound",ach,STANDARD_TYPE(StepRepr_MeasureRepresentationItem),aMSR1) ||
data->ReadEntity (num,2,"upper_bound",ach,STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
{
if(!aMSR1.IsNull())
UB = aMSR1;
else if(!aRIMU1.IsNull())
UB = aRIMU1;
}
}
Handle(Standard_Transient) anUpperBound;
data->ReadEntity (num, 2, "upper_bound", ach, STANDARD_TYPE(Standard_Transient), anUpperBound);
//--- Initialisation of the read entity ---
if( !LB.IsNull() && !UB.IsNull())
//--- Initialisation of the read entity ---
if (!aLowerBound.IsNull() && !anUpperBound.IsNull())
{
ach->ClearFails();
ent->Init(LB,UB);
}
ent->Init(aLowerBound, anUpperBound);
}

128
src/STEPCAFControl/STEPCAFControl_Reader.cxx
View File

@ -1959,27 +1959,55 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs(const Handle(XSControl_WorkSes
return Standard_True;
}
//=======================================================================
//function : GetMeasureWithUnit
//purpose :
//=======================================================================
static Handle(StepBasic_MeasureWithUnit) GetMeasureWithUnit(const Handle(Standard_Transient)& theMeasure)
{
Handle(StepBasic_MeasureWithUnit) aMeasureWithUnit;
if (theMeasure->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
{
aMeasureWithUnit = Handle(StepBasic_MeasureWithUnit)::DownCast(theMeasure);
}
else if (theMeasure->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(theMeasure);
aMeasureWithUnit = aReprMeasureItem->GetMeasureWithUnit();
}
return aMeasureWithUnit;
}
//=======================================================================
//function : GetMassConversionFactor
//purpose :
//=======================================================================
static Standard_Boolean GetMassConversionFactor(Handle(StepBasic_NamedUnit)& NU,
Standard_Real& afact)
static Standard_Boolean GetMassConversionFactor(Handle(StepBasic_NamedUnit)& theNUnit,
Standard_Real& theFact)
{
afact = 1.;
if (!NU->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit))) return Standard_False;
Handle(StepBasic_ConversionBasedUnitAndMassUnit) CBUMU =
Handle(StepBasic_ConversionBasedUnitAndMassUnit)::DownCast(NU);
Handle(StepBasic_MeasureWithUnit) MWUCBU = CBUMU->ConversionFactor();
afact = MWUCBU->ValueComponent();
StepBasic_Unit anUnit2 = MWUCBU->UnitComponent();
if (anUnit2.CaseNum(anUnit2.Value()) == 1) {
theFact = 1.;
if (!theNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit)))
{
return Standard_False;
}
Handle(StepBasic_ConversionBasedUnitAndMassUnit) aCBUMU =
Handle(StepBasic_ConversionBasedUnitAndMassUnit)::DownCast(theNUnit);
Handle(StepBasic_MeasureWithUnit) aMWUCBU = GetMeasureWithUnit(aCBUMU->ConversionFactor());
theFact = aMWUCBU->ValueComponent();
StepBasic_Unit anUnit2 = aMWUCBU->UnitComponent();
if (anUnit2.CaseNum(anUnit2.Value()) == 1)
{
Handle(StepBasic_NamedUnit) NU2 = anUnit2.NamedUnit();
if (NU2->IsKind(STANDARD_TYPE(StepBasic_SiUnit))) {
if (NU2->IsKind(STANDARD_TYPE(StepBasic_SiUnit)))
{
Handle(StepBasic_SiUnit) SU = Handle(StepBasic_SiUnit)::DownCast(NU2);
if (SU->Name() == StepBasic_sunGram) {
if (SU->Name() == StepBasic_sunGram)
{
if (SU->HasPrefix())
afact *= STEPConstruct_UnitContext::ConvertSiPrefix(SU->Prefix());
{
theFact *= STEPConstruct_UnitContext::ConvertSiPrefix(SU->Prefix());
}
}
}
}
@ -3341,24 +3369,32 @@ TDF_Label STEPCAFControl_Reader::createGDTObjectInXCAF(const Handle(Standard_Tra
aDGTTool->SetDimTol(shL, 1, arr, aName, DimSize->Name());
}
// read tolerances and datums
else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeometricTolerance))) {
else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeometricTolerance)))
{
Handle(StepDimTol_GeometricTolerance) GT =
Handle(StepDimTol_GeometricTolerance)::DownCast(theEnt);
// read common data for tolerance
//Standard_Real dim = GT->Magnitude()->ValueComponent();
Handle(StepBasic_MeasureWithUnit) dim3 = GT->Magnitude();
if (dim3.IsNull()) continue;
Standard_Real dim = dim3->ValueComponent();
StepBasic_Unit anUnit = GT->Magnitude()->UnitComponent();
if (GT->Magnitude().IsNull())
{
continue;
}
Handle(StepBasic_MeasureWithUnit) aMWU = GetMeasureWithUnit(GT->Magnitude());
if (aMWU.IsNull())
{
continue;
}
Standard_Real aVal = aMWU->ValueComponent();
StepBasic_Unit anUnit = aMWU->UnitComponent();
if (anUnit.IsNull()) continue;
if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
STEPConstruct_UnitContext anUnitCtx;
anUnitCtx.ComputeFactors(NU, theLocalFactors);
dim = dim * anUnitCtx.LengthFactor();
aVal = aVal * anUnitCtx.LengthFactor();
//std::cout<<"GeometricTolerance: Magnitude = "<<dim<<std::endl;
Handle(TColStd_HArray1OfReal) arr = new TColStd_HArray1OfReal(1, 1);
arr->SetValue(1, dim);
arr->SetValue(1, aVal);
Handle(TCollection_HAsciiString) aName = GT->Name();
Handle(TCollection_HAsciiString) aDescription = GT->Description();
Handle(StepShape_AdvancedFace) AF = Handle(StepShape_AdvancedFace)::DownCast(RI);
@ -3888,16 +3924,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
Handle(Standard_Transient) aUpperBound = aTV->UpperBound();
if(aUpperBound.IsNull())
continue;
Handle(StepBasic_MeasureWithUnit) aMWU;
if(aUpperBound->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) )
aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aUpperBound);
else if(aUpperBound->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)) )
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aUpperBound);
aMWU = aReprMeasureItem->GetMeasureWithUnit();
}
Handle(StepBasic_MeasureWithUnit) aMWU = GetMeasureWithUnit(aUpperBound);
if(aMWU.IsNull())
continue;
Standard_Real aVal = aMWU->ValueComponent();
@ -3923,16 +3950,8 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
Handle(Standard_Transient) aLowerBound = aTV->LowerBound();
if(aLowerBound.IsNull())
continue;
if(aLowerBound->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) )
aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aLowerBound);
else if(aLowerBound->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)) )
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aLowerBound);
aMWU = aReprMeasureItem->GetMeasureWithUnit();
}
aMWU = GetMeasureWithUnit(aLowerBound);
if(aMWU.IsNull())
continue;
@ -4294,17 +4313,26 @@ static void setGeomTolObjectToXCAF(const Handle(Standard_Transient)& theEnt,
XCAFDimTolObjects_GeomToleranceType aType = XCAFDimTolObjects_GeomToleranceType_None;
getTolType(theEnt, aType);
aTolObj->SetType(aType);
if (!aTolEnt->Magnitude().IsNull()) {
//get value
Standard_Real aVal = aTolEnt->Magnitude()->ValueComponent();
StepBasic_Unit anUnit = aTolEnt->Magnitude()->UnitComponent();
if (anUnit.IsNull()) return;
if (!(anUnit.CaseNum(anUnit.Value()) == 1)) return;
Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
STEPConstruct_UnitContext anUnitCtx;
anUnitCtx.ComputeFactors(NU, theLocalFactors);
aVal = aVal * anUnitCtx.LengthFactor();
aTolObj->SetValue(aVal);
if (!aTolEnt->Magnitude().IsNull())
{
Handle(StepBasic_MeasureWithUnit) aMWU = GetMeasureWithUnit(aTolEnt->Magnitude());
if (!aMWU.IsNull())
{
// Get value
Standard_Real aVal = aMWU->ValueComponent();
StepBasic_Unit anUnit = aMWU->UnitComponent();
if (!anUnit.IsNull() && anUnit.CaseNum(anUnit.Value()) == 1)
{
Handle(StepBasic_NamedUnit) aNU = anUnit.NamedUnit();
STEPConstruct_UnitContext anUnitCtx;
anUnitCtx.ComputeFactors(aNU, theLocalFactors);
if (anUnitCtx.LengthFactor() > 0.)
{
aVal = aVal * anUnitCtx.LengthFactor();
}
}
aTolObj->SetValue(aVal);
}
}
//get modifiers
XCAFDimTolObjects_GeomToleranceTypeValue aTypeV = XCAFDimTolObjects_GeomToleranceTypeValue_None;

135
src/STEPConstruct/STEPConstruct_UnitContext.cxx
View File

@ -39,6 +39,7 @@
#include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
#include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
#include <StepRepr_GlobalUnitAssignedContext.hxx>
#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
#include <TCollection_HAsciiString.hxx>
//=======================================================================
@ -115,13 +116,13 @@ void STEPConstruct_UnitContext::Init(const Standard_Real Tol3d,
Handle(StepBasic_DimensionalExponents) theDimExp = new StepBasic_DimensionalExponents;
theDimExp->Init ( 1., 0., 0., 0., 0., 0., 0. );
Handle(TCollection_HAsciiString) convName = new TCollection_HAsciiString ( uName );
Handle(StepBasic_ConversionBasedUnitAndLengthUnit) convUnit =
Handle(TCollection_HAsciiString) aConvName = new TCollection_HAsciiString(uName);
Handle(StepBasic_ConversionBasedUnitAndLengthUnit) aConvUnit =
new StepBasic_ConversionBasedUnitAndLengthUnit;
convUnit->Init ( theDimExp, convName, measure );
lengthUnit = convUnit;
aConvUnit->Init(theDimExp, aConvName, measure);
lengthUnit = aConvUnit;
}
else lengthUnit = siUnit;
@ -282,61 +283,75 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepRepr
}
Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasic_NamedUnit)& aUnit,
Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasic_NamedUnit)& theUnit,
const StepData_Factors& theLocalFactors)
{
//:f3 abv 8 Apr 98: ProSTEP TR8 tr8_as_sd_sw: the case of unrecognized entity
if ( aUnit.IsNull() )
if (theUnit.IsNull())
return -1;
Standard_Integer status = 0;
Standard_Real theFactor= 0.;
Standard_Real theSIUNF = 0.;
Standard_Real theFactor = 0.;
Standard_Real theSIUNF = 0.;
Standard_Real parameter= 0.;
Standard_Boolean parameterDone = Standard_False;
if(aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnit))) {
Handle(StepBasic_ConversionBasedUnit) theCBU =
Handle(StepBasic_ConversionBasedUnit)::DownCast(aUnit);
if(theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnit)))
{
Handle(StepBasic_ConversionBasedUnit) aCBU =
Handle(StepBasic_ConversionBasedUnit)::DownCast(theUnit);
// Handle(StepBasic_DimensionalExponents) theDimExp = theCBU->Dimensions();
Handle(StepBasic_MeasureWithUnit) theMWU;
if(!theCBU.IsNull()) {
theMWU = theCBU->ConversionFactor();
// sln 8.10.2001: the case of unrecognized entity
if(theMWU.IsNull())
return -1;
Handle(StepBasic_MeasureWithUnit) aMWU;
if(!aCBU.IsNull())
{
Handle(Standard_Transient) aConvFactor = aCBU->ConversionFactor();
if (aConvFactor->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
{
aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aConvFactor);
}
else if (aConvFactor->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aConvFactor);
aMWU = aReprMeasureItem->GetMeasureWithUnit();
}
// sln 8.10.2001: the case of unrecognized entity
if(aMWU.IsNull())
return -1;
//if (!theMWU->IsKind(STANDARD_TYPE(StepBasic_LengthMeasureWithUnit))) { gka
// return 2;
// return 2;
//}
Handle(StepBasic_NamedUnit) theTargetUnit = theMWU->UnitComponent().NamedUnit();
Handle(StepBasic_NamedUnit) theTargetUnit = aMWU->UnitComponent().NamedUnit();
//StepBasic_Unit theTargetUnit = theMWU->UnitComponent();
Standard_Real theSIPFactor = 1.;
//:f5 abv 24 Apr 98: ProSTEP TR8 tr8_bv1_tc: INCHES
//gka Handle(StepBasic_SiUnitAndLengthUnit) theSUALU =
// Handle(StepBasic_SiUnitAndLengthUnit)::DownCast(theTargetUnit);
// Handle(StepBasic_SiUnit) theSIU;
// if ( ! theSUALU.IsNull() ) theSIU = Handle(StepBasic_SiUnit)::DownCast(theSUALU);
Handle(StepBasic_SiUnit) theSIU = //f5
Handle(StepBasic_SiUnit)::DownCast(theTargetUnit);//f5
if (!theSIU.IsNull()) {
if (theSIU->HasPrefix()) {
// Treat the prefix
StepBasic_SiPrefix aPrefix = theSIU->Prefix();
theSIPFactor = ConvertSiPrefix(aPrefix);
}
// Treat the SiUnitName
if (!SiUnitNameFactor(theSIU,theSIUNF)) status = 11; // et continue
//std::cout << "The SiUnitNameFactor is :";
//std::cout << theSIUNF << std::endl;
//gka
//Handle(StepBasic_SiUnitAndLengthUnit) theSUALU =
//Handle(StepBasic_SiUnitAndLengthUnit)::DownCast(theTargetUnit);
//Handle(StepBasic_SiUnit) theSIU;
//if ( ! theSUALU.IsNull() ) theSIU = Handle(StepBasic_SiUnit)::DownCast(theSUALU);
Handle(StepBasic_SiUnit) theSIU = Handle(StepBasic_SiUnit)::DownCast(theTargetUnit); //f5
if (!theSIU.IsNull())
{
if (theSIU->HasPrefix())
{
// Treat the prefix
StepBasic_SiPrefix aPrefix = theSIU->Prefix();
theSIPFactor = ConvertSiPrefix(aPrefix);
}
// Treat the SiUnitName
if (!SiUnitNameFactor(theSIU,theSIUNF)) status = 11; // et continue
//std::cout << "The SiUnitNameFactor is :";
//std::cout << theSIUNF << std::endl;
}
else {
// std::cout << "Recursive algo required - Aborted" << std::endl;
return 3;
else
{
//std::cout << "Recursive algo required - Aborted" << std::endl;
return 3;
}
Standard_Real theMVAL = theMWU->ValueComponent();
Standard_Real theMVAL = aMWU->ValueComponent();
theFactor = theSIPFactor * theMVAL; // * theSIUNF * pow(10.,theLExp)
}
parameter = theFactor;
@ -349,9 +364,10 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
std::cout << "Error in the file : parameter double defined" << std::endl;
#endif
}
}
else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnit))) {
Handle(StepBasic_SiUnit) theSIU = Handle(StepBasic_SiUnit)::DownCast(aUnit);
}
else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnit)))
{
Handle(StepBasic_SiUnit) theSIU = Handle(StepBasic_SiUnit)::DownCast(theUnit);
Standard_Real theSIPFactor = 1.;
if (theSIU->HasPrefix()) {
// Treat the prefix
@ -385,8 +401,9 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
}
const Standard_Real aCascadeUnit = theLocalFactors.CascadeUnit();
if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndLengthUnit))||
aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndLengthUnit))) {
if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndLengthUnit))||
theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndLengthUnit)))
{
#ifdef METER
lengthFactor = parameter;
#else
@ -401,18 +418,21 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
#endif
}
} // end of LengthUnit
else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndPlaneAngleUnit))||
aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndPlaneAngleUnit))) {
else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)) ||
theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndPlaneAngleUnit)))
{
planeAngleFactor = parameter;
planeAngleDone = Standard_True;
} // end of PlaneAngleUnit
else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndSolidAngleUnit))||
aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndSolidAngleUnit))) {
else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndSolidAngleUnit)) ||
theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndSolidAngleUnit)))
{
solidAngleFactor = parameter;
solidAngleDone = Standard_True;
} // end of SolidAngleUnit
else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndAreaUnit)) ||
aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndAreaUnit))) {
else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndAreaUnit)) ||
theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndAreaUnit)))
{
Standard_Real af;
#ifdef METER
af = parameter;
@ -422,8 +442,9 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
areaDone = Standard_True;
areaFactor = pow(af,2);
}
else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndVolumeUnit)) ||
aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndVolumeUnit))) {
else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndVolumeUnit)) ||
theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndVolumeUnit)))
{
Standard_Real af;
#ifdef METER
af = parameter;

24
src/STEPControl/STEPControl_Reader.cxx
View File

@ -48,6 +48,7 @@
#include <StepRepr_RepresentationContext.hxx>
#include <StepRepr_RepresentationMap.hxx>
#include <StepRepr_RepresentationRelationship.hxx>
#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
#include <StepRepr_ShapeAspect.hxx>
#include <StepShape_ManifoldSolidBrep.hxx>
#include <StepShape_ShapeDefinitionRepresentation.hxx>
@ -681,21 +682,32 @@ Standard_Boolean STEPControl_Reader::findUnits(
Handle(StepBasic_HArray1OfNamedUnit) anUnits = aContext->Units();
Standard_Integer nbU = aContext->NbUnits();
Standard_Integer nbFind = 0;
for (Standard_Integer i = 1; i <= nbU; i++) {
for (Standard_Integer i = 1; i <= nbU; i++)
{
Handle(StepBasic_NamedUnit) aNamedUnit = aContext->UnitsValue(i);
Handle(StepBasic_ConversionBasedUnit) aConvUnit =
Handle(StepBasic_ConversionBasedUnit)::DownCast(aNamedUnit);
Standard_Integer anInd = 0;
TCollection_AsciiString aName;
Standard_Real anUnitFact = 0;
if( !aConvUnit.IsNull() )
if(!aConvUnit.IsNull())
{
Handle(StepBasic_MeasureWithUnit) aMeasWithUnit =
aConvUnit->ConversionFactor();
Handle(StepBasic_MeasureWithUnit) aMeasWithUnit;
Handle(Standard_Transient) aConvFactor = aConvUnit->ConversionFactor();
if (aConvFactor->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
{
aMeasWithUnit = Handle(StepBasic_MeasureWithUnit)::DownCast(aConvFactor);
}
else if (aConvFactor->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aConvFactor);
aMeasWithUnit = aReprMeasureItem->GetMeasureWithUnit();
}
if(aMeasWithUnit.IsNull())
continue;
if( aMeasWithUnit->IsKind(STANDARD_TYPE(StepBasic_LengthMeasureWithUnit)) )
anInd = 1;
else if( aMeasWithUnit->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) )

32
src/StepBasic/StepBasic_ConversionBasedUnit.cxx
View File

@ -14,42 +14,40 @@
#include <StepBasic_ConversionBasedUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <TCollection_HAsciiString.hxx>
IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnit,StepBasic_NamedUnit)
StepBasic_ConversionBasedUnit::StepBasic_ConversionBasedUnit () {}
void StepBasic_ConversionBasedUnit::Init(
const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
void StepBasic_ConversionBasedUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor)
{
// --- classe own fields ---
name = aName;
conversionFactor = aConversionFactor;
// --- classe inherited fields ---
StepBasic_NamedUnit::Init(aDimensions);
// --- classe own fields ---
myName = theName;
myConversionFactor = theConversionFactor;
// --- classe inherited fields ---
StepBasic_NamedUnit::Init(theDimensions);
}
void StepBasic_ConversionBasedUnit::SetName(const Handle(TCollection_HAsciiString)& aName)
void StepBasic_ConversionBasedUnit::SetName(const Handle(TCollection_HAsciiString)& theName)
{
name = aName;
myName = theName;
}
Handle(TCollection_HAsciiString) StepBasic_ConversionBasedUnit::Name() const
{
return name;
return myName;
}
void StepBasic_ConversionBasedUnit::SetConversionFactor(const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
void StepBasic_ConversionBasedUnit::SetConversionFactor(const Handle(Standard_Transient)& theConversionFactor)
{
conversionFactor = aConversionFactor;
myConversionFactor = theConversionFactor;
}
Handle(StepBasic_MeasureWithUnit) StepBasic_ConversionBasedUnit::ConversionFactor() const
Handle(Standard_Transient) StepBasic_ConversionBasedUnit::ConversionFactor() const
{
return conversionFactor;
return myConversionFactor;
}

15
src/StepBasic/StepBasic_ConversionBasedUnit.hxx
View File

@ -22,7 +22,6 @@
#include <StepBasic_NamedUnit.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_DimensionalExponents;
@ -39,15 +38,17 @@ public:
//! Returns a ConversionBasedUnit
Standard_EXPORT StepBasic_ConversionBasedUnit();
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor);
Standard_EXPORT void SetName (const Handle(TCollection_HAsciiString)& aName);
Standard_EXPORT void SetName (const Handle(TCollection_HAsciiString)& theName);
Standard_EXPORT Handle(TCollection_HAsciiString) Name() const;
Standard_EXPORT void SetConversionFactor (const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
Standard_EXPORT void SetConversionFactor (const Handle(Standard_Transient)& theConversionFactor);
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) ConversionFactor() const;
Standard_EXPORT Handle(Standard_Transient) ConversionFactor() const;
@ -62,8 +63,8 @@ protected:
private:
Handle(TCollection_HAsciiString) name;
Handle(StepBasic_MeasureWithUnit) conversionFactor;
Handle(TCollection_HAsciiString) myName;
Handle(Standard_Transient) myConversionFactor;
};

19
src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx
View File

@ -16,33 +16,32 @@
#include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_LengthUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <TCollection_HAsciiString.hxx>
IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndLengthUnit,StepBasic_ConversionBasedUnit)
StepBasic_ConversionBasedUnitAndLengthUnit::StepBasic_ConversionBasedUnitAndLengthUnit () {}
void StepBasic_ConversionBasedUnitAndLengthUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
void StepBasic_ConversionBasedUnitAndLengthUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
// --- ANDOR component fields ---
lengthUnit = new StepBasic_LengthUnit();
lengthUnit->Init(aDimensions);
myLengthUnit = new StepBasic_LengthUnit();
myLengthUnit->Init(theDimensions);
}
void StepBasic_ConversionBasedUnitAndLengthUnit::SetLengthUnit(const Handle(StepBasic_LengthUnit)& aLengthUnit)
void StepBasic_ConversionBasedUnitAndLengthUnit::SetLengthUnit(const Handle(StepBasic_LengthUnit)& theLengthUnit)
{
lengthUnit = aLengthUnit;
myLengthUnit = theLengthUnit;
}
Handle(StepBasic_LengthUnit) StepBasic_ConversionBasedUnitAndLengthUnit::LengthUnit() const
{
return lengthUnit;
return myLengthUnit;
}

9
src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx
View File

@ -24,7 +24,6 @@
class StepBasic_LengthUnit;
class StepBasic_DimensionalExponents;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_ConversionBasedUnitAndLengthUnit;
@ -40,9 +39,11 @@ public:
//! Returns a ConversionBasedUnitAndLengthUnit
Standard_EXPORT StepBasic_ConversionBasedUnitAndLengthUnit();
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor);
Standard_EXPORT void SetLengthUnit (const Handle(StepBasic_LengthUnit)& aLengthUnit);
Standard_EXPORT void SetLengthUnit (const Handle(StepBasic_LengthUnit)& theLengthUnit);
Standard_EXPORT Handle(StepBasic_LengthUnit) LengthUnit() const;
@ -59,7 +60,7 @@ protected:
private:
Handle(StepBasic_LengthUnit) lengthUnit;
Handle(StepBasic_LengthUnit) myLengthUnit;
};

21
src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx
View File

@ -16,7 +16,6 @@
#include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MassUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <TCollection_HAsciiString.hxx>
IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndMassUnit,StepBasic_ConversionBasedUnit)
@ -35,17 +34,16 @@ StepBasic_ConversionBasedUnitAndMassUnit::StepBasic_ConversionBasedUnitAndMassUn
//purpose :
//=======================================================================
void StepBasic_ConversionBasedUnitAndMassUnit::Init
(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
void StepBasic_ConversionBasedUnitAndMassUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
// --- ANDOR component fields ---
massUnit = new StepBasic_MassUnit();
massUnit->Init(aDimensions);
myMassUnit = new StepBasic_MassUnit();
myMassUnit->Init(theDimensions);
}
@ -54,10 +52,9 @@ void StepBasic_ConversionBasedUnitAndMassUnit::Init
//purpose :
//=======================================================================
void StepBasic_ConversionBasedUnitAndMassUnit::SetMassUnit
(const Handle(StepBasic_MassUnit)& aMassUnit)
void StepBasic_ConversionBasedUnitAndMassUnit::SetMassUnit(const Handle(StepBasic_MassUnit)& theMassUnit)
{
massUnit = aMassUnit;
myMassUnit = theMassUnit;
}
@ -68,6 +65,6 @@ void StepBasic_ConversionBasedUnitAndMassUnit::SetMassUnit
Handle(StepBasic_MassUnit) StepBasic_ConversionBasedUnitAndMassUnit::MassUnit() const
{
return massUnit;
return myMassUnit;
}

9
src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx
View File

@ -23,7 +23,6 @@
class StepBasic_MassUnit;
class StepBasic_DimensionalExponents;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_ConversionBasedUnitAndMassUnit;
@ -39,9 +38,11 @@ public:
//! Returns a ConversionBasedUnitAndLengthUnit
Standard_EXPORT StepBasic_ConversionBasedUnitAndMassUnit();
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor);
Standard_EXPORT void SetMassUnit (const Handle(StepBasic_MassUnit)& aMassUnit);
Standard_EXPORT void SetMassUnit (const Handle(StepBasic_MassUnit)& theMassUnit);
Standard_EXPORT Handle(StepBasic_MassUnit) MassUnit() const;
@ -58,7 +59,7 @@ protected:
private:
Handle(StepBasic_MassUnit) massUnit;
Handle(StepBasic_MassUnit) myMassUnit;
};

19
src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx
View File

@ -15,7 +15,6 @@
#include <Standard_Type.hxx>
#include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_PlaneAngleUnit.hxx>
#include <TCollection_HAsciiString.hxx>
@ -25,26 +24,26 @@ StepBasic_ConversionBasedUnitAndPlaneAngleUnit::StepBasic_ConversionBasedUnitAnd
{
}
void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
// --- ANDOR component fields ---
planeAngleUnit = new StepBasic_PlaneAngleUnit();
planeAngleUnit->Init(aDimensions);
myPlaneAngleUnit = new StepBasic_PlaneAngleUnit();
myPlaneAngleUnit->Init(theDimensions);
}
void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::SetPlaneAngleUnit(const Handle(StepBasic_PlaneAngleUnit)& aPlaneAngleUnit)
void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::SetPlaneAngleUnit(const Handle(StepBasic_PlaneAngleUnit)& thePlaneAngleUnit)
{
planeAngleUnit = aPlaneAngleUnit;
myPlaneAngleUnit = thePlaneAngleUnit;
}
Handle(StepBasic_PlaneAngleUnit) StepBasic_ConversionBasedUnitAndPlaneAngleUnit::PlaneAngleUnit() const
{
return planeAngleUnit;
return myPlaneAngleUnit;
}

9
src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx
View File

@ -24,7 +24,6 @@
class StepBasic_PlaneAngleUnit;
class StepBasic_DimensionalExponents;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_ConversionBasedUnitAndPlaneAngleUnit;
@ -40,9 +39,11 @@ public:
//! Returns a ConversionBasedUnitAndPlaneAngleUnit
Standard_EXPORT StepBasic_ConversionBasedUnitAndPlaneAngleUnit();
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor);
Standard_EXPORT void SetPlaneAngleUnit (const Handle(StepBasic_PlaneAngleUnit)& aPlaneAngleUnit);
Standard_EXPORT void SetPlaneAngleUnit (const Handle(StepBasic_PlaneAngleUnit)& thePlaneAngleUnit);
Standard_EXPORT Handle(StepBasic_PlaneAngleUnit) PlaneAngleUnit() const;
@ -59,7 +60,7 @@ protected:
private:
Handle(StepBasic_PlaneAngleUnit) planeAngleUnit;
Handle(StepBasic_PlaneAngleUnit) myPlaneAngleUnit;
};

19
src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx
View File

@ -15,7 +15,6 @@
#include <Standard_Type.hxx>
#include <StepBasic_ConversionBasedUnitAndRatioUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_RatioUnit.hxx>
#include <TCollection_HAsciiString.hxx>
@ -25,25 +24,25 @@ StepBasic_ConversionBasedUnitAndRatioUnit::StepBasic_ConversionBasedUnitAndRatio
{
}
void StepBasic_ConversionBasedUnitAndRatioUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
void StepBasic_ConversionBasedUnitAndRatioUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
// --- ANDOR component fields ---
ratioUnit = new StepBasic_RatioUnit();
ratioUnit->Init(aDimensions);
myRatioUnit = new StepBasic_RatioUnit();
myRatioUnit->Init(theDimensions);
}
void StepBasic_ConversionBasedUnitAndRatioUnit::SetRatioUnit(const Handle(StepBasic_RatioUnit)& aRatioUnit)
void StepBasic_ConversionBasedUnitAndRatioUnit::SetRatioUnit(const Handle(StepBasic_RatioUnit)& theRatioUnit)
{
ratioUnit = aRatioUnit;
myRatioUnit = theRatioUnit;
}
Handle(StepBasic_RatioUnit) StepBasic_ConversionBasedUnitAndRatioUnit::RatioUnit() const
{
return ratioUnit;
return myRatioUnit;
}

9
src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx
View File

@ -24,7 +24,6 @@
class StepBasic_RatioUnit;
class StepBasic_DimensionalExponents;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_ConversionBasedUnitAndRatioUnit;
@ -40,9 +39,11 @@ public:
//! Returns a ConversionBasedUnitAndRatioUnit
Standard_EXPORT StepBasic_ConversionBasedUnitAndRatioUnit();
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor);
Standard_EXPORT void SetRatioUnit (const Handle(StepBasic_RatioUnit)& aRatioUnit);
Standard_EXPORT void SetRatioUnit (const Handle(StepBasic_RatioUnit)& theRatioUnit);
Standard_EXPORT Handle(StepBasic_RatioUnit) RatioUnit() const;
@ -59,7 +60,7 @@ protected:
private:
Handle(StepBasic_RatioUnit) ratioUnit;
Handle(StepBasic_RatioUnit) myRatioUnit;
};

19
src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx
View File

@ -15,7 +15,6 @@
#include <Standard_Type.hxx>
#include <StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_SolidAngleUnit.hxx>
#include <TCollection_HAsciiString.hxx>
@ -25,26 +24,26 @@ StepBasic_ConversionBasedUnitAndSolidAngleUnit::StepBasic_ConversionBasedUnitAnd
{
}
void StepBasic_ConversionBasedUnitAndSolidAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
void StepBasic_ConversionBasedUnitAndSolidAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
// --- ANDOR component fields ---
solidAngleUnit = new StepBasic_SolidAngleUnit();
solidAngleUnit->Init(aDimensions);
mySolidAngleUnit = new StepBasic_SolidAngleUnit();
mySolidAngleUnit->Init(theDimensions);
}
void StepBasic_ConversionBasedUnitAndSolidAngleUnit::SetSolidAngleUnit(const Handle(StepBasic_SolidAngleUnit)& aSolidAngleUnit)
void StepBasic_ConversionBasedUnitAndSolidAngleUnit::SetSolidAngleUnit(const Handle(StepBasic_SolidAngleUnit)& theSolidAngleUnit)
{
solidAngleUnit = aSolidAngleUnit;
mySolidAngleUnit = theSolidAngleUnit;
}
Handle(StepBasic_SolidAngleUnit) StepBasic_ConversionBasedUnitAndSolidAngleUnit::SolidAngleUnit() const
{
return solidAngleUnit;
return mySolidAngleUnit;
}

9
src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx
View File

@ -24,7 +24,6 @@
class StepBasic_SolidAngleUnit;
class StepBasic_DimensionalExponents;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_ConversionBasedUnitAndSolidAngleUnit;
@ -40,9 +39,11 @@ public:
//! Returns a ConversionBasedUnitAndSolidAngleUnit
Standard_EXPORT StepBasic_ConversionBasedUnitAndSolidAngleUnit();
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor);
Standard_EXPORT void SetSolidAngleUnit (const Handle(StepBasic_SolidAngleUnit)& aSolidAngleUnit);
Standard_EXPORT void SetSolidAngleUnit (const Handle(StepBasic_SolidAngleUnit)& theSolidAngleUnit);
Standard_EXPORT Handle(StepBasic_SolidAngleUnit) SolidAngleUnit() const;
@ -59,7 +60,7 @@ protected:
private:
Handle(StepBasic_SolidAngleUnit) solidAngleUnit;
Handle(StepBasic_SolidAngleUnit) mySolidAngleUnit;
};

19
src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx
View File

@ -15,7 +15,6 @@
#include <Standard_Type.hxx>
#include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_TimeUnit.hxx>
#include <TCollection_HAsciiString.hxx>
@ -25,26 +24,26 @@ StepBasic_ConversionBasedUnitAndTimeUnit::StepBasic_ConversionBasedUnitAndTimeUn
{
}
void StepBasic_ConversionBasedUnitAndTimeUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
void StepBasic_ConversionBasedUnitAndTimeUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
// --- ANDOR component fields ---
timeUnit = new StepBasic_TimeUnit();
timeUnit->Init(aDimensions);
myTimeUnit = new StepBasic_TimeUnit();
myTimeUnit->Init(theDimensions);
}
void StepBasic_ConversionBasedUnitAndTimeUnit::SetTimeUnit(const Handle(StepBasic_TimeUnit)& aTimeUnit)
void StepBasic_ConversionBasedUnitAndTimeUnit::SetTimeUnit(const Handle(StepBasic_TimeUnit)& theTimeUnit)
{
timeUnit = aTimeUnit;
myTimeUnit = theTimeUnit;
}
Handle(StepBasic_TimeUnit) StepBasic_ConversionBasedUnitAndTimeUnit::TimeUnit() const
{
return timeUnit;
return myTimeUnit;
}

9
src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx
View File

@ -24,7 +24,6 @@
class StepBasic_TimeUnit;
class StepBasic_DimensionalExponents;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_ConversionBasedUnitAndTimeUnit;
@ -40,9 +39,11 @@ public:
//! Returns a ConversionBasedUnitAndTimeUnit
Standard_EXPORT StepBasic_ConversionBasedUnitAndTimeUnit();
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
const Handle(TCollection_HAsciiString)& theName,
const Handle(Standard_Transient)& theConversionFactor);
Standard_EXPORT void SetTimeUnit (const Handle(StepBasic_TimeUnit)& aTimeUnit);
Standard_EXPORT void SetTimeUnit (const Handle(StepBasic_TimeUnit)& theTimeUnit);
Standard_EXPORT Handle(StepBasic_TimeUnit) TimeUnit() const;
@ -59,7 +60,7 @@ protected:
private:
Handle(StepBasic_TimeUnit) timeUnit;
Handle(StepBasic_TimeUnit) myTimeUnit;
};

5
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
View File

@ -14,7 +14,6 @@
// commercial license or contractual agreement.
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
#include <StepDimTol_GeoTolAndGeoTolWthDatRef.hxx>
#include <StepRepr_ShapeAspect.hxx>
@ -39,7 +38,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRef::StepDimTol_GeoTolAndGeoTolWthDatRef()
void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType)
@ -60,7 +59,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType)

13
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx
View File

@ -24,7 +24,6 @@
class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithDatumReference;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
@ -41,16 +40,16 @@ public:
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType);
inline void SetGeometricToleranceWithDatumReference (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR){

5
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
View File

@ -15,7 +15,6 @@
#include <StepBasic_LengthMeasureWithUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
#include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
#include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@ -41,7 +40,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::StepDimTol_GeoTolAndGeoTo
void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@ -61,7 +60,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,

5
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
View File

@ -26,7 +26,6 @@ class StepDimTol_GeometricToleranceWithDatumReference;
class StepDimTol_GeometricToleranceWithModifiers;
class TCollection_HAsciiString;
class StepBasic_LengthMeasureWithUnit;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
@ -42,7 +41,7 @@ public:
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@ -51,7 +50,7 @@ public:
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,

5
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
View File

@ -14,7 +14,6 @@
// commercial license or contractual agreement.
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
#include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
#include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@ -40,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::StepDimTol_GeoTolAndGeoTolWt
void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@ -63,7 +62,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,

5
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
View File

@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithDatumReference;
class StepDimTol_GeometricToleranceWithModifiers;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
@ -42,7 +41,7 @@ public:
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@ -50,7 +49,7 @@ public:
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,

61
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
View File

@ -12,7 +12,6 @@
// commercial license or contractual agreement.
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
#include <StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
#include <StepDimTol_ModifiedGeometricTolerance.hxx>
@ -37,19 +36,19 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::StepDimTol_GeoTolAndGe
//=======================================================================
void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
(const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT)
{
SetName(aName);
SetDescription(aDescription);
SetMagnitude(aMagnitude);
SetTolerancedShapeAspect(aTolerancedShapeAspect);
myGeometricToleranceWithDatumReference = aGTWDR;
myModifiedGeometricTolerance = aMGT;
SetName(theName);
SetDescription(theDescription);
SetMagnitude(theMagnitude);
SetTolerancedShapeAspect(theTolerancedShapeAspect);
myGeometricToleranceWithDatumReference = theGTWDR;
myModifiedGeometricTolerance = theMGT;
}
//=======================================================================
@ -58,19 +57,19 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
//=======================================================================
void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
(const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT)
{
SetName(aName);
SetDescription(aDescription);
SetMagnitude(aMagnitude);
SetTolerancedShapeAspect(aTolerancedShapeAspect);
myGeometricToleranceWithDatumReference = aGTWDR;
myModifiedGeometricTolerance = aMGT;
SetName(theName);
SetDescription(theDescription);
SetMagnitude(theMagnitude);
SetTolerancedShapeAspect(theTolerancedShapeAspect);
myGeometricToleranceWithDatumReference = theGTWDR;
myModifiedGeometricTolerance = theMGT;
}
@ -80,9 +79,9 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
//=======================================================================
void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::SetGeometricToleranceWithDatumReference
(const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR)
(const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR)
{
myGeometricToleranceWithDatumReference = aGTWDR;
myGeometricToleranceWithDatumReference = theGTWDR;
}
@ -103,9 +102,9 @@ Handle(StepDimTol_GeometricToleranceWithDatumReference) StepDimTol_GeoTolAndGeoT
//=======================================================================
void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::SetModifiedGeometricTolerance
(const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)
(const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT)
{
myModifiedGeometricTolerance = aMGT;
myModifiedGeometricTolerance = theMGT;
}
@ -126,9 +125,9 @@ Handle(StepDimTol_ModifiedGeometricTolerance) StepDimTol_GeoTolAndGeoTolWthDatRe
//=======================================================================
void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::SetPositionTolerance
(const Handle(StepDimTol_PositionTolerance)& aPT)
(const Handle(StepDimTol_PositionTolerance)& thePT)
{
myPositionTolerance = aPT;
myPositionTolerance = thePT;
}

21
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
View File

@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceWithDatumReference;
class StepDimTol_ModifiedGeometricTolerance;
class StepDimTol_PositionTolerance;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
@ -41,19 +40,29 @@ public:
Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol();
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aDescription, const Handle(StepBasic_MeasureWithUnit)& aMagnitude, const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aDescription, const Handle(StepBasic_MeasureWithUnit)& aMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT);
Standard_EXPORT void SetGeometricToleranceWithDatumReference (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR);
Standard_EXPORT void SetGeometricToleranceWithDatumReference (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR);
Standard_EXPORT Handle(StepDimTol_GeometricToleranceWithDatumReference) GetGeometricToleranceWithDatumReference() const;
Standard_EXPORT void SetModifiedGeometricTolerance (const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);
Standard_EXPORT void SetModifiedGeometricTolerance (const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT);
Standard_EXPORT Handle(StepDimTol_ModifiedGeometricTolerance) GetModifiedGeometricTolerance() const;
Standard_EXPORT void SetPositionTolerance (const Handle(StepDimTol_PositionTolerance)& aPT);
Standard_EXPORT void SetPositionTolerance (const Handle(StepDimTol_PositionTolerance)& thePT);
Standard_EXPORT Handle(StepDimTol_PositionTolerance) GetPositionTolerance() const;

4
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
View File

@ -39,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::StepDimTol_GeoTolAndGeoTolW
void StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType,
@ -58,7 +58,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::Init
void StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType,

13
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
View File

@ -24,7 +24,6 @@ class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithDatumReference;
class StepDimTol_UnequallyDisposedGeometricTolerance;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
@ -41,17 +40,17 @@ public:
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType,
const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& theUDGT);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType,
const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& theUDGT);

6
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
View File

@ -13,9 +13,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <StepBasic_LengthMeasureWithUnit.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
#include <StepDimTol_GeometricToleranceWithModifiers.hxx>
#include <StepRepr_ShapeAspect.hxx>
@ -40,7 +38,7 @@ StepDimTol_GeoTolAndGeoTolWthMaxTol::StepDimTol_GeoTolAndGeoTolWthMaxTol()
void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
@ -58,7 +56,7 @@ void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,

19
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx
View File

@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithModifiers;
class TCollection_HAsciiString;
class StepBasic_LengthMeasureWithUnit;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
@ -40,19 +39,19 @@ public:
Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthMaxTol();
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
const StepDimTol_GeometricToleranceType theType);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
const StepDimTol_GeometricToleranceType theType);

4
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
View File

@ -39,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthMod::StepDimTol_GeoTolAndGeoTolWthMod()
void StepDimTol_GeoTolAndGeoTolWthMod::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const StepDimTol_GeometricToleranceType theType)
@ -60,7 +60,7 @@ void StepDimTol_GeoTolAndGeoTolWthMod::Init
void StepDimTol_GeoTolAndGeoTolWthMod::Init
(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const StepDimTol_GeometricToleranceType theType)

18
src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx
View File

@ -39,18 +39,18 @@ public:
Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthMod();
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const StepDimTol_GeometricToleranceType theType);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const StepDimTol_GeometricToleranceType theType);
inline void SetGeometricToleranceWithModifiers (const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM) {

9
src/StepDimTol/StepDimTol_GeometricTolerance.cxx
View File

@ -15,7 +15,6 @@
// Generator: ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepDimTol_GeometricTolerance.hxx>
#include <StepDimTol_GeometricToleranceTarget.hxx>
#include <StepRepr_ShapeAspect.hxx>
@ -38,7 +37,7 @@ StepDimTol_GeometricTolerance::StepDimTol_GeometricTolerance ()
void StepDimTol_GeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theName,
const Handle(TCollection_HAsciiString) &theDescription,
const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect)
{
@ -58,7 +57,7 @@ void StepDimTol_GeometricTolerance::Init (const Handle(TCollection_HAsciiString)
void StepDimTol_GeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theName,
const Handle(TCollection_HAsciiString) &theDescription,
const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect) &theTolerancedShapeAspect)
{
@ -116,7 +115,7 @@ void StepDimTol_GeometricTolerance::SetDescription (const Handle(TCollection_HAs
//purpose :
//=======================================================================
Handle(StepBasic_MeasureWithUnit) StepDimTol_GeometricTolerance::Magnitude () const
Handle(Standard_Transient) StepDimTol_GeometricTolerance::Magnitude() const
{
return myMagnitude;
}
@ -126,7 +125,7 @@ Handle(StepBasic_MeasureWithUnit) StepDimTol_GeometricTolerance::Magnitude () co
//purpose :
//=======================================================================
void StepDimTol_GeometricTolerance::SetMagnitude (const Handle(StepBasic_MeasureWithUnit) &theMagnitude)
void StepDimTol_GeometricTolerance::SetMagnitude (const Handle(Standard_Transient)& theMagnitude)
{
myMagnitude = theMagnitude;
}

19
src/StepDimTol/StepDimTol_GeometricTolerance.hxx
View File

@ -21,10 +21,9 @@
#include <Standard_Transient.hxx>
#include <StepDimTol_GeometricToleranceTarget.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
class TCollection_HAsciiString;
class StepRepr_ShapeAspect;
class StepDimTol_GeometricTolerance;
DEFINE_STANDARD_HANDLE(StepDimTol_GeometricTolerance, Standard_Transient)
@ -42,13 +41,13 @@ public:
//! Initialize all fields (own and inherited) AP214
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect);
//! Initialize all fields (own and inherited) AP242
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect);
//! Returns field Name
@ -64,11 +63,11 @@ public:
Standard_EXPORT void SetDescription (const Handle(TCollection_HAsciiString)& theDescription);
//! Returns field Magnitude
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Magnitude() const;
Standard_EXPORT Handle(Standard_Transient) Magnitude() const;
//! Set field Magnitude
Standard_EXPORT void SetMagnitude (const Handle(StepBasic_MeasureWithUnit)& theMagnitude);
Standard_EXPORT void SetMagnitude(const Handle(Standard_Transient)& theMagnitude);
//! Returns field TolerancedShapeAspect
//! Note: in AP214(203) type of this attribute can be only StepRepr_ShapeAspect
Standard_EXPORT StepDimTol_GeometricToleranceTarget TolerancedShapeAspect() const;
@ -94,7 +93,7 @@ private:
Handle(TCollection_HAsciiString) myName;
Handle(TCollection_HAsciiString) myDescription;
Handle(StepBasic_MeasureWithUnit) myMagnitude;
Handle(Standard_Transient) myMagnitude;
StepDimTol_GeometricToleranceTarget myTolerancedShapeAspect;

4
src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
View File

@ -38,7 +38,7 @@ StepDimTol_GeometricToleranceWithDatumReference::StepDimTol_GeometricToleranceWi
void StepDimTol_GeometricToleranceWithDatumReference::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const Handle(StepRepr_ShapeAspect) &theGeometricTolerance_TolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfDatumReference) &theDatumSystem)
{
@ -62,7 +62,7 @@ void StepDimTol_GeometricToleranceWithDatumReference::Init (const Handle(TCollec
void StepDimTol_GeometricToleranceWithDatumReference::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const StepDimTol_GeometricToleranceTarget &theGeometricTolerance_TolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfDatumSystemOrReference) &theDatumSystem)
{

4
src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx
View File

@ -44,14 +44,14 @@ public:
//! Initialize all fields (own and inherited) AP214
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const Handle(StepRepr_ShapeAspect)& theGeometricTolerance_TolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfDatumReference)& theDatumSystem);
//! Initialize all fields (own and inherited) AP242
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const StepDimTol_GeometricToleranceTarget& theGeometricTolerance_TolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfDatumSystemOrReference)& theDatumSystem);

2
src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx
View File

@ -34,7 +34,7 @@ StepDimTol_GeometricToleranceWithDefinedAreaUnit::StepDimTol_GeometricToleranceW
void StepDimTol_GeometricToleranceWithDefinedAreaUnit::
Init (const Handle(TCollection_HAsciiString) &theName,
const Handle(TCollection_HAsciiString) &theDescription,
const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize,
const StepDimTol_AreaUnitType theUnitType,

2
src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
View File

@ -42,7 +42,7 @@ public:
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize,
const StepDimTol_AreaUnitType theAreaType, const Standard_Boolean theHasSecondUnitSize,

4
src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx
View File

@ -36,7 +36,7 @@ StepDimTol_GeometricToleranceWithDefinedUnit::StepDimTol_GeometricToleranceWithD
void StepDimTol_GeometricToleranceWithDefinedUnit::Init (const Handle(TCollection_HAsciiString) &theName,
const Handle(TCollection_HAsciiString) &theDescription,
const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect) &theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize)
{
@ -51,7 +51,7 @@ void StepDimTol_GeometricToleranceWithDefinedUnit::Init (const Handle(TCollectio
void StepDimTol_GeometricToleranceWithDefinedUnit::Init (const Handle(TCollection_HAsciiString) &theName,
const Handle(TCollection_HAsciiString) &theDescription,
const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize)
{

13
src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
View File

@ -22,7 +22,6 @@
class StepBasic_LengthMeasureWithUnit;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepDimTol_GeometricToleranceTarget;
class StepRepr_ShapeAspect;
@ -38,10 +37,18 @@ public:
Standard_EXPORT StepDimTol_GeometricToleranceWithDefinedUnit();
//! Initialize all fields (own and inherited) AP214
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, const Handle(StepBasic_MeasureWithUnit)& theMagnitude, const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize);
//! Initialize all fields (own and inherited) AP242
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, const Handle(StepBasic_MeasureWithUnit)& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
//! Returns field UnitSize
inline Handle(StepBasic_LengthMeasureWithUnit) UnitSize () const

2
src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx
View File

@ -37,7 +37,7 @@ StepDimTol_GeometricToleranceWithMaximumTolerance::StepDimTol_GeometricTolerance
void StepDimTol_GeometricToleranceWithMaximumTolerance::
Init (const Handle(TCollection_HAsciiString) &theName,
const Handle(TCollection_HAsciiString) &theDescription,
const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfGeometricToleranceModifier) &theModifiers,
const Handle(StepBasic_LengthMeasureWithUnit) &theMaximumUpperTolerance)

8
src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
View File

@ -22,7 +22,6 @@
#include <StepDimTol_GeometricToleranceWithModifiers.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepDimTol_GeometricToleranceTarget;
class StepDimTol_HArray1OfGeometricToleranceModifier;
@ -38,7 +37,12 @@ public:
Standard_EXPORT StepDimTol_GeometricToleranceWithMaximumTolerance();
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, const Handle(StepBasic_MeasureWithUnit)& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers, const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers,
const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
//! Returns field MaximumUpperTolerance
inline Handle(StepBasic_LengthMeasureWithUnit) MaximumUpperTolerance () const

2
src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx
View File

@ -36,7 +36,7 @@ StepDimTol_GeometricToleranceWithModifiers::StepDimTol_GeometricToleranceWithMod
void StepDimTol_GeometricToleranceWithModifiers::Init (const Handle(TCollection_HAsciiString) &theName,
const Handle(TCollection_HAsciiString) &theDescription,
const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfGeometricToleranceModifier) &theModifiers)
{

3
src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
View File

@ -23,7 +23,6 @@
#include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithModifiers;
@ -40,7 +39,7 @@ public:
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers) ;

5
src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
View File

@ -15,7 +15,6 @@
// Generator: ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepDimTol_ModifiedGeometricTolerance.hxx>
#include <StepDimTol_GeometricToleranceTarget.hxx>
#include <StepRepr_ShapeAspect.hxx>
@ -38,7 +37,7 @@ StepDimTol_ModifiedGeometricTolerance::StepDimTol_ModifiedGeometricTolerance ()
void StepDimTol_ModifiedGeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const Handle(StepRepr_ShapeAspect) &theGeometricTolerance_TolerancedShapeAspect,
const StepDimTol_LimitCondition theModifier)
{
@ -57,7 +56,7 @@ void StepDimTol_ModifiedGeometricTolerance::Init (const Handle(TCollection_HAsci
void StepDimTol_ModifiedGeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const StepDimTol_GeometricToleranceTarget &theGeometricTolerance_TolerancedShapeAspect,
const StepDimTol_LimitCondition theModifier)
{

5
src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx
View File

@ -22,7 +22,6 @@
#include <StepDimTol_LimitCondition.hxx>
#include <StepDimTol_GeometricTolerance.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepDimTol_GeometricToleranceTarget;
class StepRepr_ShapeAspect;
@ -43,14 +42,14 @@ public:
//! Initialize all fields (own and inherited) AP214
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const Handle(StepRepr_ShapeAspect)& theGeometricTolerance_TolerancedShapeAspect,
const StepDimTol_LimitCondition theModifier);
//! Initialize all fields (own and inherited) AP242
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const StepDimTol_GeometricToleranceTarget& theGeometricTolerance_TolerancedShapeAspect,
const StepDimTol_LimitCondition theModifier);

2
src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx
View File

@ -36,7 +36,7 @@ StepDimTol_UnequallyDisposedGeometricTolerance::StepDimTol_UnequallyDisposedGeom
void StepDimTol_UnequallyDisposedGeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theName,
const Handle(TCollection_HAsciiString) &theDescription,
const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit) &theDisplacement)
{

7
src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
View File

@ -22,7 +22,6 @@
#include <StepDimTol_GeometricTolerance.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepDimTol_GeometricToleranceTarget;
class StepDimTol_UnequallyDisposedGeometricTolerance;
@ -37,7 +36,11 @@ public:
Standard_EXPORT StepDimTol_UnequallyDisposedGeometricTolerance();
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, const Handle(StepBasic_MeasureWithUnit)& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit)& theDisplacement) ;
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit)& theDisplacement) ;
//! Returns field Displacement
inline Handle(StepBasic_LengthMeasureWithUnit) Displacement () const

84
src/StepRepr/StepRepr_MakeFromUsageOption.cxx
View File

@ -35,28 +35,28 @@ StepRepr_MakeFromUsageOption::StepRepr_MakeFromUsageOption ()
//purpose :
//=======================================================================
void StepRepr_MakeFromUsageOption::Init (const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Name,
void StepRepr_MakeFromUsageOption::Init (const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Name,
const Standard_Boolean hasProductDefinitionRelationship_Description,
const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Description,
const Handle(StepBasic_ProductDefinition) &aProductDefinitionRelationship_RelatingProductDefinition,
const Handle(StepBasic_ProductDefinition) &aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer aRanking,
const Handle(TCollection_HAsciiString) &aRankingRationale,
const Handle(StepBasic_MeasureWithUnit) &aQuantity)
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Description,
const Handle(StepBasic_ProductDefinition)& theProductDefinitionRelationship_RelatingProductDefinition,
const Handle(StepBasic_ProductDefinition)& theProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer theRanking,
const Handle(TCollection_HAsciiString)& theRankingRationale,
const Handle(Standard_Transient)& theQuantity)
{
StepRepr_ProductDefinitionUsage::Init(aProductDefinitionRelationship_Id,
aProductDefinitionRelationship_Name,
StepRepr_ProductDefinitionUsage::Init(theProductDefinitionRelationship_Id,
theProductDefinitionRelationship_Name,
hasProductDefinitionRelationship_Description,
aProductDefinitionRelationship_Description,
aProductDefinitionRelationship_RelatingProductDefinition,
aProductDefinitionRelationship_RelatedProductDefinition);
theProductDefinitionRelationship_Description,
theProductDefinitionRelationship_RelatingProductDefinition,
theProductDefinitionRelationship_RelatedProductDefinition);
theRanking = aRanking;
myRanking = theRanking;
theRankingRationale = aRankingRationale;
myRankingRationale = theRankingRationale;
theQuantity = aQuantity;
myQuantity = theQuantity;
}
//=======================================================================
@ -64,28 +64,28 @@ void StepRepr_MakeFromUsageOption::Init (const Handle(TCollection_HAsciiString)
//purpose :
//=======================================================================
void StepRepr_MakeFromUsageOption::Init (const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Name,
void StepRepr_MakeFromUsageOption::Init (const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Name,
const Standard_Boolean hasProductDefinitionRelationship_Description,
const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Description,
const StepBasic_ProductDefinitionOrReference &aProductDefinitionRelationship_RelatingProductDefinition,
const StepBasic_ProductDefinitionOrReference &aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer aRanking,
const Handle(TCollection_HAsciiString) &aRankingRationale,
const Handle(StepBasic_MeasureWithUnit) &aQuantity)
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Description,
const StepBasic_ProductDefinitionOrReference& theProductDefinitionRelationship_RelatingProductDefinition,
const StepBasic_ProductDefinitionOrReference& theProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer theRanking,
const Handle(TCollection_HAsciiString)& theRankingRationale,
const Handle(Standard_Transient)& theQuantity)
{
StepRepr_ProductDefinitionUsage::Init(aProductDefinitionRelationship_Id,
aProductDefinitionRelationship_Name,
StepRepr_ProductDefinitionUsage::Init(theProductDefinitionRelationship_Id,
theProductDefinitionRelationship_Name,
hasProductDefinitionRelationship_Description,
aProductDefinitionRelationship_Description,
aProductDefinitionRelationship_RelatingProductDefinition,
aProductDefinitionRelationship_RelatedProductDefinition);
theProductDefinitionRelationship_Description,
theProductDefinitionRelationship_RelatingProductDefinition,
theProductDefinitionRelationship_RelatedProductDefinition);
theRanking = aRanking;
myRanking = theRanking;
theRankingRationale = aRankingRationale;
myRankingRationale = theRankingRationale;
theQuantity = aQuantity;
myQuantity = theQuantity;
}
//=======================================================================
@ -95,7 +95,7 @@ void StepRepr_MakeFromUsageOption::Init (const Handle(TCollection_HAsciiString)
Standard_Integer StepRepr_MakeFromUsageOption::Ranking () const
{
return theRanking;
return myRanking;
}
//=======================================================================
@ -103,9 +103,9 @@ Standard_Integer StepRepr_MakeFromUsageOption::Ranking () const
//purpose :
//=======================================================================
void StepRepr_MakeFromUsageOption::SetRanking (const Standard_Integer aRanking)
void StepRepr_MakeFromUsageOption::SetRanking (const Standard_Integer theRanking)
{
theRanking = aRanking;
myRanking = theRanking;
}
//=======================================================================
@ -115,7 +115,7 @@ void StepRepr_MakeFromUsageOption::SetRanking (const Standard_Integer aRanking)
Handle(TCollection_HAsciiString) StepRepr_MakeFromUsageOption::RankingRationale () const
{
return theRankingRationale;
return myRankingRationale;
}
//=======================================================================
@ -123,9 +123,9 @@ Handle(TCollection_HAsciiString) StepRepr_MakeFromUsageOption::RankingRationale
//purpose :
//=======================================================================
void StepRepr_MakeFromUsageOption::SetRankingRationale (const Handle(TCollection_HAsciiString) &aRankingRationale)
void StepRepr_MakeFromUsageOption::SetRankingRationale (const Handle(TCollection_HAsciiString)& theRankingRationale)
{
theRankingRationale = aRankingRationale;
myRankingRationale = theRankingRationale;
}
//=======================================================================
@ -133,9 +133,9 @@ void StepRepr_MakeFromUsageOption::SetRankingRationale (const Handle(TCollection
//purpose :
//=======================================================================
Handle(StepBasic_MeasureWithUnit) StepRepr_MakeFromUsageOption::Quantity () const
Handle(Standard_Transient) StepRepr_MakeFromUsageOption::Quantity () const
{
return theQuantity;
return myQuantity;
}
//=======================================================================
@ -143,7 +143,7 @@ Handle(StepBasic_MeasureWithUnit) StepRepr_MakeFromUsageOption::Quantity () cons
//purpose :
//=======================================================================
void StepRepr_MakeFromUsageOption::SetQuantity (const Handle(StepBasic_MeasureWithUnit) &aQuantity)
void StepRepr_MakeFromUsageOption::SetQuantity (const Handle(Standard_Transient)& theQuantity)
{
theQuantity = aQuantity;
myQuantity = theQuantity;
}

35
src/StepRepr/StepRepr_MakeFromUsageOption.hxx
View File

@ -22,7 +22,6 @@
#include <Standard_Integer.hxx>
#include <StepRepr_ProductDefinitionUsage.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_ProductDefinition;
@ -40,28 +39,44 @@ public:
Standard_EXPORT StepRepr_MakeFromUsageOption();
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Id, const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Name, const Standard_Boolean hasProductDefinitionRelationship_Description, const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Description, const Handle(StepBasic_ProductDefinition)& aProductDefinitionRelationship_RelatingProductDefinition, const Handle(StepBasic_ProductDefinition)& aProductDefinitionRelationship_RelatedProductDefinition, const Standard_Integer aRanking, const Handle(TCollection_HAsciiString)& aRankingRationale, const Handle(StepBasic_MeasureWithUnit)& aQuantity);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Name,
const Standard_Boolean hasProductDefinitionRelationship_Description,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Description,
const Handle(StepBasic_ProductDefinition)& theProductDefinitionRelationship_RelatingProductDefinition,
const Handle(StepBasic_ProductDefinition)& theProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer theRanking,
const Handle(TCollection_HAsciiString)& theRankingRationale,
const Handle(Standard_Transient)& theQuantity);
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Id, const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Name, const Standard_Boolean hasProductDefinitionRelationship_Description, const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Description, const StepBasic_ProductDefinitionOrReference& aProductDefinitionRelationship_RelatingProductDefinition, const StepBasic_ProductDefinitionOrReference& aProductDefinitionRelationship_RelatedProductDefinition, const Standard_Integer aRanking, const Handle(TCollection_HAsciiString)& aRankingRationale, const Handle(StepBasic_MeasureWithUnit)& aQuantity);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Name,
const Standard_Boolean hasProductDefinitionRelationship_Description,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Description,
const StepBasic_ProductDefinitionOrReference& theProductDefinitionRelationship_RelatingProductDefinition,
const StepBasic_ProductDefinitionOrReference& theProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer theRanking,
const Handle(TCollection_HAsciiString)& theRankingRationale,
const Handle(Standard_Transient)& theQuantity);
//! Returns field Ranking
Standard_EXPORT Standard_Integer Ranking() const;
//! Set field Ranking
Standard_EXPORT void SetRanking (const Standard_Integer Ranking);
Standard_EXPORT void SetRanking (const Standard_Integer theRanking);
//! Returns field RankingRationale
Standard_EXPORT Handle(TCollection_HAsciiString) RankingRationale() const;
//! Set field RankingRationale
Standard_EXPORT void SetRankingRationale (const Handle(TCollection_HAsciiString)& RankingRationale);
Standard_EXPORT void SetRankingRationale (const Handle(TCollection_HAsciiString)& theRankingRationale);
//! Returns field Quantity
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Quantity() const;
Standard_EXPORT Handle(Standard_Transient) Quantity() const;
//! Set field Quantity
Standard_EXPORT void SetQuantity (const Handle(StepBasic_MeasureWithUnit)& Quantity);
Standard_EXPORT void SetQuantity (const Handle(Standard_Transient)& theQuantity);
@ -76,9 +91,9 @@ protected:
private:
Standard_Integer theRanking;
Handle(TCollection_HAsciiString) theRankingRationale;
Handle(StepBasic_MeasureWithUnit) theQuantity;
Standard_Integer myRanking;
Handle(TCollection_HAsciiString) myRankingRationale;
Handle(Standard_Transient) myQuantity;
};

13
src/StepRepr/StepRepr_ParallelOffset.cxx
View File

@ -24,17 +24,16 @@ StepRepr_ParallelOffset::StepRepr_ParallelOffset () { }
//purpose :
//=======================================================================
void StepRepr_ParallelOffset::Init(
const Handle(TCollection_HAsciiString)& theShapeAspect_Name,
const Handle(TCollection_HAsciiString)& theShapeAspect_Description,
const Handle(StepRepr_ProductDefinitionShape)& theShapeAspect_OfShape,
const StepData_Logical theShapeAspect_ProductDefinitional,
const Handle(StepBasic_MeasureWithUnit) &theOffset)
void StepRepr_ParallelOffset::Init(const Handle(TCollection_HAsciiString)& theShapeAspect_Name,
const Handle(TCollection_HAsciiString)& theShapeAspect_Description,
const Handle(StepRepr_ProductDefinitionShape)& theShapeAspect_OfShape,
const StepData_Logical theShapeAspect_ProductDefinitional,
const Handle(Standard_Transient)& theOffset)
{
StepRepr_ShapeAspect::Init(theShapeAspect_Name,
theShapeAspect_Description,
theShapeAspect_OfShape,
theShapeAspect_ProductDefinitional);
offset = theOffset;
myOffset = theOffset;
}

18
src/StepRepr/StepRepr_ParallelOffset.hxx
View File

@ -21,7 +21,7 @@
#include <StepRepr_DerivedShapeAspect.hxx>
#include <StepData_Logical.hxx>
class StepBasic_MeasureWithUnit;
class TCollection_HAsciiString;
class StepRepr_ProductDefinitionShape;
@ -36,23 +36,27 @@ public:
Standard_EXPORT StepRepr_ParallelOffset();
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, const Handle(StepRepr_ProductDefinitionShape)& theOfShape, const StepData_Logical theProductDefinitional, const Handle(StepBasic_MeasureWithUnit)& theOffset) ;
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepRepr_ProductDefinitionShape)& theOfShape,
const StepData_Logical theProductDefinitional,
const Handle(Standard_Transient)& theOffset) ;
//! Returns field Offset
inline Handle(StepBasic_MeasureWithUnit) Offset () const
inline Handle(Standard_Transient) Offset () const
{
return offset;
return myOffset;
}
//! Set field Offset
inline void SetOffset (const Handle(StepBasic_MeasureWithUnit)& theOffset)
inline void SetOffset (const Handle(Standard_Transient)& theOffset)
{
offset = theOffset;
myOffset = theOffset;
}
DEFINE_STANDARD_RTTIEXT(StepRepr_ParallelOffset,StepRepr_DerivedShapeAspect)
private:
Handle(StepBasic_MeasureWithUnit) offset;
Handle(Standard_Transient) myOffset;
};
#endif // _StepRepr_ParallelOffset_HeaderFile

65
src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx
View File

@ -15,7 +15,6 @@
// Generator: ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepBasic_ProductDefinition.hxx>
#include <StepRepr_QuantifiedAssemblyComponentUsage.hxx>
#include <TCollection_HAsciiString.hxx>
@ -35,26 +34,26 @@ StepRepr_QuantifiedAssemblyComponentUsage::StepRepr_QuantifiedAssemblyComponentU
//purpose :
//=======================================================================
void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Name,
void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Name,
const Standard_Boolean hasProductDefinitionRelationship_Description,
const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Description,
const Handle(StepBasic_ProductDefinition) &aProductDefinitionRelationship_RelatingProductDefinition,
const Handle(StepBasic_ProductDefinition) &aProductDefinitionRelationship_RelatedProductDefinition,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Description,
const Handle(StepBasic_ProductDefinition)& theProductDefinitionRelationship_RelatingProductDefinition,
const Handle(StepBasic_ProductDefinition)& theProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator,
const Handle(TCollection_HAsciiString) &aAssemblyComponentUsage_ReferenceDesignator,
const Handle(StepBasic_MeasureWithUnit) &aQuantity)
const Handle(TCollection_HAsciiString)& theAssemblyComponentUsage_ReferenceDesignator,
const Handle(Standard_Transient)& theQuantity)
{
StepRepr_AssemblyComponentUsage::Init(aProductDefinitionRelationship_Id,
aProductDefinitionRelationship_Name,
StepRepr_AssemblyComponentUsage::Init(theProductDefinitionRelationship_Id,
theProductDefinitionRelationship_Name,
hasProductDefinitionRelationship_Description,
aProductDefinitionRelationship_Description,
aProductDefinitionRelationship_RelatingProductDefinition,
aProductDefinitionRelationship_RelatedProductDefinition,
theProductDefinitionRelationship_Description,
theProductDefinitionRelationship_RelatingProductDefinition,
theProductDefinitionRelationship_RelatedProductDefinition,
hasAssemblyComponentUsage_ReferenceDesignator,
aAssemblyComponentUsage_ReferenceDesignator);
theAssemblyComponentUsage_ReferenceDesignator);
theQuantity = aQuantity;
myQuantity = theQuantity;
}
//=======================================================================
@ -62,26 +61,26 @@ void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_H
//purpose :
//=======================================================================
void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Name,
void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Name,
const Standard_Boolean hasProductDefinitionRelationship_Description,
const Handle(TCollection_HAsciiString) &aProductDefinitionRelationship_Description,
const StepBasic_ProductDefinitionOrReference &aProductDefinitionRelationship_RelatingProductDefinition,
const StepBasic_ProductDefinitionOrReference &aProductDefinitionRelationship_RelatedProductDefinition,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Description,
const StepBasic_ProductDefinitionOrReference& theProductDefinitionRelationship_RelatingProductDefinition,
const StepBasic_ProductDefinitionOrReference& theProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator,
const Handle(TCollection_HAsciiString) &aAssemblyComponentUsage_ReferenceDesignator,
const Handle(StepBasic_MeasureWithUnit) &aQuantity)
const Handle(TCollection_HAsciiString)& theAssemblyComponentUsage_ReferenceDesignator,
const Handle(Standard_Transient)& theQuantity)
{
StepRepr_AssemblyComponentUsage::Init(aProductDefinitionRelationship_Id,
aProductDefinitionRelationship_Name,
StepRepr_AssemblyComponentUsage::Init(theProductDefinitionRelationship_Id,
theProductDefinitionRelationship_Name,
hasProductDefinitionRelationship_Description,
aProductDefinitionRelationship_Description,
aProductDefinitionRelationship_RelatingProductDefinition,
aProductDefinitionRelationship_RelatedProductDefinition,
theProductDefinitionRelationship_Description,
theProductDefinitionRelationship_RelatingProductDefinition,
theProductDefinitionRelationship_RelatedProductDefinition,
hasAssemblyComponentUsage_ReferenceDesignator,
aAssemblyComponentUsage_ReferenceDesignator);
theAssemblyComponentUsage_ReferenceDesignator);
theQuantity = aQuantity;
myQuantity = theQuantity;
}
//=======================================================================
@ -89,9 +88,9 @@ void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_H
//purpose :
//=======================================================================
Handle(StepBasic_MeasureWithUnit) StepRepr_QuantifiedAssemblyComponentUsage::Quantity () const
Handle(Standard_Transient) StepRepr_QuantifiedAssemblyComponentUsage::Quantity () const
{
return theQuantity;
return myQuantity;
}
//=======================================================================
@ -99,7 +98,7 @@ Handle(StepBasic_MeasureWithUnit) StepRepr_QuantifiedAssemblyComponentUsage::Qua
//purpose :
//=======================================================================
void StepRepr_QuantifiedAssemblyComponentUsage::SetQuantity (const Handle(StepBasic_MeasureWithUnit) &aQuantity)
void StepRepr_QuantifiedAssemblyComponentUsage::SetQuantity (const Handle(Standard_Transient)& theQuantity)
{
theQuantity = aQuantity;
myQuantity = theQuantity;
}

28
src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx
View File

@ -20,7 +20,7 @@
#include <Standard_Type.hxx>
#include <StepRepr_AssemblyComponentUsage.hxx>
class StepBasic_MeasureWithUnit;
class TCollection_HAsciiString;
class StepBasic_ProductDefinition;
@ -39,16 +39,32 @@ public:
Standard_EXPORT StepRepr_QuantifiedAssemblyComponentUsage();
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Id, const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Name, const Standard_Boolean hasProductDefinitionRelationship_Description, const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Description, const Handle(StepBasic_ProductDefinition)& aProductDefinitionRelationship_RelatingProductDefinition, const Handle(StepBasic_ProductDefinition)& aProductDefinitionRelationship_RelatedProductDefinition, const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator, const Handle(TCollection_HAsciiString)& aAssemblyComponentUsage_ReferenceDesignator, const Handle(StepBasic_MeasureWithUnit)& aQuantity);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Name,
const Standard_Boolean hasProductDefinitionRelationship_Description,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Description,
const Handle(StepBasic_ProductDefinition)& theProductDefinitionRelationship_RelatingProductDefinition,
const Handle(StepBasic_ProductDefinition)& theProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator,
const Handle(TCollection_HAsciiString)& theAssemblyComponentUsage_ReferenceDesignator,
const Handle(Standard_Transient)& theQuantity);
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Id, const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Name, const Standard_Boolean hasProductDefinitionRelationship_Description, const Handle(TCollection_HAsciiString)& aProductDefinitionRelationship_Description, const StepBasic_ProductDefinitionOrReference& aProductDefinitionRelationship_RelatingProductDefinition, const StepBasic_ProductDefinitionOrReference& aProductDefinitionRelationship_RelatedProductDefinition, const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator, const Handle(TCollection_HAsciiString)& aAssemblyComponentUsage_ReferenceDesignator, const Handle(StepBasic_MeasureWithUnit)& aQuantity);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Id,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Name,
const Standard_Boolean hasProductDefinitionRelationship_Description,
const Handle(TCollection_HAsciiString)& theProductDefinitionRelationship_Description,
const StepBasic_ProductDefinitionOrReference& theProductDefinitionRelationship_RelatingProductDefinition,
const StepBasic_ProductDefinitionOrReference& theProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator,
const Handle(TCollection_HAsciiString)& theAssemblyComponentUsage_ReferenceDesignator,
const Handle(Standard_Transient)& theQuantity);
//! Returns field Quantity
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Quantity() const;
Standard_EXPORT Handle(Standard_Transient) Quantity() const;
//! Set field Quantity
Standard_EXPORT void SetQuantity (const Handle(StepBasic_MeasureWithUnit)& Quantity);
Standard_EXPORT void SetQuantity (const Handle(Standard_Transient)& theQuantity);
@ -63,7 +79,7 @@ protected:
private:
Handle(StepBasic_MeasureWithUnit) theQuantity;
Handle(Standard_Transient) myQuantity;
};

81
src/StepShape/StepShape_MeasureQualification.cxx
View File

@ -21,53 +21,68 @@ IMPLEMENT_STANDARD_RTTIEXT(StepShape_MeasureQualification,Standard_Transient)
StepShape_MeasureQualification::StepShape_MeasureQualification () { }
void StepShape_MeasureQualification::Init
(const Handle(TCollection_HAsciiString)& name,
const Handle(TCollection_HAsciiString)& description,
const Handle(StepBasic_MeasureWithUnit)& qualified_measure,
const Handle(StepShape_HArray1OfValueQualifier)& qualifiers)
void StepShape_MeasureQualification::Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theQualifiedMeasure,
const Handle(StepShape_HArray1OfValueQualifier)& theQualifiers)
{
theName = name;
theDescription = description;
theQualifiedMeasure = qualified_measure;
theQualifiers = qualifiers;
myName = theName;
myDescription = theDescription;
myQualifiedMeasure = theQualifiedMeasure;
myQualifiers = theQualifiers;
}
Handle(TCollection_HAsciiString) StepShape_MeasureQualification::Name () const
{ return theName; }
{
return myName;
}
void StepShape_MeasureQualification::SetName
(const Handle(TCollection_HAsciiString)& name)
{ theName = name; }
void StepShape_MeasureQualification::SetName(const Handle(TCollection_HAsciiString)& theName)
{
myName = theName;
}
Handle(TCollection_HAsciiString) StepShape_MeasureQualification::Description () const
{ return theDescription; }
{
return myDescription;
}
void StepShape_MeasureQualification::SetDescription
(const Handle(TCollection_HAsciiString)& description)
{ theDescription = description; }
void StepShape_MeasureQualification::SetDescription(const Handle(TCollection_HAsciiString)& theDescription)
{
myDescription = theDescription;
}
Handle(StepBasic_MeasureWithUnit) StepShape_MeasureQualification::QualifiedMeasure () const
{ return theQualifiedMeasure; }
Handle(Standard_Transient) StepShape_MeasureQualification::QualifiedMeasure () const
{
return myQualifiedMeasure;
}
void StepShape_MeasureQualification::SetQualifiedMeasure
(const Handle(StepBasic_MeasureWithUnit)& qualified_measure)
{ theQualifiedMeasure = qualified_measure; }
void StepShape_MeasureQualification::SetQualifiedMeasure(const Handle(Standard_Transient)& theQualifiedMeasure)
{
myQualifiedMeasure = theQualifiedMeasure;
}
Handle(StepShape_HArray1OfValueQualifier) StepShape_MeasureQualification::Qualifiers () const
{ return theQualifiers; }
{
return myQualifiers;
}
Standard_Integer StepShape_MeasureQualification::NbQualifiers () const
{ return theQualifiers->Length(); }
{
return myQualifiers->Length();
}
void StepShape_MeasureQualification::SetQualifiers
(const Handle(StepShape_HArray1OfValueQualifier)& qualifiers)
{ theQualifiers = qualifiers; }
void StepShape_MeasureQualification::SetQualifiers(const Handle(StepShape_HArray1OfValueQualifier)& theQualifiers)
{
myQualifiers = theQualifiers;
}
StepShape_ValueQualifier StepShape_MeasureQualification::QualifiersValue
(const Standard_Integer num) const
{ return theQualifiers->Value(num); }
StepShape_ValueQualifier StepShape_MeasureQualification::QualifiersValue(const Standard_Integer theNum) const
{
return myQualifiers->Value(theNum);
}
void StepShape_MeasureQualification::SetQualifiersValue
(const Standard_Integer num, const StepShape_ValueQualifier& aqualifier)
{ theQualifiers->SetValue (num,aqualifier); }
void StepShape_MeasureQualification::SetQualifiersValue(const Standard_Integer theNum, const StepShape_ValueQualifier& theQualifier)
{
myQualifiers->SetValue(theNum, theQualifier);
}

28
src/StepShape/StepShape_MeasureQualification.hxx
View File

@ -23,7 +23,6 @@
#include <Standard_Transient.hxx>
#include <Standard_Integer.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepShape_ValueQualifier;
@ -39,29 +38,32 @@ public:
Standard_EXPORT StepShape_MeasureQualification();
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& name, const Handle(TCollection_HAsciiString)& description, const Handle(StepBasic_MeasureWithUnit)& qualified_measure, const Handle(StepShape_HArray1OfValueQualifier)& qualifiers);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theQualifiedMeasure,
const Handle(StepShape_HArray1OfValueQualifier)& theQualifiers);
Standard_EXPORT Handle(TCollection_HAsciiString) Name() const;
Standard_EXPORT void SetName (const Handle(TCollection_HAsciiString)& name);
Standard_EXPORT void SetName (const Handle(TCollection_HAsciiString)& theName);
Standard_EXPORT Handle(TCollection_HAsciiString) Description() const;
Standard_EXPORT void SetDescription (const Handle(TCollection_HAsciiString)& description);
Standard_EXPORT void SetDescription (const Handle(TCollection_HAsciiString)& theDescription);
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) QualifiedMeasure() const;
Standard_EXPORT Handle(Standard_Transient) QualifiedMeasure() const;
Standard_EXPORT void SetQualifiedMeasure (const Handle(StepBasic_MeasureWithUnit)& qualified_measure);
Standard_EXPORT void SetQualifiedMeasure (const Handle(Standard_Transient)& theQualifiedMeasure);
Standard_EXPORT Handle(StepShape_HArray1OfValueQualifier) Qualifiers() const;
Standard_EXPORT Standard_Integer NbQualifiers() const;
Standard_EXPORT void SetQualifiers (const Handle(StepShape_HArray1OfValueQualifier)& qualifiers);
Standard_EXPORT void SetQualifiers (const Handle(StepShape_HArray1OfValueQualifier)& theQualifiers);
Standard_EXPORT StepShape_ValueQualifier QualifiersValue (const Standard_Integer num) const;
Standard_EXPORT StepShape_ValueQualifier QualifiersValue (const Standard_Integer theNum) const;
Standard_EXPORT void SetQualifiersValue (const Standard_Integer num, const StepShape_ValueQualifier& aqualifier);
Standard_EXPORT void SetQualifiersValue (const Standard_Integer theNum, const StepShape_ValueQualifier& theQualifier);
@ -76,10 +78,10 @@ protected:
private:
Handle(TCollection_HAsciiString) theName;
Handle(TCollection_HAsciiString) theDescription;
Handle(StepBasic_MeasureWithUnit) theQualifiedMeasure;
Handle(StepShape_HArray1OfValueQualifier) theQualifiers;
Handle(TCollection_HAsciiString) myName;
Handle(TCollection_HAsciiString) myDescription;
Handle(Standard_Transient) myQualifiedMeasure;
Handle(StepShape_HArray1OfValueQualifier) myQualifiers;
};

1
src/StepShape/StepShape_ToleranceValue.cxx
View File

@ -12,7 +12,6 @@
// commercial license or contractual agreement.
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepShape_ToleranceValue.hxx>
IMPLEMENT_STANDARD_RTTIEXT(StepShape_ToleranceValue,Standard_Transient)

Some files were not shown because too many files have changed in this diff Show More