From: dpasukhi Date: Fri, 12 Aug 2022 12:02:44 +0000 (+0300) Subject: 0033099: Data Exchange, Step Import - Wrong PMI values in GDT X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FCR33099_1;p=occt.git 0033099: Data Exchange, Step Import - Wrong PMI values in GDT Create StepRepr_MeasureWithUnit class for select type of measure. --- diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx index 55ab2941af..e8d492a729 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx @@ -16,74 +16,73 @@ #include #include #include -#include #include #include +#include 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 + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 3, "conversion_factor", ach, 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().Value()); } 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().Value()); } diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx index 0d93b06ff1..effc815185 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx @@ -19,18 +19,18 @@ #include #include #include -#include #include #include +#include RWStepBasic_RWConversionBasedUnitAndAreaUnit::RWStepBasic_RWConversionBasedUnitAndAreaUnit () { } 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 +43,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); + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 2, "conversion_factor", ach, 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, @@ -60,7 +60,7 @@ void RWStepBasic_RWConversionBasedUnitAndAreaUnit::WriteStep(StepData_StepWriter SW.StartEntity("AREA_UNIT"); SW.StartEntity("CONVERSION_BASED_UNIT"); SW.Send(ent->Name()); - SW.Send(ent->ConversionFactor()); + SW.Send(ent->ConversionFactor().Value()); SW.StartEntity("NAMED_UNIT"); SW.Send(ent->Dimensions()); } @@ -69,7 +69,7 @@ void RWStepBasic_RWConversionBasedUnitAndAreaUnit::Share(const Handle(StepBasic_ Interface_EntityIterator& iter) const { iter.GetOneItem(ent->Dimensions()); - iter.GetOneItem(ent->ConversionFactor()); + iter.GetOneItem(ent->ConversionFactor().Value()); } diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx index fea585aa19..244cf5457a 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx @@ -17,96 +17,96 @@ #include #include #include -#include #include #include +#include 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 + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 2, "conversion_factor", ach, 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().Value()); - // --- 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().Value()); } diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx index 592dec847c..716b8571fd 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx @@ -17,9 +17,9 @@ #include #include #include -#include #include #include +#include //======================================================================= //function : RWStepBasic_RWConversionBasedUnitAndMassUnit @@ -36,10 +36,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 +51,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); + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 2, "conversion_factor", ach, aConversionFactor); num = data->NextForComplex(num); @@ -70,7 +70,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); } @@ -88,7 +88,7 @@ void RWStepBasic_RWConversionBasedUnitAndMassUnit::WriteStep // --- field : name --- SW.Send(ent->Name()); // --- field : conversionFactor --- - SW.Send(ent->ConversionFactor()); + SW.Send(ent->ConversionFactor().Value()); // --- Instance of plex component MassUnit --- SW.StartEntity("Mass_UNIT"); // --- Instance of common supertype NamedUnit --- @@ -108,6 +108,6 @@ void RWStepBasic_RWConversionBasedUnitAndMassUnit::Share Interface_EntityIterator& iter) const { iter.GetOneItem(ent->Dimensions()); - iter.GetOneItem(ent->ConversionFactor()); + iter.GetOneItem(ent->ConversionFactor().Value()); } diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx index 49b58b6d3b..273871d643 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx @@ -17,79 +17,80 @@ #include #include #include -#include #include #include #include +#include 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); - - // 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); + 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); + + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 2, "conversion_factor", ach, 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().Value()); - // --- 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().Value()); } diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx index 21e5db1665..e801837bb3 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx @@ -16,97 +16,97 @@ #include #include #include -#include #include #include #include +#include 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 + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 2, "conversion_factor", ach, 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().Value()); - // --- 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().Value()); } diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx index 6abbb7ecd1..1d1957cf9f 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx @@ -16,97 +16,97 @@ #include #include #include -#include #include #include #include +#include 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 + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 2, "conversion_factor", ach, 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().Value()); - // --- 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().Value()); } diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx index c29afbdec5..3bcc082fd1 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx @@ -16,97 +16,96 @@ #include #include #include -#include #include #include #include +#include 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 + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 2, "conversion_factor", ach, 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().Value()); - // --- 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().Value()); } diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx index e28db30e1b..32b2acafd2 100644 --- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx +++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx @@ -19,18 +19,18 @@ #include #include #include -#include #include #include +#include RWStepBasic_RWConversionBasedUnitAndVolumeUnit::RWStepBasic_RWConversionBasedUnitAndVolumeUnit () { } 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 +39,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); + StepRepr_MeasureWithUnit aConversionFactor; + data->ReadEntity(num, 2, "conversion_factor", ach, aConversionFactor); num = data->NextForComplex(num); if (!data->CheckNbParams(num,1,ach,"named_unit")) return; @@ -50,23 +50,23 @@ 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()); - SW.Send(ent->ConversionFactor()); + SW.Send(ent->ConversionFactor().Value()); SW.StartEntity("NAMED_UNIT"); SW.Send(ent->Dimensions()); SW.StartEntity("VOLUME_UNIT"); } 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()); + iter.GetOneItem(ent->ConversionFactor().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx index ba27327952..11c6945ff9 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx @@ -18,12 +18,12 @@ #include #include #include -#include #include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWAngularityTolerance @@ -54,8 +54,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -78,7 +78,7 @@ void RWStepDimTol_RWAngularityTolerance::ReadStep (const Handle(StepData_StepRea // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aGeometricToleranceWithDatumReference_DatumSystem); } @@ -98,7 +98,7 @@ void RWStepDimTol_RWAngularityTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -123,7 +123,7 @@ void RWStepDimTol_RWAngularityTolerance::Share (const Handle(StepDimTol_Angulari // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx index 3fec1c958e..a3d7218d9a 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx @@ -18,12 +18,12 @@ #include #include #include -#include #include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWCircularRunoutTolerance @@ -54,8 +54,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -78,7 +78,7 @@ void RWStepDimTol_RWCircularRunoutTolerance::ReadStep (const Handle(StepData_Ste // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aGeometricToleranceWithDatumReference_DatumSystem); } @@ -98,7 +98,7 @@ void RWStepDimTol_RWCircularRunoutTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -123,7 +123,7 @@ void RWStepDimTol_RWCircularRunoutTolerance::Share (const Handle(StepDimTol_Circ // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx index 454f74096a..38c168e06e 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx @@ -18,12 +18,12 @@ #include #include #include -#include #include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWCoaxialityTolerance @@ -54,8 +54,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -78,7 +78,7 @@ void RWStepDimTol_RWCoaxialityTolerance::ReadStep (const Handle(StepData_StepRea // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aGeometricToleranceWithDatumReference_DatumSystem); } @@ -98,7 +98,7 @@ void RWStepDimTol_RWCoaxialityTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -123,7 +123,7 @@ void RWStepDimTol_RWCoaxialityTolerance::Share (const Handle(StepDimTol_Coaxiali // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx index ece94b06bb..15665af9b8 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx @@ -18,12 +18,12 @@ #include #include #include -#include #include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWConcentricityTolerance @@ -54,8 +54,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -78,7 +78,7 @@ void RWStepDimTol_RWConcentricityTolerance::ReadStep (const Handle(StepData_Step // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aGeometricToleranceWithDatumReference_DatumSystem); } @@ -98,7 +98,7 @@ void RWStepDimTol_RWConcentricityTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -123,7 +123,7 @@ void RWStepDimTol_RWConcentricityTolerance::Share (const Handle(StepDimTol_Conce // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx index 253acdf8a2..06faa6a606 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx @@ -17,11 +17,11 @@ #include #include -#include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWCylindricityTolerance @@ -52,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -61,7 +61,7 @@ void RWStepDimTol_RWCylindricityTolerance::ReadStep (const Handle(StepData_StepR // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect); } @@ -80,7 +80,7 @@ void RWStepDimTol_RWCylindricityTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } @@ -96,7 +96,7 @@ void RWStepDimTol_RWCylindricityTolerance::Share (const Handle(StepDimTol_Cylind // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx index dcd9f0eb36..152ee732b1 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx @@ -17,11 +17,11 @@ #include #include -#include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWFlatnessTolerance @@ -52,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -61,7 +61,7 @@ void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReade // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect); } @@ -80,7 +80,7 @@ void RWStepDimTol_RWFlatnessTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } @@ -96,7 +96,7 @@ void RWStepDimTol_RWFlatnessTolerance::Share (const Handle(StepDimTol_FlatnessTo // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx index 5dacbeedba..c31fdcbab5 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx @@ -17,12 +17,12 @@ #include #include #include -#include #include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRef @@ -51,8 +51,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); + + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); + StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -129,7 +131,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRef::WriteStep SW.StartEntity("GEOMETRIC_TOLERANCE"); SW.Send(ent->Name()); SW.Send(ent->Description()); - SW.Send(ent->Magnitude()); + SW.Send(ent->Magnitude().Value()); SW.Send(ent->TolerancedShapeAspect().Value()); SW.StartEntity("GEOMETRIC_TOLERANCE_WITH_DATUM_REFERENCE"); SW.OpenSub(); @@ -171,7 +173,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRef::Share Interface_EntityIterator& iter) const { // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); // Own fields of GeometricToleranceWithDatumReference for (Standard_Integer i3=1; i3<=ent->GetGeometricToleranceWithDatumReference()->DatumSystemAP242()->Length(); i3++ ) { diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx index 059a5e9b39..2233bd0417 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx @@ -18,13 +18,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol @@ -53,8 +53,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); + + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); + StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -172,7 +174,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::WriteStep SW.StartEntity("GEOMETRIC_TOLERANCE"); SW.Send(ent->Name()); SW.Send(ent->Description()); - SW.Send(ent->Magnitude()); + SW.Send(ent->Magnitude().Value()); SW.Send(ent->TolerancedShapeAspect().Value()); SW.StartEntity("GEOMETRIC_TOLERANCE_WITH_MAXIMUM_TOLERANCE"); SW.Send(ent->GetMaxTolerance()); @@ -240,7 +242,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Share Interface_EntityIterator& iter) const { // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); // Own fields of GeometricToleranceWithDatumReference for (Standard_Integer i3=1; i3<=ent->GetGeometricToleranceWithDatumReference()->DatumSystemAP242()->Length(); i3++ ) { diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx index 9060524b3a..a6b68fd344 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx @@ -17,13 +17,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod @@ -52,8 +52,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); + + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); + StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -167,7 +169,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod::WriteStep SW.StartEntity("GEOMETRIC_TOLERANCE"); SW.Send(ent->Name()); SW.Send(ent->Description()); - SW.Send(ent->Magnitude()); + SW.Send(ent->Magnitude().Value()); SW.Send(ent->TolerancedShapeAspect().Value()); SW.StartEntity("GEOMETRIC_TOLERANCE_WITH_DATUM_REFERENCE"); SW.OpenSub(); @@ -233,7 +235,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Share Interface_EntityIterator& iter) const { // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); // Own fields of GeometricToleranceWithDatumReference for (Standard_Integer i3=1; i3<=ent->GetGeometricToleranceWithDatumReference()->DatumSystemAP242()->Length(); i3++ ) { diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx index 930e3f2ee8..b80d114a56 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx @@ -15,13 +15,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol @@ -50,8 +50,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); + + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); + StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -106,7 +108,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::WriteStep SW.StartEntity("GEOMETRIC_TOLERANCE"); SW.Send(ent->Name()); SW.Send(ent->Description()); - SW.Send(ent->Magnitude()); + SW.Send(ent->Magnitude().Value()); SW.Send(ent->TolerancedShapeAspect().Value()); SW.StartEntity("GEOMETRIC_TOLERANCE_WITH_DATUM_REFERENCE"); SW.OpenSub(); @@ -136,7 +138,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Share Interface_EntityIterator& iter) const { // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); // Own fields of GeometricToleranceWithDatumReference for (Standard_Integer i3=1; i3<=ent->GetGeometricToleranceWithDatumReference()->DatumSystemAP242()->Length(); i3++ ) { diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx index da42f6c5a2..a45aca0583 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx @@ -23,6 +23,7 @@ #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol @@ -51,8 +52,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); + + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); + StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -137,7 +140,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::WriteStep SW.StartEntity("GEOMETRIC_TOLERANCE"); SW.Send(ent->Name()); SW.Send(ent->Description()); - SW.Send(ent->Magnitude()); + SW.Send(ent->Magnitude().Value()); SW.Send(ent->TolerancedShapeAspect().Value()); SW.StartEntity("GEOMETRIC_TOLERANCE_WITH_DATUM_REFERENCE"); SW.OpenSub(); @@ -182,7 +185,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::Share Interface_EntityIterator& iter) const { // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); // Own fields of GeometricToleranceWithDatumReference for (Standard_Integer i3=1; i3<=ent->GetGeometricToleranceWithDatumReference()->DatumSystemAP242()->Length(); i3++ ) { diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx index d2dcc8ae9a..b19b034f3c 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx @@ -18,11 +18,11 @@ #include #include #include -#include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol @@ -51,8 +51,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); + + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); + StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -151,7 +153,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol::WriteStep SW.StartEntity("GEOMETRIC_TOLERANCE"); SW.Send(ent->Name()); SW.Send(ent->Description()); - SW.Send(ent->Magnitude()); + SW.Send(ent->Magnitude().Value()); SW.Send(ent->TolerancedShapeAspect().Value()); SW.StartEntity("GEOMETRIC_TOLERANCE_WITH_MAXIMUM_TOLERANCE"); SW.Send(ent->GetMaxTolerance()); @@ -209,6 +211,6 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol::Share Interface_EntityIterator& iter) const { // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx index 48fcd508b7..9b03727552 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx @@ -17,11 +17,11 @@ #include #include #include -#include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeoTolAndGeoTolWthMod @@ -50,8 +50,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); + + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); + StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -146,7 +148,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMod::WriteStep SW.StartEntity("GEOMETRIC_TOLERANCE"); SW.Send(ent->Name()); SW.Send(ent->Description()); - SW.Send(ent->Magnitude()); + SW.Send(ent->Magnitude().Value()); SW.Send(ent->TolerancedShapeAspect().Value()); SW.StartEntity("GEOMETRIC_TOLERANCE_WITH_MODIFIERS"); SW.OpenSub(); @@ -202,6 +204,6 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMod::Share Interface_EntityIterator& iter) const { // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx index 975bbe984d..b992c20b1d 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx @@ -17,11 +17,11 @@ #include #include -#include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeometricTolerance @@ -52,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -80,7 +80,7 @@ void RWStepDimTol_RWGeometricTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->Description()); - SW.Send (ent->Magnitude()); + SW.Send (ent->Magnitude().Value()); SW.Send (ent->TolerancedShapeAspect().Value()); } @@ -96,7 +96,7 @@ void RWStepDimTol_RWGeometricTolerance::Share (const Handle(StepDimTol_Geometric // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx index 433668d86c..fd01d66e3d 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx @@ -18,11 +18,11 @@ #include #include #include -#include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeometricToleranceWithDatumReference @@ -53,8 +53,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -77,7 +77,7 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::ReadStep (const Handle // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aDatumSystem); } @@ -97,7 +97,7 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::WriteStep (StepData_St SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -122,7 +122,7 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::Share (const Handle(St // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx index 0f0172d5a1..32d907c96e 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx @@ -17,10 +17,10 @@ #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit @@ -53,8 +53,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -107,7 +107,7 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit:: SW.Send (ent->Description()); - SW.Send (ent->Magnitude()); + SW.Send (ent->Magnitude().Value()); SW.Send (ent->TolerancedShapeAspect().Value()); @@ -141,7 +141,7 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit:: // inherited fields from GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx index fb1513d4bd..8117b72086 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx @@ -17,10 +17,10 @@ #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeometricToleranceWithDefinedUnit @@ -52,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -87,7 +87,7 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedUnit:: SW.Send (ent->Description()); - SW.Send (ent->Magnitude()); + SW.Send (ent->Magnitude().Value()); SW.Send (ent->TolerancedShapeAspect().Value()); @@ -107,7 +107,7 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedUnit::Share (const Handle(StepD // inherited fields from GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx index 3c2d9b7ee7..02d1892324 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include //======================================================================= //function : RWStepDimTol_RWGeometricTolerance @@ -54,8 +54,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -123,7 +123,7 @@ void RWStepDimTol_RWGeometricToleranceWithMaximumTolerance:: SW.Send (ent->Description()); - SW.Send (ent->Magnitude()); + SW.Send (ent->Magnitude().Value()); SW.Send (ent->TolerancedShapeAspect().Value()); @@ -168,7 +168,7 @@ void RWStepDimTol_RWGeometricToleranceWithMaximumTolerance:: // inherited fields from GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx index 83273b5f82..0947a3c582 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx @@ -17,11 +17,11 @@ #include #include -#include #include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWGeometricTolerance @@ -54,8 +54,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -117,7 +117,7 @@ void RWStepDimTol_RWGeometricToleranceWithModifiers:: SW.Send (ent->Description()); - SW.Send (ent->Magnitude()); + SW.Send (ent->Magnitude().Value()); SW.Send (ent->TolerancedShapeAspect().Value()); @@ -158,7 +158,7 @@ void RWStepDimTol_RWGeometricToleranceWithModifiers:: // inherited fields from GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx index e847c65d7d..d9a68a011e 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx @@ -17,10 +17,10 @@ #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWLineProfileTolerance @@ -51,8 +51,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -60,7 +60,7 @@ void RWStepDimTol_RWLineProfileTolerance::ReadStep (const Handle(StepData_StepRe // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect); } @@ -79,7 +79,7 @@ void RWStepDimTol_RWLineProfileTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } @@ -95,7 +95,7 @@ void RWStepDimTol_RWLineProfileTolerance::Share (const Handle(StepDimTol_LinePro // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx index e5a1a9abc4..ccaec77923 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx @@ -17,9 +17,9 @@ #include #include -#include #include #include +#include #include //======================================================================= @@ -51,8 +51,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -72,7 +72,7 @@ void RWStepDimTol_RWModifiedGeometricTolerance::ReadStep (const Handle(StepData_ // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aModifier); } @@ -92,7 +92,7 @@ void RWStepDimTol_RWModifiedGeometricTolerance::WriteStep (StepData_StepWriter& SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -116,7 +116,7 @@ void RWStepDimTol_RWModifiedGeometricTolerance::Share (const Handle(StepDimTol_M // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx index dd1905082e..0c8d5ca268 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx @@ -18,10 +18,10 @@ #include #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWParallelismTolerance @@ -52,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -76,7 +76,7 @@ void RWStepDimTol_RWParallelismTolerance::ReadStep (const Handle(StepData_StepRe // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aGeometricToleranceWithDatumReference_DatumSystem); } @@ -96,7 +96,7 @@ void RWStepDimTol_RWParallelismTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -121,7 +121,7 @@ void RWStepDimTol_RWParallelismTolerance::Share (const Handle(StepDimTol_Paralle // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx index 4c8e604162..a35a1593a4 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx @@ -18,10 +18,10 @@ #include #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWPerpendicularityTolerance @@ -52,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -76,7 +76,7 @@ void RWStepDimTol_RWPerpendicularityTolerance::ReadStep (const Handle(StepData_S // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aGeometricToleranceWithDatumReference_DatumSystem); } @@ -96,7 +96,7 @@ void RWStepDimTol_RWPerpendicularityTolerance::WriteStep (StepData_StepWriter& S SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -121,7 +121,7 @@ void RWStepDimTol_RWPerpendicularityTolerance::Share (const Handle(StepDimTol_Pe // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx index f5baa2148e..107fa73cfa 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx @@ -17,10 +17,10 @@ #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWPositionTolerance @@ -51,8 +51,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -60,7 +60,7 @@ void RWStepDimTol_RWPositionTolerance::ReadStep (const Handle(StepData_StepReade // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect); } @@ -79,7 +79,7 @@ void RWStepDimTol_RWPositionTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } @@ -95,7 +95,7 @@ void RWStepDimTol_RWPositionTolerance::Share (const Handle(StepDimTol_PositionTo // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx index a50bc4493a..f68d5fc778 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx @@ -17,10 +17,10 @@ #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWRoundnessTolerance @@ -51,8 +51,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -60,7 +60,7 @@ void RWStepDimTol_RWRoundnessTolerance::ReadStep (const Handle(StepData_StepRead // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect); } @@ -79,7 +79,7 @@ void RWStepDimTol_RWRoundnessTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } @@ -95,7 +95,7 @@ void RWStepDimTol_RWRoundnessTolerance::Share (const Handle(StepDimTol_Roundness // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx index a11e7ce94a..3d2911528b 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx @@ -17,10 +17,10 @@ #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWStraightnessTolerance @@ -51,8 +51,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -60,7 +60,7 @@ void RWStepDimTol_RWStraightnessTolerance::ReadStep (const Handle(StepData_StepR // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect); } @@ -79,7 +79,7 @@ void RWStepDimTol_RWStraightnessTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } @@ -95,7 +95,7 @@ void RWStepDimTol_RWStraightnessTolerance::Share (const Handle(StepDimTol_Straig // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx index a378a129ef..736dc71595 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx @@ -17,10 +17,10 @@ #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWSurfaceProfileTolerance @@ -51,8 +51,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -60,7 +60,7 @@ void RWStepDimTol_RWSurfaceProfileTolerance::ReadStep (const Handle(StepData_Ste // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect); } @@ -79,7 +79,7 @@ void RWStepDimTol_RWSurfaceProfileTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } @@ -95,7 +95,7 @@ void RWStepDimTol_RWSurfaceProfileTolerance::Share (const Handle(StepDimTol_Surf // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); } diff --git a/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx index 9c4795b991..d70f71c3e3 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx @@ -18,10 +18,10 @@ #include #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWSymmetryTolerance @@ -52,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -76,7 +76,7 @@ void RWStepDimTol_RWSymmetryTolerance::ReadStep (const Handle(StepData_StepReade // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aGeometricToleranceWithDatumReference_DatumSystem); } @@ -96,7 +96,7 @@ void RWStepDimTol_RWSymmetryTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -121,7 +121,7 @@ void RWStepDimTol_RWSymmetryTolerance::Share (const Handle(StepDimTol_SymmetryTo // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx index b9474c4a63..b710b9e14e 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx @@ -18,10 +18,10 @@ #include #include #include -#include #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWTotalRunoutTolerance @@ -52,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect); @@ -76,7 +76,7 @@ void RWStepDimTol_RWTotalRunoutTolerance::ReadStep (const Handle(StepData_StepRe // Initialize entity ent->Init(aGeometricTolerance_Name, aGeometricTolerance_Description, - aGeometricTolerance_Magnitude, + aMagnitude, aGeometricTolerance_TolerancedShapeAspect, aGeometricToleranceWithDatumReference_DatumSystem); } @@ -96,7 +96,7 @@ void RWStepDimTol_RWTotalRunoutTolerance::WriteStep (StepData_StepWriter& SW, SW.Send (ent->StepDimTol_GeometricTolerance::Description()); - SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude()); + SW.Send (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); SW.Send (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); @@ -121,7 +121,7 @@ void RWStepDimTol_RWTotalRunoutTolerance::Share (const Handle(StepDimTol_TotalRu // Inherited fields of GeometricTolerance - iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude()); + iter.AddItem (ent->StepDimTol_GeometricTolerance::Magnitude().Value()); iter.AddItem (ent->StepDimTol_GeometricTolerance::TolerancedShapeAspect().Value()); diff --git a/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx index 0e29dc84b5..45e96a9598 100644 --- a/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx +++ b/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx @@ -19,6 +19,7 @@ #include #include #include +#include //======================================================================= //function : RWStepDimTol_RWUnequallyDisposedGeometricTolerance @@ -51,8 +52,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); + StepRepr_MeasureWithUnit aMagnitude; + data->ReadEntity(num, 3, "magnitude", ach, aMagnitude); StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect; data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect); @@ -86,7 +87,7 @@ void RWStepDimTol_RWUnequallyDisposedGeometricTolerance:: SW.Send (ent->Description()); - SW.Send (ent->Magnitude()); + SW.Send (ent->Magnitude().Value()); SW.Send (ent->TolerancedShapeAspect().Value()); @@ -105,7 +106,7 @@ void RWStepDimTol_RWUnequallyDisposedGeometricTolerance:: // Own fields of GeometricTolerance - iter.AddItem (ent->Magnitude()); + iter.AddItem (ent->Magnitude().Value()); iter.AddItem (ent->TolerancedShapeAspect().Value()); } diff --git a/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx b/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx index 785528b615..6a4dd6c626 100644 --- a/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx +++ b/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx @@ -17,9 +17,9 @@ #include #include -#include #include #include +#include #include //======================================================================= @@ -74,8 +74,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); + StepRepr_MeasureWithUnit aQuantity; + data->ReadEntity(num, 8, "quantity", ach, aQuantity); // Initialize entity ent->Init(aProductDefinitionRelationship_Id, @@ -119,7 +119,7 @@ void RWStepRepr_RWMakeFromUsageOption::WriteStep (StepData_StepWriter& SW, SW.Send (ent->RankingRationale()); - SW.Send (ent->Quantity()); + SW.Send (ent->Quantity().Value()); } //======================================================================= @@ -139,5 +139,5 @@ void RWStepRepr_RWMakeFromUsageOption::Share (const Handle(StepRepr_MakeFromUsag // Own fields of MakeFromUsageOption - iter.AddItem (ent->Quantity()); + iter.AddItem (ent->Quantity().Value()); } diff --git a/src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx b/src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx index dbcb6d5017..33db925b94 100644 --- a/src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx +++ b/src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx @@ -16,9 +16,9 @@ #include #include -#include #include #include +#include #include #include @@ -62,8 +62,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); + StepRepr_MeasureWithUnit anOffset; + data->ReadEntity(num, 5, "offset", ach, anOffset); // Initialize entity ent->Init(aShapeAspect_Name, @@ -92,7 +92,7 @@ void RWStepRepr_RWParallelOffset::WriteStep (StepData_StepWriter& SW, SW.SendLogical (ent->ProductDefinitional()); - SW.Send(ent->Offset()); + SW.Send(ent->Offset().Value()); } //======================================================================= diff --git a/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx b/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx index 9447518a4c..2713d4ea3f 100644 --- a/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx +++ b/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx @@ -17,9 +17,9 @@ #include #include -#include #include #include +#include #include //======================================================================= @@ -79,8 +79,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); + StepRepr_MeasureWithUnit aQuantity; + data->ReadEntity(num, 7, "quantity", ach, aQuantity); // Initialize entity ent->Init(aProductDefinitionRelationship_Id, @@ -127,7 +127,7 @@ void RWStepRepr_RWQuantifiedAssemblyComponentUsage::WriteStep (StepData_StepWrit // Own fields of QuantifiedAssemblyComponentUsage - SW.Send (ent->Quantity()); + SW.Send (ent->Quantity().Value()); } //======================================================================= @@ -149,5 +149,5 @@ void RWStepRepr_RWQuantifiedAssemblyComponentUsage::Share (const Handle(StepRepr // Own fields of QuantifiedAssemblyComponentUsage - iter.AddItem (ent->Quantity()); + iter.AddItem (ent->Quantity().Value()); } diff --git a/src/RWStepShape/RWStepShape_RWMeasureQualification.cxx b/src/RWStepShape/RWStepShape_RWMeasureQualification.cxx index 63555f2275..c24d4ca63e 100644 --- a/src/RWStepShape/RWStepShape_RWMeasureQualification.cxx +++ b/src/RWStepShape/RWStepShape_RWMeasureQualification.cxx @@ -15,70 +15,66 @@ #include #include #include -#include #include #include +#include #include #include #include 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 --- + StepRepr_MeasureWithUnit aQM; + data->ReadEntity(num, 3, "qualified_measure", ach, aQM); - 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, aQM, 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()); - SW.Send(ent->QualifiedMeasure()); + SW.Send(ent->QualifiedMeasure().Value()); Standard_Integer i, nbq = ent->NbQualifiers(); SW.OpenSub(); for (i = 1; i <= nbq; i ++) SW.Send (ent->QualifiersValue(i).Value()); diff --git a/src/RWStepShape/RWStepShape_RWToleranceValue.cxx b/src/RWStepShape/RWStepShape_RWToleranceValue.cxx index 5d0d0d9cd2..b6be50f566 100644 --- a/src/RWStepShape/RWStepShape_RWToleranceValue.cxx +++ b/src/RWStepShape/RWStepShape_RWToleranceValue.cxx @@ -14,12 +14,10 @@ #include #include -#include #include #include +#include #include -#include -#include RWStepShape_RWToleranceValue::RWStepShape_RWToleranceValue () {} @@ -29,52 +27,24 @@ 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; - } - } + StepRepr_MeasureWithUnit LB; + data->ReadEntity(num, 1, "lower_bound", ach, LB); // --- 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; - } - } + StepRepr_MeasureWithUnit UB; + data->ReadEntity(num, 2, "upper_bound", ach, UB); - //--- Initialisation of the read entity --- + //--- Initialisation of the read entity --- if( !LB.IsNull() && !UB.IsNull()) ach->ClearFails(); - ent->Init(LB,UB); + ent->Init(LB.Value(),UB.Value()); } diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx index a211ebbb94..08625ef15d 100644 --- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx @@ -1912,7 +1912,7 @@ static Standard_Boolean GetMassConversionFactor(Handle(StepBasic_NamedUnit)& NU, 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(); + Handle(StepBasic_MeasureWithUnit) MWUCBU = Handle(StepBasic_MeasureWithUnit)::DownCast(CBUMU->ConversionFactor().Value()); afact = MWUCBU->ValueComponent(); StepBasic_Unit anUnit2 = MWUCBU->UnitComponent(); if (anUnit2.CaseNum(anUnit2.Value()) == 1) { @@ -2938,7 +2938,7 @@ TDF_Label STEPCAFControl_Reader::createGDTObjectInXCAF(const Handle(Standard_Tra } if (theEnt->IsKind(STANDARD_TYPE(StepShape_DimensionalLocation))) { Handle(StepShape_DimensionalLocation) aDim = Handle(StepShape_DimensionalLocation)::DownCast(theEnt); - if (aDim->RelatedShapeAspect().IsNull() || aDim->RelatingShapeAspect().IsNull()) + if (aDim->RelatedShapeAspect().IsNull() && aDim->RelatingShapeAspect().IsNull()) return aGDTL; aSemanticName = aDim->Name(); } @@ -3126,15 +3126,34 @@ 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; + if (GT->Magnitude().IsNull()) + { + continue; + } + Handle(Standard_Transient) aMagnitude = GT->Magnitude().Value(); + Handle(StepBasic_MeasureWithUnit) dim3; + if (aMagnitude->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit))) + { + dim3 = Handle(StepBasic_MeasureWithUnit)::DownCast(aMagnitude); + } + else if (aMagnitude->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit))) + { + Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem = + Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aMagnitude); + dim3 = aReprMeasureItem->GetMeasureWithUnit(); + } + if (dim3.IsNull()) + { + continue; + } Standard_Real dim = dim3->ValueComponent(); - StepBasic_Unit anUnit = GT->Magnitude()->UnitComponent(); + StepBasic_Unit anUnit = dim3->UnitComponent(); if (anUnit.IsNull()) continue; if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue; Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit(); @@ -3948,17 +3967,37 @@ 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); - aVal = aVal * anUnitCtx.LengthFactor(); - aTolObj->SetValue(aVal); + if (!aTolEnt->Magnitude().IsNull()) + { + Handle(Standard_Transient) aMagnitude = aTolEnt->Magnitude().Value(); + Handle(StepBasic_MeasureWithUnit) aMWU; + if (aMagnitude->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit))) + { + aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aMagnitude); + } + else if (aMagnitude->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit))) + { + Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem = + Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aMagnitude); + aMWU = aReprMeasureItem->GetMeasureWithUnit(); + } + 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) NU = anUnit.NamedUnit(); + STEPConstruct_UnitContext anUnitCtx; + anUnitCtx.ComputeFactors(NU); + if (anUnitCtx.LengthFactor() > 0.) + { + aVal = aVal * anUnitCtx.LengthFactor(); + } + } + aTolObj->SetValue(aVal); + } } //get modifiers XCAFDimTolObjects_GeomToleranceTypeValue aTypeV = XCAFDimTolObjects_GeomToleranceTypeValue_None; diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx index b9c9a2bee7..a0a27265d5 100644 --- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx @@ -3474,7 +3474,9 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio // Geometric_Tolerance_With_Maximum_Tolerance & Geometric_Tolerance_With_Modifiers Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol) aResult = new StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol(); - aResult->Init(aName, aDescription, aLMWU, aGTTarget, aGTWDR, aGTWM, aMaxLMWU, aType); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aResult->Init(aName, aDescription, aMeasure, aGTTarget, aGTWDR, aGTWM, aMaxLMWU, aType); aGeomTol = aResult; } else @@ -3482,7 +3484,9 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio // Geometric_Tolerance & Geometric_Tolerance_With_Maximum_Tolerance & Geometric_Tolerance_With_Modifiers Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol) aResult = new StepDimTol_GeoTolAndGeoTolWthMaxTol(); - aResult->Init(aName, aDescription, aLMWU, aGTTarget, aGTWM, aMaxLMWU, aType); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aResult->Init(aName, aDescription, aMeasure, aGTTarget, aGTWM, aMaxLMWU, aType); aGeomTol = aResult; } } @@ -3493,7 +3497,9 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio // Geometric_Tolerance & Geometric_Tolerance_With_Datum_Reference & Geometric_Tolerance_With_Modifiers Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod) aResult = new StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod(); - aResult->Init(aName, aDescription, aLMWU, aGTTarget, aGTWDR, aGTWM, aType); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aResult->Init(aName, aDescription, aMeasure, aGTTarget, aGTWDR, aGTWM, aType); aGeomTol = aResult; } else @@ -3501,7 +3507,9 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio // Geometric_Tolerance & Geometric_Tolerance_With_Modifiers Handle(StepDimTol_GeoTolAndGeoTolWthMod) aResult = new StepDimTol_GeoTolAndGeoTolWthMod(); - aResult->Init(aName, aDescription, aLMWU, aGTTarget, aGTWM, aType); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aResult->Init(aName, aDescription, aMeasure, aGTTarget, aGTWM, aType); aGeomTol = aResult; } } @@ -3513,7 +3521,9 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio // Geometric_Tolerance & Geometric_Tolerance_With_Datum_Reference Handle(StepDimTol_GeoTolAndGeoTolWthDatRef) aResult = new StepDimTol_GeoTolAndGeoTolWthDatRef(); - aResult->Init(aName, aDescription, aLMWU, aGTTarget, aGTWDR, aType); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aResult->Init(aName, aDescription, aMeasure, aGTTarget, aGTWDR, aType); aGeomTol = aResult; } else @@ -3523,7 +3533,9 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio STEPCAFControl_GDTProperty::GetGeomTolerance(anObject->GetType()); if (!aResult.IsNull()) { - aResult->Init(aName, aDescription, aLMWU, aGTTarget); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aResult->Init(aName, aDescription, aMeasure, aGTTarget); aGeomTol = aResult; } } @@ -3843,63 +3855,81 @@ Standard_Boolean STEPCAFControl_Writer::writeDGTs(const Handle(XSControl_WorkSes aMGT->SetModifier(StepDimTol_RegardlessOfFeatureSize); Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol) aGTComplex = new StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol; - aGTComplex->Init(aName, aDescription, aLMWU, aSA, aGTWDR, aMGT); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aGTComplex->Init(aName, aDescription, aMeasure, aSA, aGTWDR, aMGT); aModel->AddWithRefs(aGTComplex); } else if (aKind == 24) { Handle(StepDimTol_AngularityTolerance) aToler = new StepDimTol_AngularityTolerance; - aToler->Init(aName, aDescription, aLMWU, aSA, aHADR); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aToler->Init(aName, aDescription, aMeasure, aSA, aHADR); aModel->AddWithRefs(aToler); } else if (aKind == 25) { Handle(StepDimTol_CircularRunoutTolerance) aToler = new StepDimTol_CircularRunoutTolerance; - aToler->Init(aName, aDescription, aLMWU, aSA, aHADR); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aToler->Init(aName, aDescription, aMeasure, aSA, aHADR); aModel->AddWithRefs(aToler); } else if (aKind == 26) { Handle(StepDimTol_CoaxialityTolerance) aToler = new StepDimTol_CoaxialityTolerance; - aToler->Init(aName, aDescription, aLMWU, aSA, aHADR); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aToler->Init(aName, aDescription, aMeasure, aSA, aHADR); aModel->AddWithRefs(aToler); } else if (aKind == 27) { Handle(StepDimTol_ConcentricityTolerance) aToler = new StepDimTol_ConcentricityTolerance; - aToler->Init(aName, aDescription, aLMWU, aSA, aHADR); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aToler->Init(aName, aDescription, aMeasure, aSA, aHADR); aModel->AddWithRefs(aToler); } else if (aKind == 28) { Handle(StepDimTol_ParallelismTolerance) aToler = new StepDimTol_ParallelismTolerance; - aToler->Init(aName, aDescription, aLMWU, aSA, aHADR); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aToler->Init(aName, aDescription, aMeasure, aSA, aHADR); aModel->AddWithRefs(aToler); } else if (aKind == 29) { Handle(StepDimTol_PerpendicularityTolerance) aToler = new StepDimTol_PerpendicularityTolerance; - aToler->Init(aName, aDescription, aLMWU, aSA, aHADR); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aToler->Init(aName, aDescription, aMeasure, aSA, aHADR); aModel->AddWithRefs(aToler); } else if (aKind == 30) { Handle(StepDimTol_SymmetryTolerance) aToler = new StepDimTol_SymmetryTolerance; - aToler->Init(aName, aDescription, aLMWU, aSA, aHADR); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aToler->Init(aName, aDescription, aMeasure, aSA, aHADR); aModel->AddWithRefs(aToler); } else if (aKind == 31) { Handle(StepDimTol_TotalRunoutTolerance) aToler = new StepDimTol_TotalRunoutTolerance; - aToler->Init(aName, aDescription, aLMWU, aSA, aHADR); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(aLMWU); + aToler->Init(aName, aDescription, aMeasure, aSA, aHADR); aModel->AddWithRefs(aToler); } } diff --git a/src/STEPConstruct/STEPConstruct_UnitContext.cxx b/src/STEPConstruct/STEPConstruct_UnitContext.cxx index 665e80292a..485e22c13c 100644 --- a/src/STEPConstruct/STEPConstruct_UnitContext.cxx +++ b/src/STEPConstruct/STEPConstruct_UnitContext.cxx @@ -116,7 +116,9 @@ void STEPConstruct_UnitContext::Init(const Standard_Real Tol3d) Handle(TCollection_HAsciiString) convName = new TCollection_HAsciiString ( uName ); Handle(StepBasic_ConversionBasedUnitAndLengthUnit) convUnit = new StepBasic_ConversionBasedUnitAndLengthUnit; - convUnit->Init ( theDimExp, convName, measure ); + StepRepr_MeasureWithUnit aMeasure; + aMeasure.SetValue(measure); + convUnit->Init ( theDimExp, convName, aMeasure ); lengthUnit = convUnit; } @@ -297,7 +299,7 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi // Handle(StepBasic_DimensionalExponents) theDimExp = theCBU->Dimensions(); Handle(StepBasic_MeasureWithUnit) theMWU; if(!theCBU.IsNull()) { - theMWU = theCBU->ConversionFactor(); + theMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(theCBU->ConversionFactor().Value()); // sln 8.10.2001: the case of unrecognized entity if(theMWU.IsNull()) return -1; diff --git a/src/STEPControl/STEPControl_Reader.cxx b/src/STEPControl/STEPControl_Reader.cxx index 01d992421d..6601dfea23 100644 --- a/src/STEPControl/STEPControl_Reader.cxx +++ b/src/STEPControl/STEPControl_Reader.cxx @@ -534,7 +534,7 @@ Standard_Boolean STEPControl_Reader::findUnits( if( !aConvUnit.IsNull() ) { Handle(StepBasic_MeasureWithUnit) aMeasWithUnit = - aConvUnit->ConversionFactor(); + Handle(StepBasic_MeasureWithUnit)::DownCast(aConvUnit->ConversionFactor().Value()); if(aMeasWithUnit.IsNull()) continue; diff --git a/src/StepBasic/StepBasic_ConversionBasedUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnit.cxx index 1dcf9e64ee..8b7667fb21 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnit.cxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnit.cxx @@ -14,42 +14,40 @@ #include #include -#include #include 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)& aDimensions, + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor) { - // --- classe own fields --- - name = aName; - conversionFactor = aConversionFactor; - // --- classe inherited fields --- - StepBasic_NamedUnit::Init(aDimensions); + // --- classe own fields --- + name = aName; + conversionFactor = aConversionFactor; + // --- classe inherited fields --- + StepBasic_NamedUnit::Init(aDimensions); } void StepBasic_ConversionBasedUnit::SetName(const Handle(TCollection_HAsciiString)& aName) { - name = aName; + name = aName; } Handle(TCollection_HAsciiString) StepBasic_ConversionBasedUnit::Name() const { - return name; + return name; } -void StepBasic_ConversionBasedUnit::SetConversionFactor(const Handle(StepBasic_MeasureWithUnit)& aConversionFactor) +void StepBasic_ConversionBasedUnit::SetConversionFactor(const StepRepr_MeasureWithUnit& aConversionFactor) { - conversionFactor = aConversionFactor; + conversionFactor = aConversionFactor; } -Handle(StepBasic_MeasureWithUnit) StepBasic_ConversionBasedUnit::ConversionFactor() const +const StepRepr_MeasureWithUnit& StepBasic_ConversionBasedUnit::ConversionFactor() const { - return conversionFactor; + return conversionFactor; } diff --git a/src/StepBasic/StepBasic_ConversionBasedUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnit.hxx index 64dec81b81..56ff3d2317 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnit.hxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnit.hxx @@ -21,8 +21,8 @@ #include #include +#include class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepBasic_DimensionalExponents; @@ -39,15 +39,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)& aDimensions, + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor); Standard_EXPORT void SetName (const Handle(TCollection_HAsciiString)& aName); Standard_EXPORT Handle(TCollection_HAsciiString) Name() const; - Standard_EXPORT void SetConversionFactor (const Handle(StepBasic_MeasureWithUnit)& aConversionFactor); + Standard_EXPORT void SetConversionFactor (const StepRepr_MeasureWithUnit& aConversionFactor); - Standard_EXPORT Handle(StepBasic_MeasureWithUnit) ConversionFactor() const; + Standard_EXPORT const StepRepr_MeasureWithUnit& ConversionFactor() const; @@ -63,7 +65,7 @@ private: Handle(TCollection_HAsciiString) name; - Handle(StepBasic_MeasureWithUnit) conversionFactor; + StepRepr_MeasureWithUnit conversionFactor; }; diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx index 0b35323dbd..6fa2b58b3b 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx @@ -16,7 +16,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndLengthUnit,StepBasic_ConversionBasedUnit) @@ -24,8 +23,8 @@ IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndLengthUnit,StepBasic_ StepBasic_ConversionBasedUnitAndLengthUnit::StepBasic_ConversionBasedUnitAndLengthUnit () {} void StepBasic_ConversionBasedUnitAndLengthUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions, - const Handle(TCollection_HAsciiString)& aName, - const Handle(StepBasic_MeasureWithUnit)& aConversionFactor) + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor) { // --- ANDOR component fields --- StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx index 12339a7267..4a582012cf 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx @@ -24,7 +24,6 @@ class StepBasic_LengthUnit; class StepBasic_DimensionalExponents; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepBasic_ConversionBasedUnitAndLengthUnit; @@ -40,7 +39,9 @@ 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)& aDimensions, + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor); Standard_EXPORT void SetLengthUnit (const Handle(StepBasic_LengthUnit)& aLengthUnit); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx index e42d902b60..b8b861212b 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx @@ -16,7 +16,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndMassUnit,StepBasic_ConversionBasedUnit) @@ -38,7 +37,7 @@ StepBasic_ConversionBasedUnitAndMassUnit::StepBasic_ConversionBasedUnitAndMassUn void StepBasic_ConversionBasedUnitAndMassUnit::Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, - const Handle(StepBasic_MeasureWithUnit)& aConversionFactor) + const StepRepr_MeasureWithUnit& aConversionFactor) { // --- ANDOR component fields --- StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx index 9014ea8e5f..4bdecde54c 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx @@ -23,7 +23,6 @@ class StepBasic_MassUnit; class StepBasic_DimensionalExponents; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepBasic_ConversionBasedUnitAndMassUnit; @@ -39,7 +38,9 @@ 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)& aDimensions, + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor); Standard_EXPORT void SetMassUnit (const Handle(StepBasic_MassUnit)& aMassUnit); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx index 9d29ff2afa..05feac737f 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -26,8 +25,8 @@ StepBasic_ConversionBasedUnitAndPlaneAngleUnit::StepBasic_ConversionBasedUnitAnd } void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions, - const Handle(TCollection_HAsciiString)& aName, - const Handle(StepBasic_MeasureWithUnit)& aConversionFactor) + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor) { // --- ANDOR component fields --- StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx index 8abbf10ccc..3ee239bdea 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx @@ -24,7 +24,6 @@ class StepBasic_PlaneAngleUnit; class StepBasic_DimensionalExponents; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepBasic_ConversionBasedUnitAndPlaneAngleUnit; @@ -40,7 +39,9 @@ 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)& aDimensions, + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor); Standard_EXPORT void SetPlaneAngleUnit (const Handle(StepBasic_PlaneAngleUnit)& aPlaneAngleUnit); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx index da4ddea937..30c9acb55a 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -26,8 +25,8 @@ StepBasic_ConversionBasedUnitAndRatioUnit::StepBasic_ConversionBasedUnitAndRatio } void StepBasic_ConversionBasedUnitAndRatioUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions, - const Handle(TCollection_HAsciiString)& aName, - const Handle(StepBasic_MeasureWithUnit)& aConversionFactor) + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor) { // --- ANDOR component fields --- StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx index 2adb7fbb86..97a0bb974b 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx @@ -24,7 +24,6 @@ class StepBasic_RatioUnit; class StepBasic_DimensionalExponents; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepBasic_ConversionBasedUnitAndRatioUnit; @@ -40,7 +39,9 @@ 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)& aDimensions, + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor); Standard_EXPORT void SetRatioUnit (const Handle(StepBasic_RatioUnit)& aRatioUnit); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx index 81a5154fa8..5ef37700a1 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -26,8 +25,8 @@ StepBasic_ConversionBasedUnitAndSolidAngleUnit::StepBasic_ConversionBasedUnitAnd } void StepBasic_ConversionBasedUnitAndSolidAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions, - const Handle(TCollection_HAsciiString)& aName, - const Handle(StepBasic_MeasureWithUnit)& aConversionFactor) + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor) { // --- ANDOR component fields --- StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx index 1115e305b9..44be6f04fd 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx @@ -24,7 +24,6 @@ class StepBasic_SolidAngleUnit; class StepBasic_DimensionalExponents; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepBasic_ConversionBasedUnitAndSolidAngleUnit; @@ -40,7 +39,9 @@ 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)& aDimensions, + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor); Standard_EXPORT void SetSolidAngleUnit (const Handle(StepBasic_SolidAngleUnit)& aSolidAngleUnit); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx index 9be92c8270..98738d7644 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -26,8 +25,8 @@ StepBasic_ConversionBasedUnitAndTimeUnit::StepBasic_ConversionBasedUnitAndTimeUn } void StepBasic_ConversionBasedUnitAndTimeUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions, - const Handle(TCollection_HAsciiString)& aName, - const Handle(StepBasic_MeasureWithUnit)& aConversionFactor) + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor) { // --- ANDOR component fields --- StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor); diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx index aee23c3160..fee28ad1b9 100644 --- a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx +++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx @@ -24,7 +24,6 @@ class StepBasic_TimeUnit; class StepBasic_DimensionalExponents; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepBasic_ConversionBasedUnitAndTimeUnit; @@ -40,7 +39,9 @@ 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)& aDimensions, + const Handle(TCollection_HAsciiString)& aName, + const StepRepr_MeasureWithUnit& aConversionFactor); Standard_EXPORT void SetTimeUnit (const Handle(StepBasic_TimeUnit)& aTimeUnit); diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx index bd0f5a9c4c..975d9e24ba 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx @@ -14,7 +14,6 @@ // commercial license or contractual agreement. -#include #include #include #include @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, const StepDimTol_GeometricToleranceType theType) diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx index 532c811a28..dfd35c4b13 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx @@ -24,7 +24,6 @@ class StepDimTol_GeometricToleranceTarget; class StepDimTol_GeometricToleranceWithDatumReference; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepRepr_ShapeAspect; @@ -41,14 +40,14 @@ public: Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, - const Handle(StepBasic_MeasureWithUnit)& theMagnitude, + const StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& aMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const StepDimTol_GeometricToleranceType theType); diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx index 0c302199a6..f8012f2251 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx @@ -15,7 +15,6 @@ #include -#include #include #include #include @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM, diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx index 566434b8a4..a7f6697614 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM, diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx index e84ec6441f..46e7802c6d 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx @@ -14,7 +14,6 @@ // commercial license or contractual agreement. -#include #include #include #include @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM, diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx index f80a577c20..28551eee45 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM, diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx index 1abd684a40..e65985fd72 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx @@ -12,7 +12,6 @@ // commercial license or contractual agreement. -#include #include #include #include @@ -39,7 +38,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::StepDimTol_GeoTolAndGe void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init (const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aDescription, - const Handle(StepBasic_MeasureWithUnit)& aMagnitude, + const StepRepr_MeasureWithUnit& aMagnitude, const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT) @@ -60,7 +59,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init (const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aDescription, - const Handle(StepBasic_MeasureWithUnit)& aMagnitude, + const StepRepr_MeasureWithUnit& aMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT) diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx index 24d1045d26..7b3596914b 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx @@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceWithDatumReference; class StepDimTol_ModifiedGeometricTolerance; class StepDimTol_PositionTolerance; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepRepr_ShapeAspect; @@ -41,9 +40,19 @@ 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)& 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)& aName, + const Handle(TCollection_HAsciiString)& aDescription, + const StepRepr_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)& aName, + const Handle(TCollection_HAsciiString)& aDescription, + const StepRepr_MeasureWithUnit& aMagnitude, + const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, + const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, + const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT); Standard_EXPORT void SetGeometricToleranceWithDatumReference (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR); diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx index 193eae62bc..2926c67646 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, const StepDimTol_GeometricToleranceType theType, diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx index 94276eb6e4..f843861371 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx @@ -24,7 +24,6 @@ class StepDimTol_GeometricToleranceTarget; class StepDimTol_GeometricToleranceWithDatumReference; class StepDimTol_UnequallyDisposedGeometricTolerance; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepRepr_ShapeAspect; @@ -41,7 +40,7 @@ public: Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, - const Handle(StepBasic_MeasureWithUnit)& theMagnitude, + const StepRepr_MeasureWithUnit& theMagnitude, const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, const StepDimTol_GeometricToleranceType theType, @@ -49,7 +48,7 @@ public: Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aDescription, - const Handle(StepBasic_MeasureWithUnit)& aMagnitude, + const StepRepr_MeasureWithUnit& aMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const StepDimTol_GeometricToleranceType theType, diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx index 7a53f72e44..1268a61036 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx @@ -13,9 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. - #include -#include #include #include #include @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM, const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol, diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx index 078c953651..b10ef765a7 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx @@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceTarget; 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 StepRepr_MeasureWithUnit& theMagnitude, const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM, const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol, @@ -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 StepRepr_MeasureWithUnit& aMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM, const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol, diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx index b3b18d7d2d..52e5f144cb 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -39,7 +40,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 StepRepr_MeasureWithUnit& theMagnitude, const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM, const StepDimTol_GeometricToleranceType theType) @@ -60,7 +61,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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM, const StepDimTol_GeometricToleranceType theType) diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx index 849314d6dc..97f183db62 100644 --- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx +++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx @@ -25,6 +25,7 @@ class StepDimTol_GeometricToleranceTarget; class StepDimTol_GeometricToleranceWithModifiers; class TCollection_HAsciiString; class StepBasic_MeasureWithUnit; +class StepRepr_MeasureWithUnit; class StepRepr_ShapeAspect; @@ -41,14 +42,14 @@ public: Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, - const Handle(StepBasic_MeasureWithUnit)& theMagnitude, + const StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& aMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM, const StepDimTol_GeometricToleranceType theType); diff --git a/src/StepDimTol/StepDimTol_GeometricTolerance.cxx b/src/StepDimTol/StepDimTol_GeometricTolerance.cxx index 9125c70650..7371cbe178 100644 --- a/src/StepDimTol/StepDimTol_GeometricTolerance.cxx +++ b/src/StepDimTol/StepDimTol_GeometricTolerance.cxx @@ -38,7 +38,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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect) { @@ -58,7 +58,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 StepRepr_MeasureWithUnit& theMagnitude, const Handle(StepRepr_ShapeAspect) &theTolerancedShapeAspect) { @@ -116,7 +116,7 @@ void StepDimTol_GeometricTolerance::SetDescription (const Handle(TCollection_HAs //purpose : //======================================================================= -Handle(StepBasic_MeasureWithUnit) StepDimTol_GeometricTolerance::Magnitude () const +const StepRepr_MeasureWithUnit& StepDimTol_GeometricTolerance::Magnitude() const { return myMagnitude; } @@ -126,7 +126,7 @@ Handle(StepBasic_MeasureWithUnit) StepDimTol_GeometricTolerance::Magnitude () co //purpose : //======================================================================= -void StepDimTol_GeometricTolerance::SetMagnitude (const Handle(StepBasic_MeasureWithUnit) &theMagnitude) +void StepDimTol_GeometricTolerance::SetMagnitude (const StepRepr_MeasureWithUnit& theMagnitude) { myMagnitude = theMagnitude; } diff --git a/src/StepDimTol/StepDimTol_GeometricTolerance.hxx b/src/StepDimTol/StepDimTol_GeometricTolerance.hxx index 845003aea1..0f6362fe91 100644 --- a/src/StepDimTol/StepDimTol_GeometricTolerance.hxx +++ b/src/StepDimTol/StepDimTol_GeometricTolerance.hxx @@ -21,11 +21,12 @@ #include #include +#include + class TCollection_HAsciiString; class StepBasic_MeasureWithUnit; class StepRepr_ShapeAspect; - class StepDimTol_GeometricTolerance; DEFINE_STANDARD_HANDLE(StepDimTol_GeometricTolerance, Standard_Transient) @@ -42,13 +43,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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect); //! Returns field Name @@ -64,10 +65,10 @@ public: Standard_EXPORT void SetDescription (const Handle(TCollection_HAsciiString)& theDescription); //! Returns field Magnitude - Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Magnitude() const; + Standard_EXPORT const StepRepr_MeasureWithUnit& Magnitude() const; //! Set field Magnitude - Standard_EXPORT void SetMagnitude (const Handle(StepBasic_MeasureWithUnit)& theMagnitude); + Standard_EXPORT void SetMagnitude (const StepRepr_MeasureWithUnit& theMagnitude); //! Returns field TolerancedShapeAspect //! Note: in AP214(203) type of this attribute can be only StepRepr_ShapeAspect @@ -94,7 +95,7 @@ private: Handle(TCollection_HAsciiString) myName; Handle(TCollection_HAsciiString) myDescription; - Handle(StepBasic_MeasureWithUnit) myMagnitude; + StepRepr_MeasureWithUnit myMagnitude; StepDimTol_GeometricToleranceTarget myTolerancedShapeAspect; diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx index 72cb8848a3..77b1fc9604 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theGeometricTolerance_Magnitude, const StepDimTol_GeometricToleranceTarget &theGeometricTolerance_TolerancedShapeAspect, const Handle(StepDimTol_HArray1OfDatumSystemOrReference) &theDatumSystem) { diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx index a0a1aa3390..b5ee645620 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theGeometricTolerance_Magnitude, const StepDimTol_GeometricToleranceTarget& theGeometricTolerance_TolerancedShapeAspect, const Handle(StepDimTol_HArray1OfDatumSystemOrReference)& theDatumSystem); diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx index fc731cbed3..8de364871a 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx @@ -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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize, const StepDimTol_AreaUnitType theUnitType, diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx index 347598f6c1..4785d1dd3d 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx @@ -26,6 +26,7 @@ class StepBasic_LengthMeasureWithUnit; class TCollection_HAsciiString; class StepBasic_MeasureWithUnit; class StepDimTol_GeometricToleranceTarget; +class StepRepr_MeasureWithUnit; class StepDimTol_GeometricToleranceWithDefinedAreaUnit; DEFINE_STANDARD_HANDLE(StepDimTol_GeometricToleranceWithDefinedAreaUnit, StepDimTol_GeometricToleranceWithDefinedUnit) @@ -42,7 +43,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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize, const StepDimTol_AreaUnitType theAreaType, const Standard_Boolean theHasSecondUnitSize, diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx index 3a2deaaf3e..6d0ca7e272 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx @@ -16,6 +16,7 @@ #include #include +#include #include IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithDefinedUnit,StepDimTol_GeometricTolerance) @@ -36,7 +37,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 StepRepr_MeasureWithUnit& theMagnitude, const Handle(StepRepr_ShapeAspect) &theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize) { @@ -51,7 +52,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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize) { diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx index b063955f18..719b6ab1e4 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx @@ -22,8 +22,8 @@ class StepBasic_LengthMeasureWithUnit; class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepDimTol_GeometricToleranceTarget; +class StepRepr_MeasureWithUnit; class StepRepr_ShapeAspect; class StepDimTol_GeometricToleranceWithDefinedUnit; @@ -38,10 +38,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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theMagnitude, + const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, + const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ; //! Returns field UnitSize inline Handle(StepBasic_LengthMeasureWithUnit) UnitSize () const diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx index 498faf79f5..0994a43332 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx @@ -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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect, const Handle(StepDimTol_HArray1OfGeometricToleranceModifier) &theModifiers, const Handle(StepBasic_LengthMeasureWithUnit) &theMaximumUpperTolerance) diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx index dedc6cbf91..be96d197bb 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx @@ -22,7 +22,6 @@ #include 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 StepRepr_MeasureWithUnit& theMagnitude, + const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, + const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers, + const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ; //! Returns field MaximumUpperTolerance inline Handle(StepBasic_LengthMeasureWithUnit) MaximumUpperTolerance () const diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx index ddd197903f..e629b20419 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx @@ -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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect, const Handle(StepDimTol_HArray1OfGeometricToleranceModifier) &theModifiers) { diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx index 94c982c901..973dd652a5 100644 --- a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx +++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx @@ -23,7 +23,6 @@ #include 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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers) ; diff --git a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx index 99ec6e6bf4..d23eadec53 100644 --- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx +++ b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx @@ -15,7 +15,6 @@ // Generator: ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2 -#include #include #include #include @@ -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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theGeometricTolerance_Magnitude, const StepDimTol_GeometricToleranceTarget &theGeometricTolerance_TolerancedShapeAspect, const StepDimTol_LimitCondition theModifier) { diff --git a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx index 80923be07f..8110678737 100644 --- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx +++ b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx @@ -22,7 +22,6 @@ #include #include 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 StepRepr_MeasureWithUnit& 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 StepRepr_MeasureWithUnit& theGeometricTolerance_Magnitude, const StepDimTol_GeometricToleranceTarget& theGeometricTolerance_TolerancedShapeAspect, const StepDimTol_LimitCondition theModifier); diff --git a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx index 6e749feb20..bdce6b83c5 100644 --- a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx +++ b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx @@ -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 StepRepr_MeasureWithUnit& theMagnitude, const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit) &theDisplacement) { diff --git a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx index 4f53e5fb26..02440eb9fe 100644 --- a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx +++ b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx @@ -22,7 +22,6 @@ #include 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 StepRepr_MeasureWithUnit& theMagnitude, + const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, + const Handle(StepBasic_LengthMeasureWithUnit)& theDisplacement) ; //! Returns field Displacement inline Handle(StepBasic_LengthMeasureWithUnit) Displacement () const diff --git a/src/StepRepr/FILES b/src/StepRepr/FILES index ab9522c9e3..f4d8f7518f 100644 --- a/src/StepRepr/FILES +++ b/src/StepRepr/FILES @@ -86,6 +86,8 @@ StepRepr_MaterialPropertyRepresentation.cxx StepRepr_MaterialPropertyRepresentation.hxx StepRepr_MeasureRepresentationItem.cxx StepRepr_MeasureRepresentationItem.hxx +StepRepr_MeasureWithUnit.cxx +StepRepr_MeasureWithUnit.hxx StepRepr_NextAssemblyUsageOccurrence.cxx StepRepr_NextAssemblyUsageOccurrence.hxx StepRepr_ParallelOffset.cxx diff --git a/src/StepRepr/StepRepr_MakeFromUsageOption.cxx b/src/StepRepr/StepRepr_MakeFromUsageOption.cxx index 1a7512ef35..50b90c1928 100644 --- a/src/StepRepr/StepRepr_MakeFromUsageOption.cxx +++ b/src/StepRepr/StepRepr_MakeFromUsageOption.cxx @@ -43,7 +43,7 @@ void StepRepr_MakeFromUsageOption::Init (const Handle(TCollection_HAsciiString) const Handle(StepBasic_ProductDefinition) &aProductDefinitionRelationship_RelatedProductDefinition, const Standard_Integer aRanking, const Handle(TCollection_HAsciiString) &aRankingRationale, - const Handle(StepBasic_MeasureWithUnit) &aQuantity) + const StepRepr_MeasureWithUnit aQuantity) { StepRepr_ProductDefinitionUsage::Init(aProductDefinitionRelationship_Id, aProductDefinitionRelationship_Name, @@ -72,7 +72,7 @@ void StepRepr_MakeFromUsageOption::Init (const Handle(TCollection_HAsciiString) const StepBasic_ProductDefinitionOrReference &aProductDefinitionRelationship_RelatedProductDefinition, const Standard_Integer aRanking, const Handle(TCollection_HAsciiString) &aRankingRationale, - const Handle(StepBasic_MeasureWithUnit) &aQuantity) + const StepRepr_MeasureWithUnit aQuantity) { StepRepr_ProductDefinitionUsage::Init(aProductDefinitionRelationship_Id, aProductDefinitionRelationship_Name, @@ -133,7 +133,7 @@ void StepRepr_MakeFromUsageOption::SetRankingRationale (const Handle(TCollection //purpose : //======================================================================= -Handle(StepBasic_MeasureWithUnit) StepRepr_MakeFromUsageOption::Quantity () const +const StepRepr_MeasureWithUnit& StepRepr_MakeFromUsageOption::Quantity () const { return theQuantity; } @@ -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 StepRepr_MeasureWithUnit& aQuantity) { theQuantity = aQuantity; } diff --git a/src/StepRepr/StepRepr_MakeFromUsageOption.hxx b/src/StepRepr/StepRepr_MakeFromUsageOption.hxx index fae73e1b2f..bdc2f59b63 100644 --- a/src/StepRepr/StepRepr_MakeFromUsageOption.hxx +++ b/src/StepRepr/StepRepr_MakeFromUsageOption.hxx @@ -20,9 +20,9 @@ #include #include +#include #include class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; class StepBasic_ProductDefinition; @@ -40,10 +40,26 @@ 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)& 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 StepRepr_MeasureWithUnit aQuantity); //! 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)& 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 StepRepr_MeasureWithUnit aQuantity); //! Returns field Ranking Standard_EXPORT Standard_Integer Ranking() const; @@ -58,10 +74,10 @@ public: Standard_EXPORT void SetRankingRationale (const Handle(TCollection_HAsciiString)& RankingRationale); //! Returns field Quantity - Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Quantity() const; + Standard_EXPORT const StepRepr_MeasureWithUnit& Quantity() const; //! Set field Quantity - Standard_EXPORT void SetQuantity (const Handle(StepBasic_MeasureWithUnit)& Quantity); + Standard_EXPORT void SetQuantity (const StepRepr_MeasureWithUnit& Quantity); @@ -78,7 +94,7 @@ private: Standard_Integer theRanking; Handle(TCollection_HAsciiString) theRankingRationale; - Handle(StepBasic_MeasureWithUnit) theQuantity; + StepRepr_MeasureWithUnit theQuantity; }; diff --git a/src/StepRepr/StepRepr_MeasureWithUnit.cxx b/src/StepRepr/StepRepr_MeasureWithUnit.cxx new file mode 100644 index 0000000000..ba110daa17 --- /dev/null +++ b/src/StepRepr/StepRepr_MeasureWithUnit.cxx @@ -0,0 +1,69 @@ +// Copyright (c) 2023 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#include + +#include + +#include +#include +#include + + +//======================================================================= +//function : StepDimTol_MeasureWithUnit +//purpose : +//======================================================================= +StepRepr_MeasureWithUnit::StepRepr_MeasureWithUnit() +{ +} + +//======================================================================= +//function : CaseNum +//purpose : +//======================================================================= +Standard_Integer StepRepr_MeasureWithUnit::CaseNum(const Handle(Standard_Transient)& ent) const +{ + if (ent.IsNull()) return 0; + if (ent->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit))) return 1; + if (ent->IsKind(STANDARD_TYPE(StepRepr_MeasureRepresentationItem))) return 2; + if (ent->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit))) return 3; + return 0; +} + +//======================================================================= +//function : BasicMeasureWithUnit +//purpose : +//======================================================================= +Handle(StepBasic_MeasureWithUnit) StepRepr_MeasureWithUnit::BasicMeasureWithUnit() const +{ + return GetCasted(StepBasic_MeasureWithUnit, Value()); +} + +//======================================================================= +//function : MeasureRepresentationItem +//purpose : +//======================================================================= +Handle(StepRepr_MeasureRepresentationItem) StepRepr_MeasureWithUnit::MeasureRepresentationItem() const +{ + return GetCasted(StepRepr_MeasureRepresentationItem, Value()); +} + +//======================================================================= +//function : ReprItemAndMeasureWithUnit +//purpose : +//======================================================================= +Handle(StepRepr_ReprItemAndMeasureWithUnit) StepRepr_MeasureWithUnit::ReprItemAndMeasureWithUnit() const +{ + return GetCasted(StepRepr_ReprItemAndMeasureWithUnit, Value()); +} diff --git a/src/StepRepr/StepRepr_MeasureWithUnit.hxx b/src/StepRepr/StepRepr_MeasureWithUnit.hxx new file mode 100644 index 0000000000..9225a6bc76 --- /dev/null +++ b/src/StepRepr/StepRepr_MeasureWithUnit.hxx @@ -0,0 +1,53 @@ +// Copyright (c) 2023 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef _StepRepr_MeasureWithUnit_HeaderFile +#define _StepRepr_MeasureWithUnit_HeaderFile + +#include +#include +#include + +#include + +class StepBasic_MeasureWithUnit; +class StepRepr_MeasureRepresentationItem; +class StepRepr_ReprItemAndMeasureWithUnit; + +//! Representation of STEP SELECT type MeasureWithUnit +class StepRepr_MeasureWithUnit : public StepData_SelectType +{ +public: + DEFINE_STANDARD_ALLOC + + //! Empty constructor + Standard_EXPORT StepRepr_MeasureWithUnit(); + + //! Recognizes a kind of MeasureWithUnit select type + //! 1 -> MeasureWithUnit from StepBasic + //! 2 -> MeasureRepresentationItem from StepRepr + //! 3 -> ReprItemAndMeasureWithUnit from StepRepr + //! 0 else + Standard_EXPORT Standard_Integer CaseNum(const Handle(Standard_Transient)& ent) const; + + //! returns value as a BasicMeasureWithUnit (Null if another type) + Standard_EXPORT Handle(StepBasic_MeasureWithUnit) BasicMeasureWithUnit() const; + + //! returns Value as a MeasureRepresentationItem (Null if another type) + Standard_EXPORT Handle(StepRepr_MeasureRepresentationItem) MeasureRepresentationItem() const; + + //! returns Value as a ReprItemAndMeasureWithUnit (Null if another type) + Standard_EXPORT Handle(StepRepr_ReprItemAndMeasureWithUnit) ReprItemAndMeasureWithUnit() const; + +}; +#endif // _StepRepr_MeasureWithUnit_HeaderFile diff --git a/src/StepRepr/StepRepr_ParallelOffset.cxx b/src/StepRepr/StepRepr_ParallelOffset.cxx index d6ab382242..e6d855c96e 100644 --- a/src/StepRepr/StepRepr_ParallelOffset.cxx +++ b/src/StepRepr/StepRepr_ParallelOffset.cxx @@ -29,7 +29,7 @@ void StepRepr_ParallelOffset::Init( const Handle(TCollection_HAsciiString)& theShapeAspect_Description, const Handle(StepRepr_ProductDefinitionShape)& theShapeAspect_OfShape, const StepData_Logical theShapeAspect_ProductDefinitional, - const Handle(StepBasic_MeasureWithUnit) &theOffset) + const StepRepr_MeasureWithUnit theOffset) { StepRepr_ShapeAspect::Init(theShapeAspect_Name, theShapeAspect_Description, diff --git a/src/StepRepr/StepRepr_ParallelOffset.hxx b/src/StepRepr/StepRepr_ParallelOffset.hxx index e261980431..4ddf03dc2a 100644 --- a/src/StepRepr/StepRepr_ParallelOffset.hxx +++ b/src/StepRepr/StepRepr_ParallelOffset.hxx @@ -20,8 +20,9 @@ #include #include +#include #include -class StepBasic_MeasureWithUnit; + class TCollection_HAsciiString; class StepRepr_ProductDefinitionShape; @@ -36,16 +37,20 @@ 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 StepRepr_MeasureWithUnit theOffset) ; //! Returns field Offset - inline Handle(StepBasic_MeasureWithUnit) Offset () const + inline const StepRepr_MeasureWithUnit& Offset () const { return offset; } //! Set field Offset - inline void SetOffset (const Handle(StepBasic_MeasureWithUnit)& theOffset) + inline void SetOffset (const StepRepr_MeasureWithUnit& theOffset) { offset = theOffset; } @@ -53,6 +58,6 @@ public: DEFINE_STANDARD_RTTIEXT(StepRepr_ParallelOffset,StepRepr_DerivedShapeAspect) private: - Handle(StepBasic_MeasureWithUnit) offset; + StepRepr_MeasureWithUnit offset; }; #endif // _StepRepr_ParallelOffset_HeaderFile diff --git a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx index e83d74dabe..693bfdd17a 100644 --- a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx +++ b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx @@ -15,8 +15,8 @@ // Generator: ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1 -#include #include +#include #include #include @@ -43,7 +43,7 @@ void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_H const Handle(StepBasic_ProductDefinition) &aProductDefinitionRelationship_RelatedProductDefinition, const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator, const Handle(TCollection_HAsciiString) &aAssemblyComponentUsage_ReferenceDesignator, - const Handle(StepBasic_MeasureWithUnit) &aQuantity) + const StepRepr_MeasureWithUnit aQuantity) { StepRepr_AssemblyComponentUsage::Init(aProductDefinitionRelationship_Id, aProductDefinitionRelationship_Name, @@ -70,7 +70,7 @@ void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_H const StepBasic_ProductDefinitionOrReference &aProductDefinitionRelationship_RelatedProductDefinition, const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator, const Handle(TCollection_HAsciiString) &aAssemblyComponentUsage_ReferenceDesignator, - const Handle(StepBasic_MeasureWithUnit) &aQuantity) + const StepRepr_MeasureWithUnit aQuantity) { StepRepr_AssemblyComponentUsage::Init(aProductDefinitionRelationship_Id, aProductDefinitionRelationship_Name, @@ -89,7 +89,7 @@ void StepRepr_QuantifiedAssemblyComponentUsage::Init (const Handle(TCollection_H //purpose : //======================================================================= -Handle(StepBasic_MeasureWithUnit) StepRepr_QuantifiedAssemblyComponentUsage::Quantity () const +const StepRepr_MeasureWithUnit& StepRepr_QuantifiedAssemblyComponentUsage::Quantity () const { return theQuantity; } @@ -99,7 +99,7 @@ Handle(StepBasic_MeasureWithUnit) StepRepr_QuantifiedAssemblyComponentUsage::Qua //purpose : //======================================================================= -void StepRepr_QuantifiedAssemblyComponentUsage::SetQuantity (const Handle(StepBasic_MeasureWithUnit) &aQuantity) +void StepRepr_QuantifiedAssemblyComponentUsage::SetQuantity (const StepRepr_MeasureWithUnit& aQuantity) { theQuantity = aQuantity; } diff --git a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx index d3772946a3..53022d5ffc 100644 --- a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx +++ b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx @@ -20,9 +20,10 @@ #include #include -class StepBasic_MeasureWithUnit; + class TCollection_HAsciiString; class StepBasic_ProductDefinition; +class StepRepr_MeasureWithUnit; class StepRepr_QuantifiedAssemblyComponentUsage; @@ -39,16 +40,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)& 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 StepRepr_MeasureWithUnit aQuantity); //! 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)& 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 StepRepr_MeasureWithUnit aQuantity); //! Returns field Quantity - Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Quantity() const; + Standard_EXPORT const StepRepr_MeasureWithUnit& Quantity() const; //! Set field Quantity - Standard_EXPORT void SetQuantity (const Handle(StepBasic_MeasureWithUnit)& Quantity); + Standard_EXPORT void SetQuantity (const StepRepr_MeasureWithUnit& Quantity); @@ -63,7 +80,7 @@ protected: private: - Handle(StepBasic_MeasureWithUnit) theQuantity; + StepRepr_MeasureWithUnit theQuantity; }; diff --git a/src/StepShape/StepShape_MeasureQualification.cxx b/src/StepShape/StepShape_MeasureQualification.cxx index c61206c621..20cf73bcee 100644 --- a/src/StepShape/StepShape_MeasureQualification.cxx +++ b/src/StepShape/StepShape_MeasureQualification.cxx @@ -13,6 +13,7 @@ #include +#include #include #include #include @@ -24,7 +25,7 @@ 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 StepRepr_MeasureWithUnit qualified_measure, const Handle(StepShape_HArray1OfValueQualifier)& qualifiers) { theName = name; @@ -47,11 +48,11 @@ void StepShape_MeasureQualification::SetDescription (const Handle(TCollection_HAsciiString)& description) { theDescription = description; } -Handle(StepBasic_MeasureWithUnit) StepShape_MeasureQualification::QualifiedMeasure () const +const StepRepr_MeasureWithUnit& StepShape_MeasureQualification::QualifiedMeasure () const { return theQualifiedMeasure; } void StepShape_MeasureQualification::SetQualifiedMeasure - (const Handle(StepBasic_MeasureWithUnit)& qualified_measure) + (const StepRepr_MeasureWithUnit& qualified_measure) { theQualifiedMeasure = qualified_measure; } Handle(StepShape_HArray1OfValueQualifier) StepShape_MeasureQualification::Qualifiers () const diff --git a/src/StepShape/StepShape_MeasureQualification.hxx b/src/StepShape/StepShape_MeasureQualification.hxx index bbb288a53d..15b47273f9 100644 --- a/src/StepShape/StepShape_MeasureQualification.hxx +++ b/src/StepShape/StepShape_MeasureQualification.hxx @@ -23,7 +23,7 @@ #include #include class TCollection_HAsciiString; -class StepBasic_MeasureWithUnit; +class StepRepr_MeasureWithUnit; class StepShape_ValueQualifier; @@ -39,7 +39,10 @@ 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)& name, + const Handle(TCollection_HAsciiString)& description, + const StepRepr_MeasureWithUnit qualified_measure, + const Handle(StepShape_HArray1OfValueQualifier)& qualifiers); Standard_EXPORT Handle(TCollection_HAsciiString) Name() const; @@ -49,9 +52,9 @@ public: Standard_EXPORT void SetDescription (const Handle(TCollection_HAsciiString)& description); - Standard_EXPORT Handle(StepBasic_MeasureWithUnit) QualifiedMeasure() const; + Standard_EXPORT const StepRepr_MeasureWithUnit& QualifiedMeasure() const; - Standard_EXPORT void SetQualifiedMeasure (const Handle(StepBasic_MeasureWithUnit)& qualified_measure); + Standard_EXPORT void SetQualifiedMeasure (const StepRepr_MeasureWithUnit& qualified_measure); Standard_EXPORT Handle(StepShape_HArray1OfValueQualifier) Qualifiers() const; @@ -78,7 +81,7 @@ private: Handle(TCollection_HAsciiString) theName; Handle(TCollection_HAsciiString) theDescription; - Handle(StepBasic_MeasureWithUnit) theQualifiedMeasure; + StepRepr_MeasureWithUnit theQualifiedMeasure; Handle(StepShape_HArray1OfValueQualifier) theQualifiers; diff --git a/src/StepShape/StepShape_ToleranceValue.cxx b/src/StepShape/StepShape_ToleranceValue.cxx index 5fc6fb3c27..d4cb75d16c 100644 --- a/src/StepShape/StepShape_ToleranceValue.cxx +++ b/src/StepShape/StepShape_ToleranceValue.cxx @@ -12,7 +12,6 @@ // commercial license or contractual agreement. -#include #include IMPLEMENT_STANDARD_RTTIEXT(StepShape_ToleranceValue,Standard_Transient) diff --git a/src/StepToGeom/StepToGeom.cxx b/src/StepToGeom/StepToGeom.cxx index 1b365c150e..b28c5d3b30 100644 --- a/src/StepToGeom/StepToGeom.cxx +++ b/src/StepToGeom/StepToGeom.cxx @@ -2254,8 +2254,9 @@ Handle(TColStd_HArray1OfReal) StepToGeom::MakeYprRotation(const StepKinematics_S while (!aPau.IsNull() && aPau->IsKind((STANDARD_TYPE(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)))) { Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit) aConverUnit = Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)::DownCast(aPau); - anAngle = anAngle * aConverUnit->ConversionFactor()->ValueComponent(); - aPau = aConverUnit->ConversionFactor()->UnitComponent().NamedUnit(); + Handle(StepBasic_MeasureWithUnit) aConversionFactor = Handle(StepBasic_MeasureWithUnit)::DownCast(aConverUnit->ConversionFactor().Value()); + anAngle = anAngle * aConversionFactor->ValueComponent(); + aPau = aConversionFactor->UnitComponent().NamedUnit(); } if (aPau.IsNull()) { diff --git a/tests/bugs/step/bug33099 b/tests/bugs/step/bug33099 new file mode 100644 index 0000000000..960bc2384e --- /dev/null +++ b/tests/bugs/step/bug33099 @@ -0,0 +1,58 @@ +puts "====================================" +puts "0033099: Data Exchange, Step Import - Wrong PMI values in GDT" +puts "====================================" + +pload OCAF + +Close D -silent + +ReadStep D [locate_data_file bug33099_2022-03-09_Stempel-sim.stp] + +set tolType0 [XGetTypeOfTolerance D 0:1:4:1] +set tolVal0 [XGetToleranceValue D 0:1:4:1] +if {[string first "ProfileOfSurface" $tolType0] == -1 + || [expr {double(round(100 * $tolVal0))/100}] != 0.1} { + puts "Error: Tolerance data is not correct" +} + +set tolType1 [XGetTypeOfTolerance D 0:1:4:5] +set tolVal1 [XGetToleranceValue D 0:1:4:5] +if {[string first "Position" $tolType1] == -1 + || $tolVal1 != 0} { + puts "Error: Tolerance data is not correct" +} + +set tolType2 [XGetTypeOfTolerance D 0:1:4:6] +set tolVal2 [XGetToleranceValue D 0:1:4:6] +if {[string first "Position" $tolType2] == -1 + || $tolVal2 != 0} { + puts "Error: Tolerance data is not correct" +} + +set tolType3 [XGetTypeOfTolerance D 0:1:4:7] +set tolVal3 [XGetToleranceValue D 0:1:4:7] +if {[string first "Position" $tolType3] == -1 + || $tolVal3 != 0} { + puts "Error: Tolerance data is not correct" +} + +set dimType0 [XGetDimensionType D 0:1:4:8] +set dimVal0 [XGetDimensionValue D 0:1:4:8] +if {[string first "Location_LinearDistance" $dimType0] == -1 + || [expr {double(round(100 * $dimVal0))/100}] != 21.0} { + puts "Error: Dimension data is not correct" +} + +set dimType1 [XGetDimensionType D 0:1:4:9] +set dimVal1 [XGetDimensionValue D 0:1:4:9] +if {[string first "Location_LinearDistance" $dimType1] == -1 + || [expr {double(round(100 * $dimVal1))/100}] != 5.0} { + puts "Error: Dimension data is not correct" +} + +set dimType2 [XGetDimensionType D 0:1:4:10] +set dimVal2 [XGetDimensionValue D 0:1:4:10] +if {[string first "Location_LinearDistance" $dimType2] == -1 + || [expr {double(round(100 * $dimVal2))/100}] != 2.5} { + puts "Error: Dimension data is not correct" +} \ No newline at end of file