OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

For some STEP files we fail for geometric tolerances to read the "geometric_tolerance.magnitude"

Browse Source 
StepDimTol_GeometricTolerance and related classes can now process both
StepBasic_MeasureWithUnit and StepRepr_ReprItemAndMeasureWithUnit.
Unit tests for changed methods are added.
This commit is contained in:
dkulikov
2025-07-14 17:00:16 +01:00
parent 06f6a5afec
commit e4acd164ed
103 changed files with 744 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/DataExchange/TKDESTEP/GTests/FILES.cmake
View File

@@ -13,4 +13,5 @@ set(OCCT_TKDESTEP_GTests_FILES
StepTidy_PlaneReducer_Test.cxx
StepTidy_Merger_Test.cxx
StepTidy_VectorReducer_Test.cxx
StepTransientReplacements_Test.cxx
)

361
src/DataExchange/TKDESTEP/GTests/StepTransientReplacements_Test.cxx Normal file
View File

@@ -0,0 +1,361 @@
#include <gtest/gtest.h>
#include <Standard_Transient.hxx>
#include <StepBasic_MeasureWithUnit.hxx>
#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
#include <StepBasic_ConversionBasedUnit.hxx>
#include <StepBasic_DimensionalExponents.hxx>
#include <StepBasic_SiUnit.hxx>
#include <StepBasic_MeasureValueMember.hxx>
#include <StepBasic_SiPrefix.hxx>
#include <StepBasic_SiUnitName.hxx>
#include <StepDimTol_GeometricTolerance.hxx>
#include <StepRepr_MakeFromUsageOption.hxx>
#include <StepRepr_ParallelOffset.hxx>
#include <StepRepr_QuantifiedAssemblyComponentUsage.hxx>
#include <StepShape_MeasureQualification.hxx>
#include <StepData_Logical.hxx>
#include <StepRepr_ProductDefinitionShape.hxx>
#include <StepBasic_ProductDefinition.hxx>
#include <StepDimTol_GeometricToleranceTarget.hxx>
#include <StepShape_HArray1OfValueQualifier.hxx>
// Helper functions to create test objects
namespace
{
// Create a MeasureWithUnit
Handle(StepBasic_MeasureWithUnit) CreateMeasureWithUnit(const Standard_Real theValue)
{
Handle(StepBasic_MeasureWithUnit) aMeasure = new StepBasic_MeasureWithUnit();
// Set value component
Handle(StepBasic_MeasureValueMember) aValueMember = new StepBasic_MeasureValueMember();
aValueMember->SetName("POSITIVE_LENGTH_MEASURE");
aValueMember->SetReal(theValue);
aMeasure->SetValueComponentMember(aValueMember);
// Create a dummy SiUnit for unit component
Handle(StepBasic_SiUnit) aSiUnit = new StepBasic_SiUnit();
aSiUnit->Init(Standard_False,
StepBasic_SiPrefix::StepBasic_spMilli,
StepBasic_SiUnitName::StepBasic_sunMetre);
StepBasic_Unit aUnit;
aUnit.SetValue(aSiUnit);
aMeasure->SetUnitComponent(aUnit);
return aMeasure;
}
// Create a ReprItemAndMeasureWithUnit
Handle(StepRepr_ReprItemAndMeasureWithUnit) CreateReprItemAndMeasureWithUnit(
const Standard_Real theValue)
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasure =
new StepRepr_ReprItemAndMeasureWithUnit();
Handle(StepBasic_MeasureWithUnit) aMeasure = CreateMeasureWithUnit(theValue);
aReprMeasure->SetMeasureWithUnit(aMeasure);
// Set other required fields
Handle(TCollection_HAsciiString) aName = new TCollection_HAsciiString("TestReprItem");
aReprMeasure->SetName(aName);
return aReprMeasure;
}
} // namespace
// Test fixture for all transient replacement tests
class StepTransientReplacements : public ::testing::Test
{
protected:
void SetUp() override
{
// Create common test objects
myMeasureWithUnit = CreateMeasureWithUnit(5.0);
myReprItemAndMeasureWithUnit = CreateReprItemAndMeasureWithUnit(10.0);
// Create dimensional exponents
myDimensionalExponents = new StepBasic_DimensionalExponents();
myDimensionalExponents->Init(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
// Create name string
myName = new TCollection_HAsciiString("TestName");
// Create description string
myDescription = new TCollection_HAsciiString("TestDescription");
// Create product definition
myProductDefinition = new StepBasic_ProductDefinition();
// Create product definition shape
myProductDefinitionShape = new StepRepr_ProductDefinitionShape();
// Create qualifiers array
myQualifiers = new StepShape_HArray1OfValueQualifier(1, 1);
}
// Common test objects
Handle(StepBasic_MeasureWithUnit) myMeasureWithUnit;
Handle(StepRepr_ReprItemAndMeasureWithUnit) myReprItemAndMeasureWithUnit;
Handle(StepBasic_DimensionalExponents) myDimensionalExponents;
Handle(TCollection_HAsciiString) myName;
Handle(TCollection_HAsciiString) myDescription;
Handle(StepBasic_ProductDefinition) myProductDefinition;
Handle(StepRepr_ProductDefinitionShape) myProductDefinitionShape;
Handle(StepShape_HArray1OfValueQualifier) myQualifiers;
};
// Test ConversionBasedUnit with different transient types
TEST_F(StepTransientReplacements, ConversionBasedUnit_WorksWithBothTypes)
{
// Create ConversionBasedUnit
Handle(StepBasic_ConversionBasedUnit) aUnit = new StepBasic_ConversionBasedUnit();
// Test with MeasureWithUnit
aUnit->Init(myDimensionalExponents, myName, myMeasureWithUnit);
EXPECT_FALSE(aUnit->ConversionFactor().IsNull());
EXPECT_TRUE(aUnit->ConversionFactor()->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)));
Handle(StepBasic_MeasureWithUnit) aMeasure =
Handle(StepBasic_MeasureWithUnit)::DownCast(aUnit->ConversionFactor());
EXPECT_FALSE(aMeasure.IsNull());
EXPECT_NEAR(aMeasure->ValueComponent(), 5.0, 1e-7);
// Test with ReprItemAndMeasureWithUnit
aUnit->SetConversionFactor(myReprItemAndMeasureWithUnit);
EXPECT_FALSE(aUnit->ConversionFactor().IsNull());
EXPECT_TRUE(
aUnit->ConversionFactor()->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)));
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasure =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aUnit->ConversionFactor());
EXPECT_FALSE(aReprMeasure.IsNull());
Handle(StepBasic_MeasureWithUnit) aExtractedMeasure = aReprMeasure->GetMeasureWithUnit();
EXPECT_NEAR(aExtractedMeasure->ValueComponent(), 10.0, 1e-7);
}
// Test GeometricTolerance with different transient types
TEST_F(StepTransientReplacements, GeometricTolerance_WorksWithBothTypes)
{
// Create GeometricTolerance
Handle(StepDimTol_GeometricTolerance) aTolerance = new StepDimTol_GeometricTolerance();
// Create a dummy tolerance target
StepDimTol_GeometricToleranceTarget aTarget;
// Test with MeasureWithUnit
aTolerance->Init(myName, myDescription, myMeasureWithUnit, aTarget);
EXPECT_FALSE(aTolerance->Magnitude().IsNull());
EXPECT_TRUE(aTolerance->Magnitude()->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)));
Handle(StepBasic_MeasureWithUnit) aMeasure =
Handle(StepBasic_MeasureWithUnit)::DownCast(aTolerance->Magnitude());
EXPECT_FALSE(aMeasure.IsNull());
EXPECT_NEAR(aMeasure->ValueComponent(), 5.0, 1e-7);
// Test with ReprItemAndMeasureWithUnit
aTolerance->SetMagnitude(myReprItemAndMeasureWithUnit);
EXPECT_FALSE(aTolerance->Magnitude().IsNull());
EXPECT_TRUE(aTolerance->Magnitude()->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)));
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasure =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aTolerance->Magnitude());
EXPECT_FALSE(aReprMeasure.IsNull());
Handle(StepBasic_MeasureWithUnit) aExtractedMeasure = aReprMeasure->GetMeasureWithUnit();
EXPECT_NEAR(aExtractedMeasure->ValueComponent(), 10.0, 1e-7);
}
// Test MakeFromUsageOption with different transient types
TEST_F(StepTransientReplacements, MakeFromUsageOption_WorksWithBothTypes)
{
// Create MakeFromUsageOption
Handle(StepRepr_MakeFromUsageOption) aMakeFromUsage = new StepRepr_MakeFromUsageOption();
// Test with MeasureWithUnit
// Use proper function signature for Init
Standard_Boolean hasDescription = Standard_True;
aMakeFromUsage->Init(myName,
myName,
hasDescription,
myDescription,
myProductDefinition,
myProductDefinition,
1,
myDescription,
myMeasureWithUnit);
EXPECT_FALSE(aMakeFromUsage->Quantity().IsNull());
EXPECT_TRUE(aMakeFromUsage->Quantity()->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)));
Handle(StepBasic_MeasureWithUnit) aMeasure =
Handle(StepBasic_MeasureWithUnit)::DownCast(aMakeFromUsage->Quantity());
EXPECT_FALSE(aMeasure.IsNull());
EXPECT_NEAR(aMeasure->ValueComponent(), 5.0, 1e-7);
// Test with ReprItemAndMeasureWithUnit
aMakeFromUsage->SetQuantity(myReprItemAndMeasureWithUnit);
EXPECT_FALSE(aMakeFromUsage->Quantity().IsNull());
EXPECT_TRUE(
aMakeFromUsage->Quantity()->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)));
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasure =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aMakeFromUsage->Quantity());
EXPECT_FALSE(aReprMeasure.IsNull());
Handle(StepBasic_MeasureWithUnit) aExtractedMeasure = aReprMeasure->GetMeasureWithUnit();
EXPECT_NEAR(aExtractedMeasure->ValueComponent(), 10.0, 1e-7);
}
// Test ParallelOffset with different transient types
TEST_F(StepTransientReplacements, ParallelOffset_WorksWithBothTypes)
{
// Create ParallelOffset
Handle(StepRepr_ParallelOffset) aParallelOffset = new StepRepr_ParallelOffset();
// Test with MeasureWithUnit
aParallelOffset->Init(myName,
myDescription,
myProductDefinitionShape,
StepData_LTrue,
myMeasureWithUnit);
EXPECT_FALSE(aParallelOffset->Offset().IsNull());
EXPECT_TRUE(aParallelOffset->Offset()->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)));
Handle(StepBasic_MeasureWithUnit) aMeasure =
Handle(StepBasic_MeasureWithUnit)::DownCast(aParallelOffset->Offset());
EXPECT_FALSE(aMeasure.IsNull());
EXPECT_NEAR(aMeasure->ValueComponent(), 5.0, 1e-7);
// Test with ReprItemAndMeasureWithUnit
aParallelOffset->SetOffset(myReprItemAndMeasureWithUnit);
EXPECT_FALSE(aParallelOffset->Offset().IsNull());
EXPECT_TRUE(
aParallelOffset->Offset()->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)));
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasure =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aParallelOffset->Offset());
EXPECT_FALSE(aReprMeasure.IsNull());
Handle(StepBasic_MeasureWithUnit) aExtractedMeasure = aReprMeasure->GetMeasureWithUnit();
EXPECT_NEAR(aExtractedMeasure->ValueComponent(), 10.0, 1e-7);
}
// Test QuantifiedAssemblyComponentUsage with different transient types
TEST_F(StepTransientReplacements, QuantifiedAssemblyComponentUsage_WorksWithBothTypes)
{
// Create QuantifiedAssemblyComponentUsage
Handle(StepRepr_QuantifiedAssemblyComponentUsage) aUsage =
new StepRepr_QuantifiedAssemblyComponentUsage();
// Test with MeasureWithUnit
// Use proper function signature for Init
Standard_Boolean hasDescription = Standard_True;
Standard_Boolean hasReferenceDesignator = Standard_True;
aUsage->Init(myName,
myName,
hasDescription,
myDescription,
myProductDefinition,
myProductDefinition,
hasReferenceDesignator,
myName,
myMeasureWithUnit);
EXPECT_FALSE(aUsage->Quantity().IsNull());
EXPECT_TRUE(aUsage->Quantity()->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)));
Handle(StepBasic_MeasureWithUnit) aMeasure =
Handle(StepBasic_MeasureWithUnit)::DownCast(aUsage->Quantity());
EXPECT_FALSE(aMeasure.IsNull());
EXPECT_NEAR(aMeasure->ValueComponent(), 5.0, 1e-7);
// Test with ReprItemAndMeasureWithUnit
aUsage->SetQuantity(myReprItemAndMeasureWithUnit);
EXPECT_FALSE(aUsage->Quantity().IsNull());
EXPECT_TRUE(aUsage->Quantity()->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)));
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasure =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aUsage->Quantity());
EXPECT_FALSE(aReprMeasure.IsNull());
Handle(StepBasic_MeasureWithUnit) aExtractedMeasure = aReprMeasure->GetMeasureWithUnit();
EXPECT_NEAR(aExtractedMeasure->ValueComponent(), 10.0, 1e-7);
}
// Test MeasureQualification with different transient types
TEST_F(StepTransientReplacements, MeasureQualification_WorksWithBothTypes)
{
// Create MeasureQualification
Handle(StepShape_MeasureQualification) aQualification = new StepShape_MeasureQualification();
// Test with MeasureWithUnit
aQualification->Init(myName, myDescription, myMeasureWithUnit, myQualifiers);
EXPECT_FALSE(aQualification->QualifiedMeasure().IsNull());
EXPECT_TRUE(aQualification->QualifiedMeasure()->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)));
Handle(StepBasic_MeasureWithUnit) aMeasure =
Handle(StepBasic_MeasureWithUnit)::DownCast(aQualification->QualifiedMeasure());
EXPECT_FALSE(aMeasure.IsNull());
EXPECT_NEAR(aMeasure->ValueComponent(), 5.0, 1e-7);
// Test with ReprItemAndMeasureWithUnit
aQualification->SetQualifiedMeasure(myReprItemAndMeasureWithUnit);
EXPECT_FALSE(aQualification->QualifiedMeasure().IsNull());
EXPECT_TRUE(
aQualification->QualifiedMeasure()->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)));
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasure =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aQualification->QualifiedMeasure());
EXPECT_FALSE(aReprMeasure.IsNull());
Handle(StepBasic_MeasureWithUnit) aExtractedMeasure = aReprMeasure->GetMeasureWithUnit();
EXPECT_NEAR(aExtractedMeasure->ValueComponent(), 10.0, 1e-7);
}
// Test GetMeasureWithUnit helper function from STEPCAFControl_Reader namespace
TEST_F(StepTransientReplacements, GetMeasureWithUnit_ExtractsCorrectly)
{
// This tests the helper function that was added in STEPCAFControl_Reader.cxx
// We recreate the function here for testing
auto GetMeasureWithUnit =
[](const Handle(Standard_Transient)& theMeasure) -> Handle(StepBasic_MeasureWithUnit) {
if (theMeasure.IsNull())
{
return nullptr;
}
Handle(StepBasic_MeasureWithUnit) aMeasureWithUnit;
if (theMeasure->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
{
aMeasureWithUnit = Handle(StepBasic_MeasureWithUnit)::DownCast(theMeasure);
}
else if (theMeasure->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(theMeasure);
aMeasureWithUnit = aReprMeasureItem->GetMeasureWithUnit();
}
return aMeasureWithUnit;
};
// Test with null
Handle(Standard_Transient) aNullTransient;
Handle(StepBasic_MeasureWithUnit) aExtracted = GetMeasureWithUnit(aNullTransient);
EXPECT_TRUE(aExtracted.IsNull());
// Test with MeasureWithUnit
aExtracted = GetMeasureWithUnit(myMeasureWithUnit);
EXPECT_FALSE(aExtracted.IsNull());
EXPECT_NEAR(aExtracted->ValueComponent(), 5.0, 1e-7);
// Test with ReprItemAndMeasureWithUnit
aExtracted = GetMeasureWithUnit(myReprItemAndMeasureWithUnit);
EXPECT_FALSE(aExtracted.IsNull());
EXPECT_NEAR(aExtracted->ValueComponent(), 10.0, 1e-7);
// Test with unrelated type
Handle(Standard_Transient) anUnrelatedTransient = myName;
aExtracted = GetMeasureWithUnit(anUnrelatedTransient);
EXPECT_TRUE(aExtracted.IsNull());
}

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx
View File

@@ -52,13 +52,13 @@ void RWStepBasic_RWConversionBasedUnit::ReadStep(
// --- own field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
Handle(Standard_Transient) aConversionFactor;
// szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
data->ReadEntity(num,
3,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
//--- Initialisation of the read entity ---

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx
View File

@@ -43,12 +43,12 @@ void RWStepBasic_RWConversionBasedUnitAndAreaUnit::ReadStep(
data->ReadString(num, 1, "name", ach, aName);
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity(num,
2,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
num = data->NextForComplex(num);

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx
View File

@@ -44,13 +44,13 @@ void RWStepBasic_RWConversionBasedUnitAndLengthUnit::ReadStep(
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
Handle(Standard_Transient) aConversionFactor;
// szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num,
2,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
num = data->NextForComplex(num);

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx
View File

@@ -43,13 +43,13 @@ 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;
Handle(Standard_Transient) aConversionFactor;
// szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num,
2,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
num = data->NextForComplex(num);

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx
View File

@@ -42,12 +42,12 @@ void RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::ReadStep(
return;
Handle(TCollection_HAsciiString) aName;
data->ReadString(num, 1, "name", ach, aName);
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity(num,
2,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
// NAMED_UNIT

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx
View File

@@ -44,13 +44,13 @@ void RWStepBasic_RWConversionBasedUnitAndRatioUnit::ReadStep(
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
Handle(Standard_Transient) aConversionFactor;
// szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num,
2,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
num = data->NextForComplex(num);

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx
View File

@@ -47,13 +47,13 @@ void RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::ReadStep(
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
Handle(Standard_Transient) aConversionFactor;
// szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num,
2,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
num = data->NextForComplex(num);

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx
View File

@@ -44,13 +44,13 @@ void RWStepBasic_RWConversionBasedUnitAndTimeUnit::ReadStep(
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
Handle(Standard_Transient) aConversionFactor;
// szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num,
2,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
num = data->NextForComplex(num);

4
src/DataExchange/TKDESTEP/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx
View File

@@ -38,12 +38,12 @@ void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::ReadStep(
data->ReadString(num, 1, "name", ach, aName);
// --- field : conversionFactor ---
Handle(StepBasic_MeasureWithUnit) aConversionFactor;
Handle(Standard_Transient) aConversionFactor;
data->ReadEntity(num,
2,
"conversion_factor",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aConversionFactor);
num = data->NextForComplex(num);

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx
View File

@@ -49,12 +49,12 @@ void RWStepDimTol_RWAngularityTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx
View File

@@ -49,12 +49,12 @@ void RWStepDimTol_RWCircularRunoutTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx
View File

@@ -49,12 +49,12 @@ void RWStepDimTol_RWCoaxialityTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx
View File

@@ -49,12 +49,12 @@ void RWStepDimTol_RWConcentricityTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx
View File

@@ -47,12 +47,12 @@ void RWStepDimTol_RWCylindricityTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx
View File

@@ -47,12 +47,12 @@ void RWStepDimTol_RWFlatnessTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx
View File

@@ -51,12 +51,12 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
View File

@@ -49,12 +49,12 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit::ReadStep(
Handle(TCollection_HAsciiString) aDescription;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
Handle(Standard_Transient) aMagnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx
View File

@@ -48,12 +48,12 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedUnit::ReadStep(
Handle(TCollection_HAsciiString) aDescription;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
Handle(Standard_Transient) aMagnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
View File

@@ -50,12 +50,12 @@ void RWStepDimTol_RWGeometricToleranceWithMaximumTolerance::ReadStep(
Handle(TCollection_HAsciiString) aDescription;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
Handle(Standard_Transient) aMagnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx
View File

@@ -47,12 +47,12 @@ void RWStepDimTol_RWGeometricToleranceWithModifiers::ReadStep(
Handle(TCollection_HAsciiString) aDescription;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aDescription);
Handle(StepBasic_MeasureWithUnit) aMagnitude;
Handle(Standard_Transient) aMagnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aMagnitude);
StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx
View File

@@ -46,12 +46,12 @@ void RWStepDimTol_RWLineProfileTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx
View File

@@ -46,12 +46,12 @@ void RWStepDimTol_RWModifiedGeometricTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx
View File

@@ -47,12 +47,12 @@ void RWStepDimTol_RWParallelismTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx
View File

@@ -47,12 +47,12 @@ void RWStepDimTol_RWPerpendicularityTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx
View File

@@ -46,12 +46,12 @@ void RWStepDimTol_RWPositionTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx
View File

@@ -46,12 +46,12 @@ void RWStepDimTol_RWRoundnessTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx
View File

@@ -46,12 +46,12 @@ void RWStepDimTol_RWStraightnessTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx
View File

@@ -46,12 +46,12 @@ void RWStepDimTol_RWSurfaceProfileTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx
View File

@@ -47,12 +47,12 @@ void RWStepDimTol_RWSymmetryTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx
View File

@@ -47,12 +47,12 @@ void RWStepDimTol_RWTotalRunoutTolerance::ReadStep(
Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
data->ReadString(num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
Handle(Standard_Transient) aGeometricTolerance_Magnitude;
data->ReadEntity(num,
3,
"geometric_tolerance.magnitude",
ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),
STANDARD_TYPE(Standard_Transient),
aGeometricTolerance_Magnitude);
StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;

4
src/DataExchange/TKDESTEP/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
View File

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

4
src/DataExchange/TKDESTEP/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx
View File

@@ -91,8 +91,8 @@ void RWStepRepr_RWMakeFromUsageOption::ReadStep(
Handle(TCollection_HAsciiString) aRankingRationale;
data->ReadString(num, 7, "ranking_rationale", ach, aRankingRationale);
Handle(StepBasic_MeasureWithUnit) aQuantity;
data->ReadEntity(num, 8, "quantity", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aQuantity);
Handle(Standard_Transient) aQuantity;
data->ReadEntity(num, 8, "quantity", ach, STANDARD_TYPE(Standard_Transient), aQuantity);
// Initialize entity
ent->Init(aProductDefinitionRelationship_Id,

4
src/DataExchange/TKDESTEP/RWStepRepr/RWStepRepr_RWParallelOffset.cxx
View File

@@ -65,8 +65,8 @@ void RWStepRepr_RWParallelOffset::ReadStep(const Handle(StepData_StepReaderData)
// Own fields of ParallelOffset
Handle(StepBasic_MeasureWithUnit) anOffset;
data->ReadEntity(num, 5, "offset", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), anOffset);
Handle(Standard_Transient) anOffset;
data->ReadEntity(num, 5, "offset", ach, STANDARD_TYPE(Standard_Transient), anOffset);
// Initialize entity
ent->Init(aShapeAspect_Name,

4
src/DataExchange/TKDESTEP/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
View File

@@ -102,8 +102,8 @@ void RWStepRepr_RWQuantifiedAssemblyComponentUsage::ReadStep(
// Own fields of QuantifiedAssemblyComponentUsage
Handle(StepBasic_MeasureWithUnit) aQuantity;
data->ReadEntity(num, 7, "quantity", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aQuantity);
Handle(Standard_Transient) aQuantity;
data->ReadEntity(num, 7, "quantity", ach, STANDARD_TYPE(Standard_Transient), aQuantity);
// Initialize entity
ent->Init(aProductDefinitionRelationship_Id,

4
src/DataExchange/TKDESTEP/RWStepShape/RWStepShape_RWMeasureQualification.cxx
View File

@@ -47,8 +47,8 @@ void RWStepShape_RWMeasureQualification::ReadStep(
// --- own field : qualified_measure ---
Handle(StepBasic_MeasureWithUnit) aQM;
data->ReadEntity(num, 3, "qualified_measure", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aQM);
Handle(Standard_Transient) aQM;
data->ReadEntity(num, 3, "qualified_measure", ach, STANDARD_TYPE(Standard_Transient), aQM);
// --- own field : qualifiers ---

57
src/DataExchange/TKDESTEP/RWStepShape/RWStepShape_RWToleranceValue.cxx
View File

@@ -34,63 +34,18 @@ void RWStepShape_RWToleranceValue::ReadStep(const Handle(StepData_StepReaderData
// --- own field : lower_bound ---
Handle(Standard_Transient) LB;
if (!data->ReadEntity(num, 1, "lower_bound", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), LB))
{
Handle(StepRepr_MeasureRepresentationItem) aMSR;
Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU;
if (data->ReadEntity(num,
1,
"lower_bound",
ach,
STANDARD_TYPE(StepRepr_MeasureRepresentationItem),
aMSR)
|| data->ReadEntity(num,
1,
"lower_bound",
ach,
STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit),
aRIMU))
{
if (!aMSR.IsNull())
LB = aMSR;
else if (!aRIMU.IsNull())
LB = aRIMU;
}
}
Handle(Standard_Transient) aLowerBound;
data->ReadEntity(num, 1, "lower_bound", ach, STANDARD_TYPE(Standard_Transient), aLowerBound);
// --- own field : upper_bound ---
Handle(Standard_Transient) UB;
if (!data->ReadEntity(num, 2, "upper_bound", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), UB))
{
Handle(StepRepr_MeasureRepresentationItem) aMSR1;
Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
if (data->ReadEntity(num,
2,
"upper_bound",
ach,
STANDARD_TYPE(StepRepr_MeasureRepresentationItem),
aMSR1)
|| data->ReadEntity(num,
2,
"upper_bound",
ach,
STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit),
aRIMU1))
{
if (!aMSR1.IsNull())
UB = aMSR1;
else if (!aRIMU1.IsNull())
UB = aRIMU1;
}
}
Handle(Standard_Transient) anUpperBound;
data->ReadEntity(num, 2, "upper_bound", ach, STANDARD_TYPE(Standard_Transient), anUpperBound);
//--- Initialisation of the read entity ---
if (!LB.IsNull() && !UB.IsNull())
if (!aLowerBound.IsNull() && !anUpperBound.IsNull())
ach->ClearFails();
ent->Init(LB, UB);
ent->Init(aLowerBound, anUpperBound);
}
void RWStepShape_RWToleranceValue::WriteStep(StepData_StepWriter& SW,

107
src/DataExchange/TKDESTEP/STEPCAFControl/STEPCAFControl_Reader.cxx
View File

@@ -247,36 +247,36 @@
#include <Bnd_Box.hxx>
#include <BRepBndLib.hxx>
// skl 21.08.2003 for reading G&DT
// #include <StepRepr_CompoundItemDefinition.hxx>
// #include <StepRepr_CompoundItemDefinitionMember.hxx>
// #include <StepBasic_ConversionBasedUnit.hxx>
// #include <TDataStd_Real.hxx>
// #include <TDataStd_Constraint.hxx>
// #include <TDataStd_ConstraintEnum.hxx>
// #include <TNaming_Tool.hxx>
// #include <AIS_InteractiveObject.hxx>
// #include <TPrsStd_ConstraintTools.hxx>
// #include <AIS_DiameterDimension.hxx>
// #include <TPrsStd_Position.hxx>
// #include <TPrsStd_AISPresentation.hxx>
// #include <TNaming_Builder.hxx>
#ifdef OCCT_DEBUG
//! Converts address of the passed shape (TShape) to string.
//! \param theShape [in] Shape to dump.
//! \return corresponding string.
TCollection_AsciiString AddrToString(const TopoDS_Shape& theShape)
namespace
{
std::string anAddrStr;
std::ostringstream ost;
ost << theShape.TShape().get();
anAddrStr = ost.str();
// Returns a MeasureWithUnit from the given Standard_Transient object.
// If the object is a StepRepr_ReprItemAndMeasureWithUnit, it retrieves
// the MeasureWithUnit from it. If it is a StepBasic_MeasureWithUnit,
// it returns it directly. If the object is neither, it returns a null handle.
// @param theMeasure The Standard_Transient object to check.
// @return Handle to StepBasic_MeasureWithUnit if found, otherwise null handle.
static Handle(StepBasic_MeasureWithUnit) GetMeasureWithUnit(
const Handle(Standard_Transient)& theMeasure)
{
if (theMeasure.IsNull())
{
return nullptr;
}
TCollection_AsciiString aStr = TCollection_AsciiString("[").Cat(anAddrStr.c_str()).Cat("]");
return aStr;
Handle(StepBasic_MeasureWithUnit) aMeasureWithUnit;
if (theMeasure->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
{
aMeasureWithUnit = Handle(StepBasic_MeasureWithUnit)::DownCast(theMeasure);
}
else if (theMeasure->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(theMeasure);
aMeasureWithUnit = aReprMeasureItem->GetMeasureWithUnit();
}
return aMeasureWithUnit;
}
#endif
} // namespace
//=================================================================================================
@@ -1991,7 +1991,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs(
{
if (style != aHSeqOfInvisStyle->Value(si))
continue;
// found that current style is invisible.
// found that current style is invisible.
#ifdef OCCT_DEBUG
std::cout << "Warning: item No " << i << "(" << style->Item()->DynamicType()->Name()
<< ") is invisible" << std::endl;
@@ -2091,7 +2091,7 @@ static Standard_Boolean GetMassConversionFactor(const Handle(StepBasic_NamedUnit
return Standard_False;
Handle(StepBasic_ConversionBasedUnitAndMassUnit) CBUMU =
Handle(StepBasic_ConversionBasedUnitAndMassUnit)::DownCast(NU);
Handle(StepBasic_MeasureWithUnit) MWUCBU = CBUMU->ConversionFactor();
Handle(StepBasic_MeasureWithUnit) MWUCBU = GetMeasureWithUnit(CBUMU->ConversionFactor());
afact = MWUCBU->ValueComponent();
StepBasic_Unit anUnit2 = MWUCBU->UnitComponent();
if (anUnit2.CaseNum(anUnit2.Value()) == 1)
@@ -3680,12 +3680,11 @@ TDF_Label STEPCAFControl_Reader::createGDTObjectInXCAF(const Handle(Standard_Tra
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();
Handle(StepBasic_MeasureWithUnit) dim3 = GetMeasureWithUnit(GT->Magnitude());
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))
@@ -4136,15 +4135,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
Handle(Standard_Transient) aUpperBound = aTV->UpperBound();
if (aUpperBound.IsNull())
continue;
Handle(StepBasic_MeasureWithUnit) aMWU;
if (aUpperBound->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aUpperBound);
else if (aUpperBound->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aUpperBound);
aMWU = aReprMeasureItem->GetMeasureWithUnit();
}
Handle(StepBasic_MeasureWithUnit) aMWU = GetMeasureWithUnit(aUpperBound);
if (aMWU.IsNull())
continue;
Standard_Real aVal = aMWU->ValueComponent();
@@ -4173,14 +4164,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
if (aLowerBound.IsNull())
continue;
if (aLowerBound->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aLowerBound);
else if (aLowerBound->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aLowerBound);
aMWU = aReprMeasureItem->GetMeasureWithUnit();
}
aMWU = GetMeasureWithUnit(aLowerBound);
if (aMWU.IsNull())
continue;
@@ -4550,17 +4534,20 @@ static void setGeomTolObjectToXCAF(const Handle(Standard_Transient)& theEnt,
if (!aTolEnt->Magnitude().IsNull())
{
// get value
Standard_Real aVal = aTolEnt->Magnitude()->ValueComponent();
StepBasic_Unit anUnit = aTolEnt->Magnitude()->UnitComponent();
if (anUnit.IsNull())
return;
if (!(anUnit.CaseNum(anUnit.Value()) == 1))
return;
Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
STEPConstruct_UnitContext anUnitCtx;
anUnitCtx.ComputeFactors(NU, theLocalFactors);
aVal = aVal * anUnitCtx.LengthFactor();
aTolObj->SetValue(aVal);
if (Handle(StepBasic_MeasureWithUnit) aMWU = GetMeasureWithUnit(aTolEnt->Magnitude()))
{
Standard_Real aVal = aMWU->ValueComponent();
StepBasic_Unit anUnit = aMWU->UnitComponent();
if (anUnit.IsNull())
return;
if (!(anUnit.CaseNum(anUnit.Value()) == 1))
return;
Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
STEPConstruct_UnitContext anUnitCtx;
anUnitCtx.ComputeFactors(NU, theLocalFactors);
aVal = aVal * anUnitCtx.LengthFactor();
aTolObj->SetValue(aVal);
}
}
// get modifiers
XCAFDimTolObjects_GeomToleranceTypeValue aTypeV = XCAFDimTolObjects_GeomToleranceTypeValue_None;

73
src/DataExchange/TKDESTEP/STEPConstruct/STEPConstruct_UnitContext.cxx
View File

@@ -38,6 +38,7 @@
#include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
#include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
#include <StepRepr_GlobalUnitAssignedContext.hxx>
#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
#include <TCollection_HAsciiString.hxx>
//=================================================================================================
@@ -284,10 +285,6 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(
if (aContext.IsNull())
{
#ifdef OCCT_DEBUG
std::cout << " -- STEPConstruct_UnitContext:ComputeFactor, Context undefined -> default"
<< std::endl;
#endif
return 1;
}
@@ -299,15 +296,12 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(
{
Handle(StepBasic_NamedUnit) theNamedUnit = aContext->UnitsValue(i);
status = ComputeFactors(theNamedUnit, theLocalFactors);
#ifdef OCCT_DEBUG
if (status == -1)
std::cout << " -- STEPConstruct_UnitContext:ComputeFactor: Unit item no." << i
<< " is not recognized" << std::endl;
#endif
}
return status;
}
//=================================================================================================
Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasic_NamedUnit)& aUnit,
const StepData_Factors& theLocalFactors)
{
@@ -326,28 +320,33 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
{
Handle(StepBasic_ConversionBasedUnit) theCBU =
Handle(StepBasic_ConversionBasedUnit)::DownCast(aUnit);
// Handle(StepBasic_DimensionalExponents) theDimExp = theCBU->Dimensions();
Handle(StepBasic_MeasureWithUnit) theMWU;
Handle(StepBasic_MeasureWithUnit) aMWU;
if (!theCBU.IsNull())
{
theMWU = theCBU->ConversionFactor();
Handle(Standard_Transient) aConvFactor = theCBU->ConversionFactor();
if (aConvFactor->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
{
aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aConvFactor);
}
else if (aConvFactor->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aConvFactor);
aMWU = aReprMeasureItem->GetMeasureWithUnit();
}
// sln 8.10.2001: the case of unrecognized entity
if (theMWU.IsNull())
if (aMWU.IsNull())
{
return -1;
// if (!theMWU->IsKind(STANDARD_TYPE(StepBasic_LengthMeasureWithUnit))) { gka
// return 2;
// }
Handle(StepBasic_NamedUnit) theTargetUnit = theMWU->UnitComponent().NamedUnit();
// StepBasic_Unit theTargetUnit = theMWU->UnitComponent();
Standard_Real theSIPFactor = 1.;
}
Handle(StepBasic_NamedUnit) theTargetUnit = aMWU->UnitComponent().NamedUnit();
Standard_Real theSIPFactor = 1.;
//: f5 abv 24 Apr 98: ProSTEP TR8 tr8_bv1_tc: INCHES
// gka Handle(StepBasic_SiUnitAndLengthUnit) theSUALU =
// Handle(StepBasic_SiUnitAndLengthUnit)::DownCast(theTargetUnit);
// Handle(StepBasic_SiUnit) theSIU;
// if ( ! theSUALU.IsNull() ) theSIU = Handle(StepBasic_SiUnit)::DownCast(theSUALU);
Handle(StepBasic_SiUnit) theSIU = // f5
Handle(StepBasic_SiUnit)::DownCast(theTargetUnit); // f5
Handle(StepBasic_SiUnit) theSIU = Handle(StepBasic_SiUnit)::DownCast(theTargetUnit);
if (!theSIU.IsNull())
{
@@ -360,15 +359,12 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
// Treat the SiUnitName
if (!SiUnitNameFactor(theSIU, theSIUNF))
status = 11; // et continue
// std::cout << "The SiUnitNameFactor is :";
// std::cout << theSIUNF << std::endl;
}
else
{
// std::cout << "Recursive algo required - Aborted" << std::endl;
return 3;
}
Standard_Real theMVAL = theMWU->ValueComponent();
Standard_Real theMVAL = aMWU->ValueComponent();
theFactor = theSIPFactor * theMVAL; // * theSIUNF * pow(10.,theLExp)
}
parameter = theFactor;
@@ -379,9 +375,6 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
else
{
status = 14;
#ifdef OCCT_DEBUG
std::cout << "Error in the file : parameter double defined" << std::endl;
#endif
}
}
else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnit)))
@@ -409,18 +402,12 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
else
{
status = 14;
#ifdef OCCT_DEBUG
std::cout << "Error in the file : parameter double defined" << std::endl;
#endif
}
}
// Defining a type of unit
if (!parameterDone)
{
#ifdef OCCT_DEBUG
std::cout << "Unit Type not implemented" << std::endl;
#endif
return 0;
}
@@ -438,9 +425,6 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
else
{
status = 14;
#ifdef OCCT_DEBUG
std::cout << "Error in the file : LengthFactor double defined" << std::endl;
#endif
}
} // end of LengthUnit
else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndPlaneAngleUnit))
@@ -503,9 +487,6 @@ Standard_Integer STEPConstruct_UnitContext::ComputeTolerance(
Handle(StepBasic_UncertaintyMeasureWithUnit) aUMWU = aContext->UncertaintyValue(un);
if (aUMWU.IsNull())
{
#ifdef OCCT_DEBUG
std::cout << "BAD Uncertainty Measure with Units, n0." << un << std::endl;
#endif
continue;
}
// Decode the associated Unit
@@ -540,10 +521,6 @@ Standard_Integer STEPConstruct_UnitContext::ComputeTolerance(
}
}
#ifdef OCCT_DEBUG
if (hasUncertainty)
std::cout << "UNCERTAINTY read as " << theUncertainty << std::endl;
#endif
return status;
}

14
src/DataExchange/TKDESTEP/STEPControl/STEPControl_Reader.cxx
View File

@@ -49,6 +49,7 @@
#include <StepRepr_RepresentationMap.hxx>
#include <StepRepr_RepresentationRelationship.hxx>
#include <StepRepr_ShapeAspect.hxx>
#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
#include <StepShape_ManifoldSolidBrep.hxx>
#include <StepShape_ShapeDefinitionRepresentation.hxx>
#include <StepShape_ShapeRepresentation.hxx>
@@ -808,7 +809,18 @@ Standard_Boolean STEPControl_Reader::findUnits(
Standard_Real anUnitFact = 0;
if (!aConvUnit.IsNull())
{
Handle(StepBasic_MeasureWithUnit) aMeasWithUnit = aConvUnit->ConversionFactor();
Handle(StepBasic_MeasureWithUnit) aMeasWithUnit;
Handle(Standard_Transient) aConvFactor = aConvUnit->ConversionFactor();
if (aConvFactor->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
{
aMeasWithUnit = Handle(StepBasic_MeasureWithUnit)::DownCast(aConvFactor);
}
else if (aConvFactor->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aConvFactor);
aMeasWithUnit = aReprMeasureItem->GetMeasureWithUnit();
}
if (aMeasWithUnit.IsNull())
continue;

6
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnit.cxx
View File

@@ -22,7 +22,7 @@ StepBasic_ConversionBasedUnit::StepBasic_ConversionBasedUnit() {}
void StepBasic_ConversionBasedUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
const Handle(Standard_Transient)& aConversionFactor)
{
// --- classe own fields ---
name = aName;
@@ -42,12 +42,12 @@ Handle(TCollection_HAsciiString) StepBasic_ConversionBasedUnit::Name() const
}
void StepBasic_ConversionBasedUnit::SetConversionFactor(
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
const Handle(Standard_Transient)& aConversionFactor)
{
conversionFactor = aConversionFactor;
}
Handle(StepBasic_MeasureWithUnit) StepBasic_ConversionBasedUnit::ConversionFactor() const
Handle(Standard_Transient) StepBasic_ConversionBasedUnit::ConversionFactor() const
{
return conversionFactor;
}

11
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnit.hxx
View File

@@ -37,23 +37,22 @@ public:
Standard_EXPORT void Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
const Handle(Standard_Transient)& 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 Handle(Standard_Transient)& aConversionFactor);
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) ConversionFactor() const;
Standard_EXPORT Handle(Standard_Transient) ConversionFactor() const;
DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnit, StepBasic_NamedUnit)
protected:
private:
Handle(TCollection_HAsciiString) name;
Handle(StepBasic_MeasureWithUnit) conversionFactor;
Handle(TCollection_HAsciiString) name;
Handle(Standard_Transient) conversionFactor;
};
#endif // _StepBasic_ConversionBasedUnit_HeaderFile

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx
View File

@@ -26,7 +26,7 @@ StepBasic_ConversionBasedUnitAndLengthUnit::StepBasic_ConversionBasedUnitAndLeng
void StepBasic_ConversionBasedUnitAndLengthUnit::Init(
const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
const Handle(Standard_Transient)& aConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx
View File

@@ -38,7 +38,7 @@ public:
Standard_EXPORT void Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
const Handle(Standard_Transient)& aConversionFactor);
Standard_EXPORT void SetLengthUnit(const Handle(StepBasic_LengthUnit)& aLengthUnit);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx
View File

@@ -29,7 +29,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 Handle(Standard_Transient)& aConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx
View File

@@ -37,7 +37,7 @@ public:
Standard_EXPORT void Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
const Handle(Standard_Transient)& aConversionFactor);
Standard_EXPORT void SetMassUnit(const Handle(StepBasic_MassUnit)& aMassUnit);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx
View File

@@ -26,7 +26,7 @@ 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(Standard_Transient)& aConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx
View File

@@ -39,7 +39,7 @@ public:
Standard_EXPORT void Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
const Handle(Standard_Transient)& aConversionFactor);
Standard_EXPORT void SetPlaneAngleUnit(const Handle(StepBasic_PlaneAngleUnit)& aPlaneAngleUnit);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx
View File

@@ -25,7 +25,7 @@ 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(Standard_Transient)& aConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx
View File

@@ -38,7 +38,7 @@ public:
Standard_EXPORT void Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
const Handle(Standard_Transient)& aConversionFactor);
Standard_EXPORT void SetRatioUnit(const Handle(StepBasic_RatioUnit)& aRatioUnit);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx
View File

@@ -26,7 +26,7 @@ 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(Standard_Transient)& aConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx
View File

@@ -39,7 +39,7 @@ public:
Standard_EXPORT void Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
const Handle(Standard_Transient)& aConversionFactor);
Standard_EXPORT void SetSolidAngleUnit(const Handle(StepBasic_SolidAngleUnit)& aSolidAngleUnit);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx
View File

@@ -25,7 +25,7 @@ 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(Standard_Transient)& aConversionFactor)
{
// --- ANDOR component fields ---
StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);

2
src/DataExchange/TKDESTEP/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx
View File

@@ -38,7 +38,7 @@ public:
Standard_EXPORT void Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
const Handle(Standard_Transient)& aConversionFactor);
Standard_EXPORT void SetTimeUnit(const Handle(StepBasic_TimeUnit)& aTimeUnit);

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
View File

@@ -30,7 +30,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRef::StepDimTol_GeoTolAndGeoTolWthDatRef() {}
void StepDimTol_GeoTolAndGeoTolWthDatRef::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType)
@@ -48,7 +48,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRef::Init(
void StepDimTol_GeoTolAndGeoTolWthDatRef::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const StepDimTol_GeometricToleranceType theType)

11
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx
View File

@@ -24,7 +24,6 @@
class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithDatumReference;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
class StepDimTol_GeoTolAndGeoTolWthDatRef;
@@ -36,16 +35,16 @@ class StepDimTol_GeoTolAndGeoTolWthDatRef : public StepDimTol_GeometricTolerance
public:
Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthDatRef();
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_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 Handle(Standard_Transient)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const StepDimTol_GeometricToleranceType theType);

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
View File

@@ -36,7 +36,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::
void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -58,7 +58,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init(
void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,

11
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
View File

@@ -26,7 +26,6 @@ class StepDimTol_GeometricToleranceWithDatumReference;
class StepDimTol_GeometricToleranceWithModifiers;
class TCollection_HAsciiString;
class StepBasic_LengthMeasureWithUnit;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
DEFINE_STANDARD_HANDLE(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol,
@@ -39,10 +38,10 @@ class StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol
public:
Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol();
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
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 Handle(Standard_Transient)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
View File

@@ -35,7 +35,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::
void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -55,7 +55,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init(
void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,

11
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
View File

@@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithDatumReference;
class StepDimTol_GeometricToleranceWithModifiers;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
class StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod;
@@ -38,17 +37,17 @@ class StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod : public StepDimTol_Geo
public:
Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod();
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
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 Handle(Standard_Transient)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
View File

@@ -34,7 +34,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::
void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init(
const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const Handle(Standard_Transient)& aMagnitude,
const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)
@@ -52,7 +52,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 Handle(Standard_Transient)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)

11
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
View File

@@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceWithDatumReference;
class StepDimTol_ModifiedGeometricTolerance;
class StepDimTol_PositionTolerance;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
class StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol;
@@ -39,16 +38,16 @@ class StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol
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,
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(Standard_Transient)& 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 Handle(Standard_Transient)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
View File

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

11
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
View File

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

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
View File

@@ -31,7 +31,7 @@ StepDimTol_GeoTolAndGeoTolWthMaxTol::StepDimTol_GeoTolAndGeoTolWthMaxTol() {}
void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
@@ -51,7 +51,7 @@ void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init(
void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,

11
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx
View File

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

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
View File

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

11
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx
View File

@@ -24,7 +24,6 @@
class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithModifiers;
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
class StepDimTol_GeoTolAndGeoTolWthMod;
@@ -36,16 +35,16 @@ class StepDimTol_GeoTolAndGeoTolWthMod : public StepDimTol_GeometricTolerance
public:
Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthMod();
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
const StepDimTol_GeometricToleranceType theType);
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& aName,
const Handle(TCollection_HAsciiString)& aDescription,
const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
const Handle(Standard_Transient)& aMagnitude,
const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,
const StepDimTol_GeometricToleranceType theType);

15
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricTolerance.cxx
View File

@@ -32,7 +32,7 @@ StepDimTol_GeometricTolerance::StepDimTol_GeometricTolerance() {}
void StepDimTol_GeometricTolerance::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect)
{
@@ -48,10 +48,10 @@ void StepDimTol_GeometricTolerance::Init(
//=================================================================================================
void StepDimTol_GeometricTolerance::Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect)
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect)
{
myName = theName;
@@ -94,15 +94,14 @@ void StepDimTol_GeometricTolerance::SetDescription(
//=================================================================================================
Handle(StepBasic_MeasureWithUnit) StepDimTol_GeometricTolerance::Magnitude() const
Handle(Standard_Transient) StepDimTol_GeometricTolerance::Magnitude() const
{
return myMagnitude;
}
//=================================================================================================
void StepDimTol_GeometricTolerance::SetMagnitude(
const Handle(StepBasic_MeasureWithUnit)& theMagnitude)
void StepDimTol_GeometricTolerance::SetMagnitude(const Handle(Standard_Transient)& theMagnitude)
{
myMagnitude = theMagnitude;
}

17
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricTolerance.hxx
View File

@@ -22,7 +22,6 @@
#include <Standard_Transient.hxx>
#include <StepDimTol_GeometricToleranceTarget.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepRepr_ShapeAspect;
class StepDimTol_GeometricTolerance;
@@ -37,15 +36,15 @@ public:
Standard_EXPORT StepDimTol_GeometricTolerance();
//! 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);
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect);
//! Initialize all fields (own and inherited) AP242
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect);
//! Returns field Name
@@ -61,10 +60,10 @@ public:
Standard_EXPORT void SetDescription(const Handle(TCollection_HAsciiString)& theDescription);
//! Returns field Magnitude
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Magnitude() const;
Standard_EXPORT Handle(Standard_Transient) Magnitude() const;
//! Set field Magnitude
Standard_EXPORT void SetMagnitude(const Handle(StepBasic_MeasureWithUnit)& theMagnitude);
Standard_EXPORT void SetMagnitude(const Handle(Standard_Transient)& theMagnitude);
//! Returns field TolerancedShapeAspect
//! Note: in AP214(203) type of this attribute can be only StepRepr_ShapeAspect
@@ -84,7 +83,7 @@ protected:
private:
Handle(TCollection_HAsciiString) myName;
Handle(TCollection_HAsciiString) myDescription;
Handle(StepBasic_MeasureWithUnit) myMagnitude;
Handle(Standard_Transient) myMagnitude;
StepDimTol_GeometricToleranceTarget myTolerancedShapeAspect;
};

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
View File

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

5
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx
View File

@@ -23,7 +23,6 @@
#include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
#include <StepDimTol_GeometricTolerance.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepDimTol_GeometricToleranceTarget;
class StepRepr_ShapeAspect;
@@ -43,7 +42,7 @@ public:
Standard_EXPORT void Init(
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const Handle(StepRepr_ShapeAspect)& theGeometricTolerance_TolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfDatumReference)& theDatumSystem);
@@ -51,7 +50,7 @@ public:
Standard_EXPORT void Init(
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const StepDimTol_GeometricToleranceTarget& theGeometricTolerance_TolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfDatumSystemOrReference)& theDatumSystem);

