Skip to content

Commit 6063eb4

Browse files
dpasukhidpasukhi
committed
Coding - Move StepData_ConfParameters to DESTEP package Open-Cascade-SAS#201
Replace StepData_ConfParameters with DESTEP_Parameters across multiple files. New location will help to keep any translate related stuff in one place for high level usage.
1 parent 427adb0 commit 6063eb4

20 files changed

+372
-330
lines changed

‎src/DESTEP/DESTEP_ConfigurationNode.cxx

+22-19
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ bool DESTEP_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe
5555
THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
5656

5757
InternalParameters.ReadBSplineContinuity =
58-
(StepData_ConfParameters::ReadMode_BSplineContinuity)theResource->IntegerVal(
58+
(DESTEP_Parameters::ReadMode_BSplineContinuity)theResource->IntegerVal(
5959
"read.iges.bspline.continuity",
6060
InternalParameters.ReadBSplineContinuity,
6161
aScope);
6262
InternalParameters.ReadPrecisionMode =
63-
(StepData_ConfParameters::ReadMode_Precision)
63+
(DESTEP_Parameters::ReadMode_Precision)
6464
theResource->IntegerVal("read.precision.mode", InternalParameters.ReadPrecisionMode, aScope);
6565
InternalParameters.ReadPrecisionVal =
6666
theResource->RealVal("read.precision.val", InternalParameters.ReadPrecisionVal, aScope);
6767
InternalParameters.ReadMaxPrecisionMode =
68-
(StepData_ConfParameters::ReadMode_MaxPrecision)theResource->IntegerVal(
68+
(DESTEP_Parameters::ReadMode_MaxPrecision)theResource->IntegerVal(
6969
"read.maxprecision.mode",
7070
InternalParameters.ReadMaxPrecisionMode,
7171
aScope);
@@ -76,16 +76,16 @@ bool DESTEP_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe
7676
InternalParameters.ReadSameParamMode,
7777
aScope);
7878
InternalParameters.ReadSurfaceCurveMode =
79-
(StepData_ConfParameters::ReadMode_SurfaceCurve)theResource->IntegerVal(
79+
(DESTEP_Parameters::ReadMode_SurfaceCurve)theResource->IntegerVal(
8080
"read.surfacecurve.mode",
8181
InternalParameters.ReadSurfaceCurveMode,
8282
aScope);
8383
InternalParameters.EncodeRegAngle =
8484
theResource->RealVal("read.encoderegularity.angle", InternalParameters.EncodeRegAngle, aScope);
8585
InternalParameters.AngleUnit =
86-
(StepData_ConfParameters::AngleUnitMode)theResource->IntegerVal("angleunit.mode",
87-
InternalParameters.AngleUnit,
88-
aScope);
86+
(DESTEP_Parameters::AngleUnitMode)theResource->IntegerVal("angleunit.mode",
87+
InternalParameters.AngleUnit,
88+
aScope);
8989

9090
InternalParameters.ReadResourceName =
9191
theResource->StringVal("read.resource.name", InternalParameters.ReadResourceName, aScope);
@@ -94,18 +94,19 @@ bool DESTEP_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe
9494
InternalParameters.ReadProductMode =
9595
theResource->BooleanVal("read.product.mode", InternalParameters.ReadProductMode, aScope);
9696
InternalParameters.ReadProductContext =
97-
(StepData_ConfParameters::ReadMode_ProductContext)theResource->IntegerVal(
97+
(DESTEP_Parameters::ReadMode_ProductContext)theResource->IntegerVal(
9898
"read.product.context",
9999
InternalParameters.ReadProductContext,
100100
aScope);
101101
InternalParameters.ReadShapeRepr =
102-
(StepData_ConfParameters::ReadMode_ShapeRepr)
103-
theResource->IntegerVal("read.shape.repr", InternalParameters.ReadShapeRepr, aScope);
102+
(DESTEP_Parameters::ReadMode_ShapeRepr)theResource->IntegerVal("read.shape.repr",
103+
InternalParameters.ReadShapeRepr,
104+
aScope);
104105
InternalParameters.ReadTessellated =
105-
(StepData_ConfParameters::RWMode_Tessellated)
106+
(DESTEP_Parameters::RWMode_Tessellated)
106107
theResource->IntegerVal("read.tessellated", InternalParameters.ReadTessellated, aScope);
107108
InternalParameters.ReadAssemblyLevel =
108-
(StepData_ConfParameters::ReadMode_AssemblyLevel)
109+
(DESTEP_Parameters::ReadMode_AssemblyLevel)
109110
theResource->IntegerVal("read.assembly.level", InternalParameters.ReadAssemblyLevel, aScope);
110111
InternalParameters.ReadRelationship =
111112
theResource->BooleanVal("read.shape.relationship", InternalParameters.ReadRelationship, aScope);
@@ -145,20 +146,22 @@ bool DESTEP_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe
145146
theResource->BooleanVal("read.metadata", InternalParameters.ReadMetadata, aScope);
146147

147148
InternalParameters.WritePrecisionMode =
148-
(StepData_ConfParameters::WriteMode_PrecisionMode)theResource->IntegerVal(
149+
(DESTEP_Parameters::WriteMode_PrecisionMode)theResource->IntegerVal(
149150
"write.precision.mode",
150151
InternalParameters.WritePrecisionMode,
151152
aScope);
152153
InternalParameters.WritePrecisionVal =
153154
theResource->RealVal("write.precision.val", InternalParameters.WritePrecisionVal, aScope);
154155
InternalParameters.WriteAssembly =
155-
(StepData_ConfParameters::WriteMode_Assembly)
156-
theResource->IntegerVal("write.assembly", InternalParameters.WriteAssembly, aScope);
156+
(DESTEP_Parameters::WriteMode_Assembly)theResource->IntegerVal("write.assembly",
157+
InternalParameters.WriteAssembly,
158+
aScope);
157159
InternalParameters.WriteSchema =
158-
(StepData_ConfParameters::WriteMode_StepSchema)
159-
theResource->IntegerVal("write.schema", InternalParameters.WriteSchema, aScope);
160+
(DESTEP_Parameters::WriteMode_StepSchema)theResource->IntegerVal("write.schema",
161+
InternalParameters.WriteSchema,
162+
aScope);
160163
InternalParameters.WriteTessellated =
161-
(StepData_ConfParameters::RWMode_Tessellated)
164+
(DESTEP_Parameters::RWMode_Tessellated)
162165
theResource->IntegerVal("write.tessellated", InternalParameters.WriteTessellated, aScope);
163166
InternalParameters.WriteProductName =
164167
theResource->StringVal("write.product.name", InternalParameters.WriteProductName, aScope);
@@ -175,7 +178,7 @@ bool DESTEP_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe
175178
InternalParameters.WriteSequence =
176179
theResource->StringVal("write.sequence", InternalParameters.WriteSequence, aScope);
177180
InternalParameters.WriteVertexMode =
178-
(StepData_ConfParameters::WriteMode_VertexMode)
181+
(DESTEP_Parameters::WriteMode_VertexMode)
179182
theResource->IntegerVal("write.vertex.mode", InternalParameters.WriteVertexMode, aScope);
180183
InternalParameters.WriteSubshapeNames =
181184
theResource->BooleanVal("write.stepcaf.subshapes.name",

‎src/DESTEP/DESTEP_ConfigurationNode.hxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#ifndef _DESTEP_ConfigurationNode_HeaderFile
1515
#define _DESTEP_ConfigurationNode_HeaderFile
1616

17+
#include <DESTEP_Parameters.hxx>
1718
#include <DE_ConfigurationNode.hxx>
1819
#include <Resource_FormatType.hxx>
1920
#include <STEPControl_StepModelType.hxx>
20-
#include <StepData_ConfParameters.hxx>
2121
#include <UnitsMethods_LengthUnit.hxx>
2222

2323
//! The purpose of this class is to configure the transfer process for STEP format
@@ -87,7 +87,7 @@ public:
8787
Standard_OVERRIDE;
8888

8989
public:
90-
StepData_ConfParameters InternalParameters;
90+
DESTEP_Parameters InternalParameters;
9191
};
9292

9393
#endif // _DESTEP_ConfigurationNode_HeaderFile

‎src/DESTEP/DESTEP_Parameters.cxx

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
// Copyright (c) 2023 OPEN CASCADE SAS
2+
//
3+
// This file is part of Open CASCADE Technology software library.
4+
//
5+
// This library is free software; you can redistribute it and/or modify it under
6+
// the terms of the GNU Lesser General Public License version 2.1 as published
7+
// by the Free Software Foundation, with special exception defined in the file
8+
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
9+
// distribution for complete text of the license and disclaimer of any warranty.
10+
//
11+
// Alternatively, this file may be used under the terms of Open CASCADE
12+
// commercial license or contractual agreement.
13+
14+
#include <Interface_Static.hxx>
15+
16+
#include <DESTEP_Parameters.hxx>
17+
18+
//=================================================================================================
19+
20+
DESTEP_Parameters::DESTEP_Parameters() {}
21+
22+
//=================================================================================================
23+
24+
void DESTEP_Parameters::InitFromStatic()
25+
{
26+
ReadBSplineContinuity = (DESTEP_Parameters::ReadMode_BSplineContinuity)Interface_Static::IVal(
27+
"read.iges.bspline.continuity");
28+
ReadPrecisionMode =
29+
(DESTEP_Parameters::ReadMode_Precision)Interface_Static::IVal("read.precision.mode");
30+
ReadPrecisionVal = Interface_Static::RVal("read.precision.val");
31+
ReadMaxPrecisionMode =
32+
(DESTEP_Parameters::ReadMode_MaxPrecision)Interface_Static::IVal("read.maxprecision.mode");
33+
ReadMaxPrecisionVal = Interface_Static::RVal("read.maxprecision.val");
34+
ReadSameParamMode = Interface_Static::IVal("read.stdsameparameter.mode") == 1;
35+
ReadSurfaceCurveMode =
36+
(DESTEP_Parameters::ReadMode_SurfaceCurve)Interface_Static::IVal("read.surfacecurve.mode");
37+
EncodeRegAngle = Interface_Static::RVal("read.encoderegularity.angle") * 180.0 / M_PI;
38+
AngleUnit = (DESTEP_Parameters::AngleUnitMode)Interface_Static::IVal("step.angleunit.mode");
39+
40+
ReadResourceName = Interface_Static::CVal("read.step.resource.name");
41+
ReadSequence = Interface_Static::CVal("read.step.sequence");
42+
ReadProductMode = Interface_Static::IVal("read.step.product.mode") == 1;
43+
ReadProductContext =
44+
(DESTEP_Parameters::ReadMode_ProductContext)Interface_Static::IVal("read.step.product.context");
45+
ReadShapeRepr =
46+
(DESTEP_Parameters::ReadMode_ShapeRepr)Interface_Static::IVal("read.step.shape.repr");
47+
ReadTessellated =
48+
(DESTEP_Parameters::RWMode_Tessellated)Interface_Static::IVal("read.step.tessellated");
49+
ReadAssemblyLevel =
50+
(DESTEP_Parameters::ReadMode_AssemblyLevel)Interface_Static::IVal("read.step.assembly.level");
51+
ReadRelationship = Interface_Static::IVal("read.step.shape.relationship") == 1;
52+
ReadShapeAspect = Interface_Static::IVal("read.step.shape.aspect") == 1;
53+
ReadConstrRelation = Interface_Static::IVal("read.step.constructivegeom.relationship") == 1;
54+
ReadSubshapeNames = Interface_Static::IVal("read.stepcaf.subshapes.name") == 1;
55+
ReadCodePage = (Resource_FormatType)Interface_Static::IVal("read.step.codepage");
56+
ReadNonmanifold = Interface_Static::IVal("read.step.nonmanifold") == 1;
57+
ReadIdeas = Interface_Static::IVal("read.step.ideas") == 1;
58+
ReadAllShapes = Interface_Static::IVal("read.step.all.shapes") == 1;
59+
ReadRootTransformation = Interface_Static::IVal("read.step.root.transformation") == 1;
60+
ReadColor = Interface_Static::IVal("read.color") == 1;
61+
ReadName = Interface_Static::IVal("read.name") == 1;
62+
ReadLayer = Interface_Static::IVal("read.layer") == 1;
63+
ReadProps = Interface_Static::IVal("read.props") == 1;
64+
ReadMetadata = Interface_Static::IVal("read.metadata") == 1;
65+
66+
WritePrecisionMode =
67+
(DESTEP_Parameters::WriteMode_PrecisionMode)Interface_Static::IVal("write.precision.mode");
68+
WritePrecisionVal = Interface_Static::RVal("write.precision.val");
69+
WriteAssembly =
70+
(DESTEP_Parameters::WriteMode_Assembly)Interface_Static::IVal("write.step.assembly");
71+
WriteSchema =
72+
(DESTEP_Parameters::WriteMode_StepSchema)Interface_Static::IVal("write.step.schema");
73+
WriteTessellated =
74+
(DESTEP_Parameters::RWMode_Tessellated)Interface_Static::IVal("write.step.tessellated");
75+
WriteProductName = Interface_Static::CVal("write.step.product.name");
76+
WriteSurfaceCurMode = Interface_Static::IVal("write.surfacecurve.mode") == 1;
77+
WriteUnit = (UnitsMethods_LengthUnit)Interface_Static::IVal("write.step.unit");
78+
WriteResourceName = Interface_Static::CVal("write.step.resource.name");
79+
WriteSequence = Interface_Static::CVal("write.step.sequence");
80+
WriteVertexMode =
81+
(DESTEP_Parameters::WriteMode_VertexMode)Interface_Static::IVal("write.step.vertex.mode");
82+
WriteSubshapeNames = Interface_Static::IVal("write.stepcaf.subshapes.name") == 1;
83+
WriteColor = Interface_Static::IVal("write.color") == 1;
84+
WriteNonmanifold = Interface_Static::IVal("write.step.nonmanifold") == 1;
85+
WriteName = Interface_Static::IVal("write.name") == 1;
86+
WriteLayer = Interface_Static::IVal("write.layer") == 1;
87+
WriteProps = Interface_Static::IVal("write.props") == 1;
88+
WriteModelType = (STEPControl_StepModelType)Interface_Static::IVal("write.model.type");
89+
}
90+
91+
//=================================================================================================
92+
93+
void DESTEP_Parameters::Reset()
94+
{
95+
DESTEP_Parameters aParameters;
96+
*this = aParameters;
97+
}

0 commit comments

Comments
 (0)