2
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx
View File

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

2
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
View File

@@ -43,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 Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize,
const StepDimTol_AreaUnitType theAreaType,

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx
View File

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

4
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
View File

@@ -40,14 +40,14 @@ public:
//! Initialize all fields (own and inherited) AP214
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
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 Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize);

2
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx
View File

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

2
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
View File

@@ -43,7 +43,7 @@ public:
Standard_EXPORT void Init(
const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers,
const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize);

2
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx
View File

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

3
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
View File

@@ -23,7 +23,6 @@
#include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepDimTol_GeometricToleranceTarget;
class StepDimTol_GeometricToleranceWithModifiers;
@@ -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 Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers);

12
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
View File

@@ -30,11 +30,11 @@ StepDimTol_ModifiedGeometricTolerance::StepDimTol_ModifiedGeometricTolerance() {
//=================================================================================================
void StepDimTol_ModifiedGeometricTolerance::Init(
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude,
const Handle(StepRepr_ShapeAspect)& theGeometricTolerance_TolerancedShapeAspect,
const StepDimTol_LimitCondition theModifier)
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const Handle(StepRepr_ShapeAspect)& theGeometricTolerance_TolerancedShapeAspect,
const StepDimTol_LimitCondition theModifier)
{
StepDimTol_GeometricTolerance::Init(theGeometricTolerance_Name,
theGeometricTolerance_Description,
@@ -49,7 +49,7 @@ void StepDimTol_ModifiedGeometricTolerance::Init(
void StepDimTol_ModifiedGeometricTolerance::Init(
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name,
const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description,
const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude,
const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
const StepDimTol_GeometricToleranceTarget& theGeometricTolerance_TolerancedShapeAspect,
const StepDimTol_LimitCondition theModifier)
{

13
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx
View File

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

2
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx
View File

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

2
src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
View File

@@ -40,7 +40,7 @@ public:
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
const Handle(Standard_Transient)& theMagnitude,
const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
const Handle(StepBasic_LengthMeasureWithUnit)& theDisplacement);

20
src/DataExchange/TKDESTEP/StepRepr/StepRepr_MakeFromUsageOption.cxx
View File

@@ -36,10 +36,10 @@ void StepRepr_MakeFromUsageOption::Init(
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)
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer aRanking,
const Handle(TCollection_HAsciiString)& aRankingRationale,
const Handle(Standard_Transient)& aQuantity)
{
StepRepr_ProductDefinitionUsage::Init(aProductDefinitionRelationship_Id,
aProductDefinitionRelationship_Name,
@@ -65,10 +65,10 @@ void StepRepr_MakeFromUsageOption::Init(
const StepBasic_ProductDefinitionOrReference&
aProductDefinitionRelationship_RelatingProductDefinition,
const StepBasic_ProductDefinitionOrReference&
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer aRanking,
const Handle(TCollection_HAsciiString)& aRankingRationale,
const Handle(StepBasic_MeasureWithUnit)& aQuantity)
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer aRanking,
const Handle(TCollection_HAsciiString)& aRankingRationale,
const Handle(Standard_Transient)& aQuantity)
{
StepRepr_ProductDefinitionUsage::Init(aProductDefinitionRelationship_Id,
aProductDefinitionRelationship_Name,
@@ -115,14 +115,14 @@ void StepRepr_MakeFromUsageOption::SetRankingRationale(
//=================================================================================================
Handle(StepBasic_MeasureWithUnit) StepRepr_MakeFromUsageOption::Quantity() const
Handle(Standard_Transient) StepRepr_MakeFromUsageOption::Quantity() const
{
return theQuantity;
}
//=================================================================================================
void StepRepr_MakeFromUsageOption::SetQuantity(const Handle(StepBasic_MeasureWithUnit)& aQuantity)
void StepRepr_MakeFromUsageOption::SetQuantity(const Handle(Standard_Transient)& aQuantity)
{
theQuantity = aQuantity;
}

15
src/DataExchange/TKDESTEP/StepRepr/StepRepr_MakeFromUsageOption.hxx
View File

@@ -22,7 +22,6 @@
#include <Standard_Integer.hxx>
#include <StepRepr_ProductDefinitionUsage.hxx>
class TCollection_HAsciiString;
class StepBasic_MeasureWithUnit;
class StepBasic_ProductDefinition;
class StepRepr_MakeFromUsageOption;
@@ -48,7 +47,7 @@ public:
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer aRanking,
const Handle(TCollection_HAsciiString)& aRankingRationale,
const Handle(StepBasic_MeasureWithUnit)& aQuantity);
const Handle(Standard_Transient)& aQuantity);
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init(
@@ -62,7 +61,7 @@ public:
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Integer aRanking,
const Handle(TCollection_HAsciiString)& aRankingRationale,
const Handle(StepBasic_MeasureWithUnit)& aQuantity);
const Handle(Standard_Transient)& aQuantity);
//! Returns field Ranking
Standard_EXPORT Standard_Integer Ranking() const;
@@ -78,18 +77,18 @@ public:
const Handle(TCollection_HAsciiString)& RankingRationale);
//! Returns field Quantity
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Quantity() const;
Standard_EXPORT Handle(Standard_Transient) Quantity() const;
//! Set field Quantity
Standard_EXPORT void SetQuantity(const Handle(StepBasic_MeasureWithUnit)& Quantity);
Standard_EXPORT void SetQuantity(const Handle(Standard_Transient)& Quantity);
DEFINE_STANDARD_RTTIEXT(StepRepr_MakeFromUsageOption, StepRepr_ProductDefinitionUsage)
protected:
private:
Standard_Integer theRanking;
Handle(TCollection_HAsciiString) theRankingRationale;
Handle(StepBasic_MeasureWithUnit) theQuantity;
Standard_Integer theRanking;
Handle(TCollection_HAsciiString) theRankingRationale;
Handle(Standard_Transient) theQuantity;
};
#endif // _StepRepr_MakeFromUsageOption_HeaderFile

2
src/DataExchange/TKDESTEP/StepRepr/StepRepr_ParallelOffset.cxx
View File

@@ -26,7 +26,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 Handle(Standard_Transient)& theOffset)
{
StepRepr_ShapeAspect::Init(theShapeAspect_Name,
theShapeAspect_Description,

9
src/DataExchange/TKDESTEP/StepRepr/StepRepr_ParallelOffset.hxx
View File

@@ -21,7 +21,6 @@
#include <StepRepr_DerivedShapeAspect.hxx>
#include <StepData_Logical.hxx>
class StepBasic_MeasureWithUnit;
class TCollection_HAsciiString;
class StepRepr_ProductDefinitionShape;
@@ -40,17 +39,17 @@ public:
const Handle(TCollection_HAsciiString)& theDescription,
const Handle(StepRepr_ProductDefinitionShape)& theOfShape,
const StepData_Logical theProductDefinitional,
const Handle(StepBasic_MeasureWithUnit)& theOffset);
const Handle(Standard_Transient)& theOffset);
//! Returns field Offset
inline Handle(StepBasic_MeasureWithUnit) Offset() const { return offset; }
inline Handle(Standard_Transient) Offset() const { return offset; }
//! Set field Offset
inline void SetOffset(const Handle(StepBasic_MeasureWithUnit)& theOffset) { offset = theOffset; }
inline void SetOffset(const Handle(Standard_Transient)& theOffset) { offset = theOffset; }
DEFINE_STANDARD_RTTIEXT(StepRepr_ParallelOffset, StepRepr_DerivedShapeAspect)
private:
Handle(StepBasic_MeasureWithUnit) offset;
Handle(Standard_Transient) offset;
};
#endif // _StepRepr_ParallelOffset_HeaderFile

20
src/DataExchange/TKDESTEP/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx
View File

@@ -37,10 +37,10 @@ void StepRepr_QuantifiedAssemblyComponentUsage::Init(
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)
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator,
const Handle(TCollection_HAsciiString)& aAssemblyComponentUsage_ReferenceDesignator,
const Handle(Standard_Transient)& aQuantity)
{
StepRepr_AssemblyComponentUsage::Init(aProductDefinitionRelationship_Id,
aProductDefinitionRelationship_Name,
@@ -64,10 +64,10 @@ void StepRepr_QuantifiedAssemblyComponentUsage::Init(
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)
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator,
const Handle(TCollection_HAsciiString)& aAssemblyComponentUsage_ReferenceDesignator,
const Handle(Standard_Transient)& aQuantity)
{
StepRepr_AssemblyComponentUsage::Init(aProductDefinitionRelationship_Id,
aProductDefinitionRelationship_Name,
@@ -83,7 +83,7 @@ void StepRepr_QuantifiedAssemblyComponentUsage::Init(
//=================================================================================================
Handle(StepBasic_MeasureWithUnit) StepRepr_QuantifiedAssemblyComponentUsage::Quantity() const
Handle(Standard_Transient) StepRepr_QuantifiedAssemblyComponentUsage::Quantity() const
{
return theQuantity;
}
@@ -91,7 +91,7 @@ Handle(StepBasic_MeasureWithUnit) StepRepr_QuantifiedAssemblyComponentUsage::Qua
//=================================================================================================
void StepRepr_QuantifiedAssemblyComponentUsage::SetQuantity(
const Handle(StepBasic_MeasureWithUnit)& aQuantity)
const Handle(Standard_Transient)& aQuantity)
{
theQuantity = aQuantity;
}

11
src/DataExchange/TKDESTEP/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx
View File

@@ -20,7 +20,6 @@
#include <Standard_Type.hxx>
#include <StepRepr_AssemblyComponentUsage.hxx>
class StepBasic_MeasureWithUnit;
class TCollection_HAsciiString;
class StepBasic_ProductDefinition;
@@ -47,7 +46,7 @@ public:
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator,
const Handle(TCollection_HAsciiString)& aAssemblyComponentUsage_ReferenceDesignator,
const Handle(StepBasic_MeasureWithUnit)& aQuantity);
const Handle(Standard_Transient)& aQuantity);
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init(
@@ -61,20 +60,20 @@ public:
aProductDefinitionRelationship_RelatedProductDefinition,
const Standard_Boolean hasAssemblyComponentUsage_ReferenceDesignator,
const Handle(TCollection_HAsciiString)& aAssemblyComponentUsage_ReferenceDesignator,
const Handle(StepBasic_MeasureWithUnit)& aQuantity);
const Handle(Standard_Transient)& aQuantity);
//! Returns field Quantity
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Quantity() const;
Standard_EXPORT Handle(Standard_Transient) Quantity() const;
//! Set field Quantity
Standard_EXPORT void SetQuantity(const Handle(StepBasic_MeasureWithUnit)& Quantity);
Standard_EXPORT void SetQuantity(const Handle(Standard_Transient)& Quantity);
DEFINE_STANDARD_RTTIEXT(StepRepr_QuantifiedAssemblyComponentUsage,
StepRepr_AssemblyComponentUsage)
protected:
private:
Handle(StepBasic_MeasureWithUnit) theQuantity;
Handle(Standard_Transient) theQuantity;
};
#endif // _StepRepr_QuantifiedAssemblyComponentUsage_HeaderFile

6
src/DataExchange/TKDESTEP/StepShape/StepShape_MeasureQualification.cxx
View File

@@ -23,7 +23,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 Handle(Standard_Transient)& qualified_measure,
const Handle(StepShape_HArray1OfValueQualifier)& qualifiers)
{
theName = name;
@@ -53,13 +53,13 @@ void StepShape_MeasureQualification::SetDescription(
theDescription = description;
}
Handle(StepBasic_MeasureWithUnit) StepShape_MeasureQualification::QualifiedMeasure() const
Handle(Standard_Transient) StepShape_MeasureQualification::QualifiedMeasure() const
{
return theQualifiedMeasure;
}
void StepShape_MeasureQualification::SetQualifiedMeasure(
const Handle(StepBasic_MeasureWithUnit)& qualified_measure)
const Handle(Standard_Transient)& qualified_measure)
{
theQualifiedMeasure = qualified_measure;
}

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