diff --git a/src/DE/DE_ShapeFixConfigurationNode.cxx b/src/DE/DE_ShapeFixConfigurationNode.cxx index 0be4676a7a..51d9cf3e46 100644 --- a/src/DE/DE_ShapeFixConfigurationNode.cxx +++ b/src/DE/DE_ShapeFixConfigurationNode.cxx @@ -39,7 +39,8 @@ DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode() DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode( const Handle(DE_ShapeFixConfigurationNode)& theNode) - : DE_ConfigurationNode(theNode) + : DE_ConfigurationNode(theNode), + ShapeFixParameters(theNode->ShapeFixParameters) { } @@ -50,219 +51,220 @@ bool DE_ShapeFixConfigurationNode::Load(const Handle(DE_ConfigurationContext)& t TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".healing"; - HealingParameters.Tolerance3d = - theResource->RealVal("tolerance3d", HealingParameters.Tolerance3d, aScope); - HealingParameters.MaxTolerance3d = - theResource->RealVal("max.tolerance3d", HealingParameters.MaxTolerance3d, aScope); - HealingParameters.MinTolerance3d = - theResource->RealVal("min.tolerance3d", HealingParameters.MinTolerance3d, aScope); - HealingParameters.FixFreeShellMode = - (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("free.shell", - (int)HealingParameters.FixFreeShellMode, - aScope); - HealingParameters.FixFreeFaceMode = - (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("free.face", - (int)HealingParameters.FixFreeFaceMode, - aScope); - HealingParameters.FixFreeWireMode = - (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("free.wire", - (int)HealingParameters.FixFreeWireMode, - aScope); - HealingParameters.FixSameParameterMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( - "same.parameter", - (int)HealingParameters.FixSameParameterMode, + ShapeFixParameters.Tolerance3d = + theResource->RealVal("tolerance3d", ShapeFixParameters.Tolerance3d, aScope); + ShapeFixParameters.MaxTolerance3d = + theResource->RealVal("max.tolerance3d", ShapeFixParameters.MaxTolerance3d, aScope); + ShapeFixParameters.MinTolerance3d = + theResource->RealVal("min.tolerance3d", ShapeFixParameters.MinTolerance3d, aScope); + ShapeFixParameters.FixFreeShellMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + "free.shell", + (int)ShapeFixParameters.FixFreeShellMode, aScope); - HealingParameters.FixSolidMode = - (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("solid", - (int)HealingParameters.FixSolidMode, + ShapeFixParameters.FixFreeFaceMode = + (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("free.face", + (int)ShapeFixParameters.FixFreeFaceMode, aScope); - HealingParameters.FixShellOrientationMode = + ShapeFixParameters.FixFreeWireMode = + (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("free.wire", + (int)ShapeFixParameters.FixFreeWireMode, + aScope); + ShapeFixParameters.FixSameParameterMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + "same.parameter", + (int)ShapeFixParameters.FixSameParameterMode, + aScope); + ShapeFixParameters.FixSolidMode = + (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("solid", + (int)ShapeFixParameters.FixSolidMode, + aScope); + ShapeFixParameters.FixShellOrientationMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "shell.orientation", - (int)HealingParameters.FixShellOrientationMode, + (int)ShapeFixParameters.FixShellOrientationMode, aScope); - HealingParameters.CreateOpenSolidMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.CreateOpenSolidMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "create.open.solid", - (int)HealingParameters.CreateOpenSolidMode, + (int)ShapeFixParameters.CreateOpenSolidMode, aScope); - HealingParameters.FixShellMode = + ShapeFixParameters.FixShellMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("shell", - (int)HealingParameters.FixShellMode, + (int)ShapeFixParameters.FixShellMode, aScope); - HealingParameters.FixFaceOrientationMode = + ShapeFixParameters.FixFaceOrientationMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "face.orientation", - (int)HealingParameters.FixFaceOrientationMode, + (int)ShapeFixParameters.FixFaceOrientationMode, aScope); - HealingParameters.FixFaceMode = + ShapeFixParameters.FixFaceMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("face", - (int)HealingParameters.FixFaceMode, + (int)ShapeFixParameters.FixFaceMode, aScope); - HealingParameters.FixWireMode = + ShapeFixParameters.FixWireMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("wire", - (int)HealingParameters.FixWireMode, + (int)ShapeFixParameters.FixWireMode, aScope); - HealingParameters.FixOrientationMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixOrientationMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "orientation", - (int)HealingParameters.FixOrientationMode, + (int)ShapeFixParameters.FixOrientationMode, aScope); - HealingParameters.FixAddNaturalBoundMode = + ShapeFixParameters.FixAddNaturalBoundMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "add.natural.bound", - (int)HealingParameters.FixAddNaturalBoundMode, + (int)ShapeFixParameters.FixAddNaturalBoundMode, aScope); - HealingParameters.FixMissingSeamMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixMissingSeamMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "missing.seam", - (int)HealingParameters.FixMissingSeamMode, + (int)ShapeFixParameters.FixMissingSeamMode, aScope); - HealingParameters.FixSmallAreaWireMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixSmallAreaWireMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "small.area.wire", - (int)HealingParameters.FixSmallAreaWireMode, + (int)ShapeFixParameters.FixSmallAreaWireMode, aScope); - HealingParameters.RemoveSmallAreaFaceMode = + ShapeFixParameters.RemoveSmallAreaFaceMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "remove.small.area.face", - (int)HealingParameters.RemoveSmallAreaFaceMode, + (int)ShapeFixParameters.RemoveSmallAreaFaceMode, aScope); - HealingParameters.FixIntersectingWiresMode = + ShapeFixParameters.FixIntersectingWiresMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "intersecting.wires", - (int)HealingParameters.FixIntersectingWiresMode, + (int)ShapeFixParameters.FixIntersectingWiresMode, aScope); - HealingParameters.FixLoopWiresMode = - (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("loop.wires", - (int)HealingParameters.FixLoopWiresMode, - aScope); - HealingParameters.FixSplitFaceMode = - (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("split.face", - (int)HealingParameters.FixSplitFaceMode, - aScope); - HealingParameters.AutoCorrectPrecisionMode = + ShapeFixParameters.FixLoopWiresMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + "loop.wires", + (int)ShapeFixParameters.FixLoopWiresMode, + aScope); + ShapeFixParameters.FixSplitFaceMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + "split.face", + (int)ShapeFixParameters.FixSplitFaceMode, + aScope); + ShapeFixParameters.AutoCorrectPrecisionMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "auto.correct.precision", - (int)HealingParameters.AutoCorrectPrecisionMode, + (int)ShapeFixParameters.AutoCorrectPrecisionMode, aScope); - HealingParameters.ModifyTopologyMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.ModifyTopologyMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "modify.topology", - (int)HealingParameters.ModifyTopologyMode, + (int)ShapeFixParameters.ModifyTopologyMode, aScope); - HealingParameters.ModifyGeometryMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.ModifyGeometryMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "modify.geometry", - (int)HealingParameters.ModifyGeometryMode, + (int)ShapeFixParameters.ModifyGeometryMode, aScope); - HealingParameters.ClosedWireMode = + ShapeFixParameters.ClosedWireMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("closed.wire", - (int)HealingParameters.ClosedWireMode, + (int)ShapeFixParameters.ClosedWireMode, aScope); - HealingParameters.PreferencePCurveMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.PreferencePCurveMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "preference.pcurve", - (int)HealingParameters.PreferencePCurveMode, + (int)ShapeFixParameters.PreferencePCurveMode, aScope); - HealingParameters.FixReorderMode = + ShapeFixParameters.FixReorderMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("reorder.edges", - (int)HealingParameters.FixReorderMode, + (int)ShapeFixParameters.FixReorderMode, aScope); - HealingParameters.FixSmallMode = + ShapeFixParameters.FixSmallMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("remove.small.edges", - (int)HealingParameters.FixSmallMode, + (int)ShapeFixParameters.FixSmallMode, aScope); - HealingParameters.FixConnectedMode = - (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("connected.edges", - (int)HealingParameters.FixConnectedMode, - aScope); - HealingParameters.FixEdgeCurvesMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixConnectedMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + "connected.edges", + (int)ShapeFixParameters.FixConnectedMode, + aScope); + ShapeFixParameters.FixEdgeCurvesMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "edge.curves", - (int)HealingParameters.FixEdgeCurvesMode, + (int)ShapeFixParameters.FixEdgeCurvesMode, aScope); - HealingParameters.FixDegeneratedMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixDegeneratedMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "add.degenerated.edges", - (int)HealingParameters.FixDegeneratedMode, + (int)ShapeFixParameters.FixDegeneratedMode, aScope); - HealingParameters.FixLackingMode = + ShapeFixParameters.FixLackingMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("add.lacking.edges", - (int)HealingParameters.FixLackingMode, + (int)ShapeFixParameters.FixLackingMode, aScope); - HealingParameters.FixSelfIntersectionMode = + ShapeFixParameters.FixSelfIntersectionMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "selfintersection", - (int)HealingParameters.FixSelfIntersectionMode, + (int)ShapeFixParameters.FixSelfIntersectionMode, aScope); - HealingParameters.RemoveLoopMode = + ShapeFixParameters.RemoveLoopMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("remove.loop", - (int)HealingParameters.RemoveLoopMode, + (int)ShapeFixParameters.RemoveLoopMode, aScope); - HealingParameters.FixReversed2dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixReversed2dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "reversed2d", - (int)HealingParameters.FixReversed2dMode, + (int)ShapeFixParameters.FixReversed2dMode, aScope); - HealingParameters.FixRemovePCurveMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixRemovePCurveMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "remove.pcurve", - (int)HealingParameters.FixRemovePCurveMode, + (int)ShapeFixParameters.FixRemovePCurveMode, aScope); - HealingParameters.FixRemoveCurve3dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixRemoveCurve3dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "remove.curve3d", - (int)HealingParameters.FixRemoveCurve3dMode, + (int)ShapeFixParameters.FixRemoveCurve3dMode, aScope); - HealingParameters.FixAddPCurveMode = - (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("add.pcurve", - (int)HealingParameters.FixAddPCurveMode, - aScope); - HealingParameters.FixAddCurve3dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixAddPCurveMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + "add.pcurve", + (int)ShapeFixParameters.FixAddPCurveMode, + aScope); + ShapeFixParameters.FixAddCurve3dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "add.curve3d", - (int)HealingParameters.FixAddCurve3dMode, + (int)ShapeFixParameters.FixAddCurve3dMode, aScope); - HealingParameters.FixSeamMode = + ShapeFixParameters.FixSeamMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("correct.order.in.seam", - (int)HealingParameters.FixSeamMode, + (int)ShapeFixParameters.FixSeamMode, aScope); - HealingParameters.FixShiftedMode = + ShapeFixParameters.FixShiftedMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("shifted", - (int)HealingParameters.FixShiftedMode, + (int)ShapeFixParameters.FixShiftedMode, aScope); - HealingParameters.FixEdgeSameParameterMode = + ShapeFixParameters.FixEdgeSameParameterMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "edge.same.parameter", - (int)HealingParameters.FixEdgeSameParameterMode, + (int)ShapeFixParameters.FixEdgeSameParameterMode, aScope); - HealingParameters.FixNotchedEdgesMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + ShapeFixParameters.FixNotchedEdgesMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "notched.edges", - (int)HealingParameters.FixNotchedEdgesMode, + (int)ShapeFixParameters.FixNotchedEdgesMode, aScope); - HealingParameters.FixTailMode = + ShapeFixParameters.FixTailMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("tail", - (int)HealingParameters.FixTailMode, + (int)ShapeFixParameters.FixTailMode, aScope); - HealingParameters.MaxTailAngle = + ShapeFixParameters.MaxTailAngle = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("max.tail.angle", - (int)HealingParameters.MaxTailAngle, + (int)ShapeFixParameters.MaxTailAngle, aScope); - HealingParameters.MaxTailWidth = + ShapeFixParameters.MaxTailWidth = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("max.tail.width", - (int)HealingParameters.MaxTailWidth, + (int)ShapeFixParameters.MaxTailWidth, aScope); - HealingParameters.FixSelfIntersectingEdgeMode = + ShapeFixParameters.FixSelfIntersectingEdgeMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "selfintersecting.edge", - (int)HealingParameters.FixSelfIntersectingEdgeMode, + (int)ShapeFixParameters.FixSelfIntersectingEdgeMode, aScope); - HealingParameters.FixIntersectingEdgesMode = + ShapeFixParameters.FixIntersectingEdgesMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "intersecting.edges", - (int)HealingParameters.FixIntersectingEdgesMode, + (int)ShapeFixParameters.FixIntersectingEdgesMode, aScope); - HealingParameters.FixNonAdjacentIntersectingEdgesMode = + ShapeFixParameters.FixNonAdjacentIntersectingEdgesMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "nonadjacent.intersecting.edges", - (int)HealingParameters.FixNonAdjacentIntersectingEdgesMode, + (int)ShapeFixParameters.FixNonAdjacentIntersectingEdgesMode, aScope); - HealingParameters.FixVertexPositionMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( - "vertex.position", - (int)HealingParameters.FixVertexPositionMode, - aScope); - HealingParameters.FixVertexToleranceMode = + ShapeFixParameters.FixVertexPositionMode = + (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( + "vertex.position", + (int)ShapeFixParameters.FixVertexPositionMode, + aScope); + ShapeFixParameters.FixVertexToleranceMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal( "vertex.tolerance", - (int)HealingParameters.FixVertexToleranceMode, + (int)ShapeFixParameters.FixVertexToleranceMode, aScope); return true; @@ -274,7 +276,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const { TCollection_AsciiString aResult; TCollection_AsciiString aScope = - THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".healing"; + THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".healing."; aResult += "!\n"; aResult += "!Shape healing parameters:\n"; @@ -283,54 +285,54 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!\n"; aResult += "!Defines the maximum allowable tolerance\n"; aResult += "!Default value: 1.e-6. Available values: any real positive (non null) value\n"; - aResult += aScope + "tolerance3d :\t " + HealingParameters.Tolerance3d + "\n"; + aResult += aScope + "tolerance3d :\t " + ShapeFixParameters.Tolerance3d + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the maximum allowable tolerance\n"; aResult += "!Default value: 1.0. Available values: any real positive (non null) value\n"; - aResult += aScope + "max.tolerance3d :\t " + HealingParameters.MaxTolerance3d + "\n"; + aResult += aScope + "max.tolerance3d :\t " + ShapeFixParameters.MaxTolerance3d + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the minimum allowable tolerance\n"; aResult += "!Default value: 1.e-7. Available values: any real positive (non null) value\n"; - aResult += aScope + "min.tolerance3d :\t " + HealingParameters.MinTolerance3d + "\n"; + aResult += aScope + "min.tolerance3d :\t " + ShapeFixParameters.MinTolerance3d + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Shell for ShapeFix_Shape\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "free.shell :\t " + (int)HealingParameters.FixFreeShellMode + "\n"; + aResult += aScope + "free.shell :\t " + (int)ShapeFixParameters.FixFreeShellMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Face for ShapeFix_Shape\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "free.face :\t " + (int)HealingParameters.FixFreeFaceMode + "\n"; + aResult += aScope + "free.face :\t " + (int)ShapeFixParameters.FixFreeFaceMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Wire for ShapeFix_Shape\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "free.wire :\t " + (int)HealingParameters.FixFreeWireMode + "\n"; + aResult += aScope + "free.wire :\t " + (int)ShapeFixParameters.FixFreeWireMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying ShapeFix::SameParameter after all fixes\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "same.parameter :\t " + (int)HealingParameters.FixSameParameterMode + "\n"; + aResult += aScope + "same.parameter :\t " + (int)ShapeFixParameters.FixSameParameterMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Solid\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "solid :\t " + (int)HealingParameters.FixSolidMode + "\n"; + aResult += aScope + "solid :\t " + (int)ShapeFixParameters.FixSolidMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -339,7 +341,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "shell.orientation :\t " + (int)HealingParameters.FixShellOrientationMode + "\n"; + aScope + "shell.orientation :\t " + (int)ShapeFixParameters.FixShellOrientationMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -348,14 +350,14 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "else solids are created from closed shells only\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "create.open.solid :\t " + (int)HealingParameters.CreateOpenSolidMode + "\n"; + aResult += aScope + "create.open.solid :\t " + (int)ShapeFixParameters.CreateOpenSolidMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Shell for ShapeFix_Solid\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "shell :\t " + (int)HealingParameters.FixShellMode + "\n"; + aResult += aScope + "shell :\t " + (int)ShapeFixParameters.FixShellMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -364,28 +366,28 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "face.orientation :\t " + (int)HealingParameters.FixFaceOrientationMode + "\n"; + aScope + "face.orientation :\t " + (int)ShapeFixParameters.FixFaceOrientationMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Face\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "face :\t " + (int)HealingParameters.FixFaceMode + "\n"; + aResult += aScope + "face :\t " + (int)ShapeFixParameters.FixFaceMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Wire\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "wire :\t " + (int)HealingParameters.FixWireMode + "\n"; + aResult += aScope + "wire :\t " + (int)ShapeFixParameters.FixWireMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying a fix for the orientation of faces in the shell\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "orientation :\t " + (int)HealingParameters.FixOrientationMode + "\n"; + aResult += aScope + "orientation :\t " + (int)ShapeFixParameters.FixOrientationMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -394,21 +396,21 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "add.natural.bound :\t " + (int)HealingParameters.FixAddNaturalBoundMode + "\n"; + aScope + "add.natural.bound :\t " + (int)ShapeFixParameters.FixAddNaturalBoundMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the fix missing seam mode (tries to insert seam is missed)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "missing.seam :\t " + (int)HealingParameters.FixMissingSeamMode + "\n"; + aResult += aScope + "missing.seam :\t " + (int)ShapeFixParameters.FixMissingSeamMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the fix small area wire mode (drops small wires)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "small.area.wire :\t " + (int)HealingParameters.FixSmallAreaWireMode + "\n"; + aResult += aScope + "small.area.wire :\t " + (int)ShapeFixParameters.FixSmallAreaWireMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -416,7 +418,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "remove.small.area.face :\t " + (int)HealingParameters.RemoveSmallAreaFaceMode + "\n"; + aScope + "remove.small.area.face :\t " + (int)ShapeFixParameters.RemoveSmallAreaFaceMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -424,29 +426,29 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "intersecting.wires :\t " + (int)HealingParameters.FixIntersectingWiresMode + "\n"; + aScope + "intersecting.wires :\t " + (int)ShapeFixParameters.FixIntersectingWiresMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the fix loop wires mode in ShapeFix_Face\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "loop.wires :\t " + (int)HealingParameters.FixLoopWiresMode + "\n"; + aResult += aScope + "loop.wires :\t " + (int)ShapeFixParameters.FixLoopWiresMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the fix split face mode in ShapeFix_Face\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "split.face :\t " + (int)HealingParameters.FixSplitFaceMode + "\n"; + aResult += aScope + "split.face :\t " + (int)ShapeFixParameters.FixSplitFaceMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the auto-correct precision mode in ShapeFix_Face\n"; aResult += "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; - aResult += - aScope + "auto.correct.precision :\t " + (int)HealingParameters.AutoCorrectPrecisionMode + "\n"; + aResult += aScope + "auto.correct.precision :\t " + + (int)ShapeFixParameters.AutoCorrectPrecisionMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -454,14 +456,14 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const "(adding/removing edges etc.)\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "modify.topology :\t " + (int)HealingParameters.ModifyTopologyMode + "\n"; + aResult += aScope + "modify.topology :\t " + (int)ShapeFixParameters.ModifyTopologyMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode allowed to modify geometry of the edges and vertices\n"; aResult += "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; - aResult += aScope + "modify.geometry :\t " + (int)HealingParameters.ModifyGeometryMode + "\n"; + aResult += aScope + "modify.geometry :\t " + (int)ShapeFixParameters.ModifyGeometryMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -470,7 +472,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!and FixConnected() for lastand first edges\n"; aResult += "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; - aResult += aScope + "closed.wire :\t " + (int)HealingParameters.ClosedWireMode + "\n"; + aResult += aScope + "closed.wire :\t " + (int)ShapeFixParameters.ClosedWireMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -480,35 +482,36 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!and FixConnected() for lastand first edges\n"; aResult += "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; - aResult += aScope + "preference.pcurve :\t " + (int)HealingParameters.PreferencePCurveMode + "\n"; + aResult += + aScope + "preference.pcurve :\t " + (int)ShapeFixParameters.PreferencePCurveMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode allowed to reorder edges in the wire\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "reorder.edges :\t " + (int)HealingParameters.FixReorderMode + "\n"; + aResult += aScope + "reorder.edges :\t " + (int)ShapeFixParameters.FixReorderMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode allowed to remove small edges\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "remove.small.edges :\t " + (int)HealingParameters.FixSmallMode + "\n"; + aResult += aScope + "remove.small.edges :\t " + (int)ShapeFixParameters.FixSmallMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for fix connecting edges in the wire\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "connected.edges :\t " + (int)HealingParameters.FixConnectedMode + "\n"; + aResult += aScope + "connected.edges :\t " + (int)ShapeFixParameters.FixConnectedMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for fix edges (3Dcurves and 2D curves)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "edge.curves :\t " + (int)HealingParameters.FixEdgeCurvesMode + "\n"; + aResult += aScope + "edge.curves :\t " + (int)ShapeFixParameters.FixEdgeCurvesMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -516,14 +519,14 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "add.degenerated.edges :\t " + (int)HealingParameters.FixDegeneratedMode + "\n"; + aScope + "add.degenerated.edges :\t " + (int)ShapeFixParameters.FixDegeneratedMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for add lacking edges\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "add.lacking.edges :\t " + (int)HealingParameters.FixLackingMode + "\n"; + aResult += aScope + "add.lacking.edges :\t " + (int)ShapeFixParameters.FixLackingMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -531,21 +534,21 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "selfintersection :\t " + (int)HealingParameters.FixSelfIntersectionMode + "\n"; + aScope + "selfintersection :\t " + (int)ShapeFixParameters.FixSelfIntersectionMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode allowed to remove loop\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "remove.loop :\t " + (int)HealingParameters.RemoveLoopMode + "\n"; + aResult += aScope + "remove.loop :\t " + (int)ShapeFixParameters.RemoveLoopMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode allowed to fix edge if pcurve is directed opposite to 3d curve\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "reversed2d :\t " + (int)HealingParameters.FixReversed2dMode + "\n"; + aResult += aScope + "reversed2d :\t " + (int)ShapeFixParameters.FixReversed2dMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -553,7 +556,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const "the vertices\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "remove.pcurve :\t " + (int)HealingParameters.FixRemovePCurveMode + "\n"; + aResult += aScope + "remove.pcurve :\t " + (int)ShapeFixParameters.FixRemovePCurveMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -561,7 +564,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const "!Defines the mode allowed to remove 3d curve of the edge if it does not match the vertices\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "remove.curve3d :\t " + (int)HealingParameters.FixRemoveCurve3dMode + "\n"; + aResult += aScope + "remove.curve3d :\t " + (int)ShapeFixParameters.FixRemoveCurve3dMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -569,14 +572,14 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const "!Defines the mode allowed to add pcurve(s) of the edge if missing (by projecting 3d curve)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "add.pcurve :\t " + (int)HealingParameters.FixAddPCurveMode + "\n"; + aResult += aScope + "add.pcurve :\t " + (int)ShapeFixParameters.FixAddPCurveMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode allowed to build 3d curve of the edge if missing\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "add.curve3d :\t " + (int)HealingParameters.FixAddCurve3dMode + "\n"; + aResult += aScope + "add.curve3d :\t " + (int)ShapeFixParameters.FixAddCurve3dMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -584,7 +587,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const "its orientation\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "correct.order.in.seam :\t " + (int)HealingParameters.FixSeamMode + "\n"; + aResult += aScope + "correct.order.in.seam :\t " + (int)ShapeFixParameters.FixSeamMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -592,7 +595,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const "curves of the edges in the wire are connected\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "shifted :\t " + (int)HealingParameters.FixShiftedMode + "\n"; + aResult += aScope + "shifted :\t " + (int)ShapeFixParameters.FixShiftedMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -600,35 +603,35 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "edge.same.parameter :\t " + (int)HealingParameters.FixEdgeSameParameterMode + "\n"; + aScope + "edge.same.parameter :\t " + (int)ShapeFixParameters.FixEdgeSameParameterMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for fix notched edges\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "notched.edges :\t " + (int)HealingParameters.FixNotchedEdgesMode + "\n"; + aResult += aScope + "notched.edges :\t " + (int)ShapeFixParameters.FixNotchedEdgesMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for fix tail in wire\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "tail :\t " + (int)HealingParameters.FixTailMode + "\n"; + aResult += aScope + "tail :\t " + (int)ShapeFixParameters.FixTailMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for max angle of the tails\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "max.tail.angle :\t " + (int)HealingParameters.MaxTailAngle + "\n"; + aResult += aScope + "max.tail.angle :\t " + (int)ShapeFixParameters.MaxTailAngle + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for max tail width\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "max.tail.width :\t " + (int)HealingParameters.MaxTailWidth + "\n"; + aResult += aScope + "max.tail.width :\t " + (int)ShapeFixParameters.MaxTailWidth + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -636,7 +639,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += aScope + "selfintersecting.edge :\t " - + (int)HealingParameters.FixSelfIntersectingEdgeMode + "\n"; + + (int)ShapeFixParameters.FixSelfIntersectingEdgeMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -644,7 +647,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "intersecting.edges :\t " + (int)HealingParameters.FixIntersectingEdgesMode + "\n"; + aScope + "intersecting.edges :\t " + (int)ShapeFixParameters.FixIntersectingEdgesMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -652,14 +655,14 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += aScope + "nonadjacent.intersecting.edges :\t " - + (int)HealingParameters.FixNonAdjacentIntersectingEdgesMode + "\n"; + + (int)ShapeFixParameters.FixNonAdjacentIntersectingEdgesMode + "\n"; aResult += "!\n"; aResult += "!\n"; aResult += "!Defines the mode for applying ShapeFix::FixVertexPosition before all fixes\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; - aResult += aScope + "vertex.position :\t " + (int)HealingParameters.FixVertexPositionMode + "\n"; + aResult += aScope + "vertex.position :\t " + (int)ShapeFixParameters.FixVertexPositionMode + "\n"; aResult += "!\n"; aResult += "!\n"; @@ -669,7 +672,7 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), " "\"Fix\"(1)\n"; aResult += - aScope + "vertex.tolerance :\t " + (int)HealingParameters.FixVertexToleranceMode + "\n"; + aScope + "vertex.tolerance :\t " + (int)ShapeFixParameters.FixVertexToleranceMode + "\n"; aResult += "!\n"; return aResult; diff --git a/src/DE/DE_ShapeFixConfigurationNode.hxx b/src/DE/DE_ShapeFixConfigurationNode.hxx index 79d9422ddb..ee3db3d829 100644 --- a/src/DE/DE_ShapeFixConfigurationNode.hxx +++ b/src/DE/DE_ShapeFixConfigurationNode.hxx @@ -44,7 +44,7 @@ public: Standard_EXPORT virtual TCollection_AsciiString Save() const Standard_OVERRIDE; public: - DE_ShapeFixParameters HealingParameters; //!< Shape healing parameters + DE_ShapeFixParameters ShapeFixParameters; //!< Shape healing parameters }; #endif // _DE_ShapeFixConfigurationNode_HeaderFile diff --git a/src/DE/FILES b/src/DE/FILES index 2a8a2ccb2b..ab86f49a2e 100644 --- a/src/DE/FILES +++ b/src/DE/FILES @@ -5,6 +5,7 @@ DE_ConfigurationNode.hxx DE_PluginHolder.hxx DE_Provider.cxx DE_Provider.hxx +DE_ShapeFixConfigurationNode.cxx DE_ShapeFixConfigurationNode.hxx DE_ShapeFixParameters.hxx DE_ShapeFixParameters.cxx diff --git a/src/DEIGES/DEIGES_ConfigurationNode.cxx b/src/DEIGES/DEIGES_ConfigurationNode.cxx index 844f0f3b3f..b4cd3d62fa 100644 --- a/src/DEIGES/DEIGES_ConfigurationNode.cxx +++ b/src/DEIGES/DEIGES_ConfigurationNode.cxx @@ -18,7 +18,7 @@ #include #include -IMPLEMENT_STANDARD_RTTIEXT(DEIGES_ConfigurationNode, DE_ConfigurationNode) +IMPLEMENT_STANDARD_RTTIEXT(DEIGES_ConfigurationNode, DE_ShapeFixConfigurationNode) namespace { @@ -35,14 +35,16 @@ DE_PluginHolder THE_OCCT_IGES_COMPONENT_PLUGIN; //================================================================================================= DEIGES_ConfigurationNode::DEIGES_ConfigurationNode() - : DE_ConfigurationNode() + : DE_ShapeFixConfigurationNode() { + DE_ShapeFixConfigurationNode::ShapeFixParameters = + DEIGES_Parameters::GetDefaultShapeFixParameters(); } //================================================================================================= DEIGES_ConfigurationNode::DEIGES_ConfigurationNode(const Handle(DEIGES_ConfigurationNode)& theNode) - : DE_ConfigurationNode(theNode) + : DE_ShapeFixConfigurationNode(theNode) { InternalParameters = theNode->InternalParameters; } @@ -85,10 +87,6 @@ bool DEIGES_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe InternalParameters.ReadApproxd1 = theResource->BooleanVal("read.bspline.approxd1.mode", InternalParameters.ReadApproxd1, aScope); - InternalParameters.ReadResourceName = - theResource->StringVal("read.resource.name", InternalParameters.ReadResourceName, aScope); - InternalParameters.ReadSequence = - theResource->StringVal("read.sequence", InternalParameters.ReadSequence, aScope); InternalParameters.ReadFaultyEntities = theResource->BooleanVal("read.fau_lty.entities", InternalParameters.ReadFaultyEntities, aScope); InternalParameters.ReadOnlyVisible = @@ -117,10 +115,6 @@ bool DEIGES_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe theResource->StringVal("write.header.product", InternalParameters.WriteHeaderProduct, aScope); InternalParameters.WriteHeaderReciever = theResource->StringVal("write.header.receiver", InternalParameters.WriteHeaderReciever, aScope); - InternalParameters.WriteResourceName = - theResource->StringVal("write.resource.name", InternalParameters.WriteResourceName, aScope); - InternalParameters.WriteSequence = - theResource->StringVal("write.sequence", InternalParameters.WriteSequence, aScope); InternalParameters.WritePrecisionMode = (DEIGES_Parameters::WriteMode_PrecisionMode)theResource->IntegerVal( "write.precision.mode", @@ -139,8 +133,7 @@ bool DEIGES_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe theResource->BooleanVal("write.name", InternalParameters.WriteName, aScope); InternalParameters.WriteLayer = theResource->BooleanVal("write.layer", InternalParameters.WriteLayer, aScope); - - return true; + return DE_ShapeFixConfigurationNode::Load(theResource); } //================================================================================================= @@ -239,18 +232,6 @@ TCollection_AsciiString DEIGES_ConfigurationNode::Save() const aResult += aScope + "read.bspline.approxd1.mode :\t " + InternalParameters.ReadApproxd1 + "\n"; aResult += "!\n"; - aResult += "!\n"; - aResult += "!Defines the name of the resource file\n"; - aResult += "!Default value: \"IGES\". Available values: \n"; - aResult += aScope + "read.resource.name :\t " + InternalParameters.ReadResourceName + "\n"; - aResult += "!\n"; - - aResult += "!\n"; - aResult += "!Defines the name of the sequence of operators\n"; - aResult += "!Default value: \"FromIGES\". Available values: \n"; - aResult += aScope + "read.sequence :\t " + InternalParameters.ReadSequence + "\n"; - aResult += "!\n"; - aResult += "!\n"; aResult += "!Parameter for reading fa-iled entities\n"; aResult += "!Default value: \"Off\"(0). Available values: \"Off\"(0), \"On\"(1)\n"; @@ -332,18 +313,6 @@ TCollection_AsciiString DEIGES_ConfigurationNode::Save() const aResult += aScope + "write.header.receiver :\t " + InternalParameters.WriteHeaderReciever + "\n"; aResult += "!\n"; - aResult += "!\n"; - aResult += "!Defines the name of the resource file\n"; - aResult += "!Default value: \"IGES\". Available values: \n"; - aResult += aScope + "write.resource.name :\t " + InternalParameters.WriteResourceName + "\n"; - aResult += "!\n"; - - aResult += "!\n"; - aResult += "!Defines the name of the sequence of operators\n"; - aResult += "!Default value: \"To\". Available values: \n"; - aResult += aScope + "write.sequence :\t " + InternalParameters.WriteSequence + "\n"; - aResult += "!\n"; - aResult += "!\n"; aResult += "!Specifies the mode of writing the resolution value into the IGES file\n"; aResult += "!Default value: Average(0). Available values: \"Least\"(-1), \"Average\"(0), "; @@ -388,6 +357,7 @@ TCollection_AsciiString DEIGES_ConfigurationNode::Save() const aResult += aScope + "write.layer :\t " + InternalParameters.WriteLayer + "\n"; aResult += "!\n"; + aResult += DE_ShapeFixConfigurationNode::Save(); aResult += "!*****************************************************************************\n"; return aResult; } diff --git a/src/DEIGES/DEIGES_ConfigurationNode.hxx b/src/DEIGES/DEIGES_ConfigurationNode.hxx index cca287ee14..06be837db8 100644 --- a/src/DEIGES/DEIGES_ConfigurationNode.hxx +++ b/src/DEIGES/DEIGES_ConfigurationNode.hxx @@ -15,7 +15,7 @@ #define _DEIGES_ConfigurationNode_HeaderFile #include -#include +#include #include //! The purpose of this class is to configure the transfer process for IGES format @@ -28,9 +28,9 @@ //! The supported CAD extensions are ".igs", ".iges" //! The import process is supported. //! The export process is supported. -class DEIGES_ConfigurationNode : public DE_ConfigurationNode +class DEIGES_ConfigurationNode : public DE_ShapeFixConfigurationNode { - DEFINE_STANDARD_RTTIEXT(DEIGES_ConfigurationNode, DE_ConfigurationNode) + DEFINE_STANDARD_RTTIEXT(DEIGES_ConfigurationNode, DE_ShapeFixConfigurationNode) public: //! Initializes all fields by default Standard_EXPORT DEIGES_ConfigurationNode(); diff --git a/src/DEIGES/DEIGES_Parameters.cxx b/src/DEIGES/DEIGES_Parameters.cxx index 84ad7e0c29..4f0c7412eb 100644 --- a/src/DEIGES/DEIGES_Parameters.cxx +++ b/src/DEIGES/DEIGES_Parameters.cxx @@ -19,21 +19,17 @@ void DEIGES_Parameters::InitFromStatic() { - ReadBSplineContinuity = (ReadMode_BSplineContinuity)Interface_Static::IVal( - "read.iges.bspline.continuity"); - ReadPrecisionMode = - (ReadMode_Precision)Interface_Static::IVal("read.precision.mode"); - ReadPrecisionVal = Interface_Static::RVal("read.precision.val"); - ReadMaxPrecisionMode = - (ReadMode_MaxPrecision)Interface_Static::IVal("read.maxprecision.mode"); - ReadMaxPrecisionVal = Interface_Static::RVal("read.maxprecision.val"); - ReadSameParamMode = Interface_Static::IVal("read.stdsameparameter.mode") == 1; + ReadBSplineContinuity = + (ReadMode_BSplineContinuity)Interface_Static::IVal("read.iges.bspline.continuity"); + ReadPrecisionMode = (ReadMode_Precision)Interface_Static::IVal("read.precision.mode"); + ReadPrecisionVal = Interface_Static::RVal("read.precision.val"); + ReadMaxPrecisionMode = (ReadMode_MaxPrecision)Interface_Static::IVal("read.maxprecision.mode"); + ReadMaxPrecisionVal = Interface_Static::RVal("read.maxprecision.val"); + ReadSameParamMode = Interface_Static::IVal("read.stdsameparameter.mode") == 1; ReadSurfaceCurveMode = (ReadMode_SurfaceCurve)Interface_Static::IVal("read.surfacecurve.mode"); - EncodeRegAngle = Interface_Static::RVal("read.encoderegularity.angle"); + EncodeRegAngle = Interface_Static::RVal("read.encoderegularity.angle"); ReadApproxd1 = Interface_Static::IVal("read.bspline.approxd1.mode") == 1; - ReadResourceName = Interface_Static::CVal("read.resource.name"); - ReadSequence = Interface_Static::CVal("read.sequence"); ReadFaultyEntities = Interface_Static::IVal("read.fau_lty.entities") == 1; ReadOnlyVisible = Interface_Static::IVal("read.onlyvisible") == 1; ReadColor = Interface_Static::IVal("read.color") == 1; @@ -41,23 +37,19 @@ void DEIGES_Parameters::InitFromStatic() ReadLayer = Interface_Static::IVal("read.layer") == 1; WriteBRepMode = (WriteMode_BRep)Interface_Static::IVal("write.brep.mode"); - WriteConvertSurfaceMode = (WriteMode_ConvertSurface)Interface_Static::IVal( - "write.convertsurface.mode"); + WriteConvertSurfaceMode = + (WriteMode_ConvertSurface)Interface_Static::IVal("write.convertsurface.mode"); WriteHeaderAuthor = Interface_Static::CVal("write.header.author"); WriteHeaderCompany = Interface_Static::CVal("write.header.company"); WriteHeaderProduct = Interface_Static::CVal("write.header.product"); WriteHeaderReciever = Interface_Static::CVal("write.header.receiver"); - WriteResourceName = Interface_Static::CVal("write.resource.name"); - WriteSequence = Interface_Static::CVal("write.sequence"); - WritePrecisionMode = - (WriteMode_PrecisionMode)Interface_Static::IVal("write.precision.mode"); - WritePrecisionVal = Interface_Static::RVal("write.precision.val"); - WritePlaneMode = - (WriteMode_PlaneMode)Interface_Static::IVal("write.plane.mode"); - WriteOffsetMode = Interface_Static::IVal("write.offset") == 1; - WriteColor = Interface_Static::IVal("write.color") == 1; - WriteName = Interface_Static::IVal("write.name") == 1; - WriteLayer = Interface_Static::IVal("write.layer") == 1; + WritePrecisionMode = (WriteMode_PrecisionMode)Interface_Static::IVal("write.precision.mode"); + WritePrecisionVal = Interface_Static::RVal("write.precision.val"); + WritePlaneMode = (WriteMode_PlaneMode)Interface_Static::IVal("write.plane.mode"); + WriteOffsetMode = Interface_Static::IVal("write.offset") == 1; + WriteColor = Interface_Static::IVal("write.color") == 1; + WriteName = Interface_Static::IVal("write.name") == 1; + WriteLayer = Interface_Static::IVal("write.layer") == 1; } //================================================================================================= @@ -69,19 +61,7 @@ void DEIGES_Parameters::Reset() //================================================================================================= -DE_ShapeFixParameters DEIGES_Parameters::GetDefaultReadingParamsIGES() -{ - DE_ShapeFixParameters aShapeFixParameters; - aShapeFixParameters.DetalizationLevel = TopAbs_EDGE; - aShapeFixParameters.CreateOpenSolidMode = DE_ShapeFixParameters::FixMode::Fix; - aShapeFixParameters.FixTailMode = DE_ShapeFixParameters::FixMode::FixOrNot; - aShapeFixParameters.MaxTailAngle = DE_ShapeFixParameters::FixMode::FixOrNot; - return aShapeFixParameters; -} - -//================================================================================================= - -DE_ShapeFixParameters DEIGES_Parameters::GetDefaultWritingParamsIGES() +DE_ShapeFixParameters DEIGES_Parameters::GetDefaultShapeFixParameters() { DE_ShapeFixParameters aShapeFixParameters; aShapeFixParameters.DetalizationLevel = TopAbs_EDGE; diff --git a/src/DEIGES/DEIGES_Parameters.hxx b/src/DEIGES/DEIGES_Parameters.hxx index 6f03603636..82088bf2a2 100644 --- a/src/DEIGES/DEIGES_Parameters.hxx +++ b/src/DEIGES/DEIGES_Parameters.hxx @@ -86,11 +86,8 @@ public: //! Reset used parameters Standard_EXPORT void Reset(); - //! Returns default parameters for reading STEP files. - Standard_EXPORT static DE_ShapeFixParameters GetDefaultReadingParamsIGES(); - - //! Returns default parameters for writing STEP files. - Standard_EXPORT static DE_ShapeFixParameters GetDefaultWritingParamsIGES(); + //! Returns default shape fix parameters for transferring IGES files. + Standard_EXPORT static DE_ShapeFixParameters GetDefaultShapeFixParameters(); public: // Common @@ -106,8 +103,6 @@ public: //Read bool ReadApproxd1 = false; //InternalParameters.ReadColor); aReader.SetNameMode(aNode->InternalParameters.ReadName); aReader.SetLayerMode(aNode->InternalParameters.ReadLayer); - + aReader.SetShapeFixParameters(aNode->ShapeFixParameters); IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid; aReadStat = aReader.ReadFile(thePath.ToCString()); if (aReadStat != IFSelect_RetDone) @@ -260,7 +252,7 @@ bool DEIGES_Provider::Write(const TCollection_AsciiString& thePath, aWriter.SetColorMode(aNode->InternalParameters.WriteColor); aWriter.SetNameMode(aNode->InternalParameters.WriteName); aWriter.SetLayerMode(aNode->InternalParameters.WriteLayer); - + aWriter.SetShapeFixParameters(aNode->ShapeFixParameters); if (!aWriter.Transfer(theDocument, theProgress)) { Message::SendFail() << "Error in the DEIGES_Provider during reading the file " << thePath @@ -319,6 +311,8 @@ bool DEIGES_Provider::Read(const TCollection_AsciiString& thePath, IGESControl_Reader aReader; aReader.SetWS(theWS); aReader.SetReadVisible(aNode->InternalParameters.ReadOnlyVisible); + aReader.SetShapeFixParameters(aNode->ShapeFixParameters); + IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid; aReadStat = aReader.ReadFile(thePath.ToCString()); if (aReadStat != IFSelect_RetDone) @@ -367,6 +361,7 @@ bool DEIGES_Provider::Write(const TCollection_AsciiString& thePath, aGS.SetScale(aNode->GlobalParameters.LengthUnit); } aWriter.Model()->SetGlobalSection(aGS); + aWriter.SetShapeFixParameters(aNode->ShapeFixParameters); Standard_Boolean aIsOk = aWriter.AddShape(theShape); if (!aIsOk) { diff --git a/src/DESTEP/DESTEP_ConfigurationNode.cxx b/src/DESTEP/DESTEP_ConfigurationNode.cxx index b7c7fc2aaf..45b424c06a 100644 --- a/src/DESTEP/DESTEP_ConfigurationNode.cxx +++ b/src/DESTEP/DESTEP_ConfigurationNode.cxx @@ -18,7 +18,7 @@ #include #include -IMPLEMENT_STANDARD_RTTIEXT(DESTEP_ConfigurationNode, DE_ConfigurationNode) +IMPLEMENT_STANDARD_RTTIEXT(DESTEP_ConfigurationNode, DE_ShapeFixConfigurationNode) namespace { @@ -35,14 +35,16 @@ DE_PluginHolder THE_OCCT_STEP_COMPONENT_PLUGIN; //================================================================================================= DESTEP_ConfigurationNode::DESTEP_ConfigurationNode() - : DE_ConfigurationNode() + : DE_ShapeFixConfigurationNode() { + DE_ShapeFixConfigurationNode::ShapeFixParameters = + DESTEP_Parameters::GetDefaultShapeFixParameters(); } //================================================================================================= DESTEP_ConfigurationNode::DESTEP_ConfigurationNode(const Handle(DESTEP_ConfigurationNode)& theNode) - : DE_ConfigurationNode(theNode), + : DE_ShapeFixConfigurationNode(theNode), InternalParameters(theNode->InternalParameters) { } @@ -87,10 +89,6 @@ bool DESTEP_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe InternalParameters.AngleUnit, aScope); - InternalParameters.ReadResourceName = - theResource->StringVal("read.resource.name", InternalParameters.ReadResourceName, aScope); - InternalParameters.ReadSequence = - theResource->StringVal("read.sequence", InternalParameters.ReadSequence, aScope); InternalParameters.ReadProductMode = theResource->BooleanVal("read.product.mode", InternalParameters.ReadProductMode, aScope); InternalParameters.ReadProductContext = @@ -173,10 +171,6 @@ bool DESTEP_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe (UnitsMethods_LengthUnit)theResource->IntegerVal("write.unit", InternalParameters.WriteUnit, aScope); - InternalParameters.WriteResourceName = - theResource->StringVal("write.resource.name", InternalParameters.WriteResourceName, aScope); - InternalParameters.WriteSequence = - theResource->StringVal("write.sequence", InternalParameters.WriteSequence, aScope); InternalParameters.WriteVertexMode = (DESTEP_Parameters::WriteMode_VertexMode) theResource->IntegerVal("write.vertex.mode", InternalParameters.WriteVertexMode, aScope); @@ -197,7 +191,7 @@ bool DESTEP_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe InternalParameters.WriteModelType, aScope); - return true; + return DE_ShapeFixConfigurationNode::Load(theResource); } //================================================================================================= @@ -292,18 +286,6 @@ TCollection_AsciiString DESTEP_ConfigurationNode::Save() const aResult += "!Read Parameters:\n"; aResult += "!\n"; - aResult += "!\n"; - aResult += "!Defines the name of the resource file\n"; - aResult += "!Default value: \"STEP\". Available values: \n"; - aResult += aScope + "read.resource.name :\t " + InternalParameters.ReadResourceName + "\n"; - aResult += "!\n"; - - aResult += "!\n"; - aResult += "!Defines name of the sequence of operators\n"; - aResult += "!Default value: \"FromSTEP\". Available values: \n"; - aResult += aScope + "read.sequence :\t " + InternalParameters.ReadSequence + "\n"; - aResult += "!\n"; - aResult += "!\n"; aResult += "!Defines the approach used for selection of top-level STEP entities for translation, "; @@ -514,18 +496,6 @@ TCollection_AsciiString DESTEP_ConfigurationNode::Save() const aResult += aScope + "write.unit :\t " + InternalParameters.WriteUnit + "\n"; aResult += "!\n"; - aResult += "!\n"; - aResult += "!Defines the name of the resource file\n"; - aResult += "!Default value: \"STEP\". Available values: \n"; - aResult += aScope + "write.resource.name :\t " + InternalParameters.WriteResourceName + "\n"; - aResult += "!\n"; - - aResult += "!\n"; - aResult += "!Defines name of the sequence of operators\n"; - aResult += "!Default value: \"ToSTEP\". Available values: \n"; - aResult += aScope + "write.sequence :\t " + InternalParameters.WriteSequence + "\n"; - aResult += "!\n"; - aResult += "!\n"; aResult += "!This parameter indicates which of free vertices writing mode is switch on\n"; aResult += "!Default value: 0(\"One Compound\"). Available values: 0(\"One Compound\"), " @@ -575,6 +545,8 @@ TCollection_AsciiString DESTEP_ConfigurationNode::Save() const aResult += aScope + "write.model.type :\t " + InternalParameters.WriteModelType + "\n"; aResult += "!\n"; + aResult += DE_ShapeFixConfigurationNode::Save(); + aResult += "!*****************************************************************************\n"; return aResult; diff --git a/src/DESTEP/DESTEP_ConfigurationNode.hxx b/src/DESTEP/DESTEP_ConfigurationNode.hxx index b4819ff6b5..338ea06739 100644 --- a/src/DESTEP/DESTEP_ConfigurationNode.hxx +++ b/src/DESTEP/DESTEP_ConfigurationNode.hxx @@ -15,7 +15,7 @@ #define _DESTEP_ConfigurationNode_HeaderFile #include -#include +#include #include #include #include @@ -30,9 +30,9 @@ //! The supported CAD extensions are ".stp", ".step", ".stpz" //! The import process is supported. //! The export process is supported. -class DESTEP_ConfigurationNode : public DE_ConfigurationNode +class DESTEP_ConfigurationNode : public DE_ShapeFixConfigurationNode { - DEFINE_STANDARD_RTTIEXT(DESTEP_ConfigurationNode, DE_ConfigurationNode) + DEFINE_STANDARD_RTTIEXT(DESTEP_ConfigurationNode, DE_ShapeFixConfigurationNode) public: //! Initializes all field by default Standard_EXPORT DESTEP_ConfigurationNode(); diff --git a/src/DESTEP/DESTEP_Parameters.cxx b/src/DESTEP/DESTEP_Parameters.cxx index e875ec3781..0dfe0bc7bd 100644 --- a/src/DESTEP/DESTEP_Parameters.cxx +++ b/src/DESTEP/DESTEP_Parameters.cxx @@ -37,9 +37,7 @@ void DESTEP_Parameters::InitFromStatic() EncodeRegAngle = Interface_Static::RVal("read.encoderegularity.angle") * 180.0 / M_PI; AngleUnit = (DESTEP_Parameters::AngleUnitMode)Interface_Static::IVal("step.angleunit.mode"); - ReadResourceName = Interface_Static::CVal("read.step.resource.name"); - ReadSequence = Interface_Static::CVal("read.step.sequence"); - ReadProductMode = Interface_Static::IVal("read.step.product.mode") == 1; + ReadProductMode = Interface_Static::IVal("read.step.product.mode") == 1; ReadProductContext = (DESTEP_Parameters::ReadMode_ProductContext)Interface_Static::IVal("read.step.product.context"); ReadShapeRepr = @@ -75,8 +73,6 @@ void DESTEP_Parameters::InitFromStatic() WriteProductName = Interface_Static::CVal("write.step.product.name"); WriteSurfaceCurMode = Interface_Static::IVal("write.surfacecurve.mode") == 1; WriteUnit = (UnitsMethods_LengthUnit)Interface_Static::IVal("write.step.unit"); - WriteResourceName = Interface_Static::CVal("write.step.resource.name"); - WriteSequence = Interface_Static::CVal("write.step.sequence"); WriteVertexMode = (DESTEP_Parameters::WriteMode_VertexMode)Interface_Static::IVal("write.step.vertex.mode"); WriteSubshapeNames = Interface_Static::IVal("write.stepcaf.subshapes.name") == 1; @@ -98,14 +94,7 @@ void DESTEP_Parameters::Reset() //================================================================================================= -DE_ShapeFixParameters DESTEP_Parameters::GetDefaultReadingParamsSTEP() -{ - return DE_ShapeFixParameters(); -} - -//================================================================================================= - -DE_ShapeFixParameters DESTEP_Parameters::GetDefaultWritingParamsSTEP() +DE_ShapeFixParameters DESTEP_Parameters::GetDefaultShapeFixParameters() { return DE_ShapeFixParameters(); } diff --git a/src/DESTEP/DESTEP_Parameters.hxx b/src/DESTEP/DESTEP_Parameters.hxx index 88e7244931..1ad457243c 100644 --- a/src/DESTEP/DESTEP_Parameters.hxx +++ b/src/DESTEP/DESTEP_Parameters.hxx @@ -145,11 +145,8 @@ public: } } - //! Returns default parameters for reading STEP files. - Standard_EXPORT static DE_ShapeFixParameters GetDefaultReadingParamsSTEP(); - - //! Returns default parameters for writing STEP files. - Standard_EXPORT static DE_ShapeFixParameters GetDefaultWritingParamsSTEP(); + //! Returns default shape fix parameters for transferring STEP files. + Standard_EXPORT static DE_ShapeFixParameters GetDefaultShapeFixParameters(); public: // Common @@ -165,8 +162,6 @@ public: AngleUnitMode AngleUnit = AngleUnitMode_File; //InternalParameters.ReadLayer); aReader.SetPropsMode(aNode->InternalParameters.ReadProps); aReader.SetMetaMode(aNode->InternalParameters.ReadMetadata); - + aReader.SetShapeFixParameters(aNode->ShapeFixParameters); IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid; DESTEP_Parameters aParams = aNode->InternalParameters; aReadStat = aReader.ReadFile(thePath.ToCString(), aParams); @@ -114,6 +114,7 @@ bool DESTEP_Provider::Write(const TCollection_AsciiString& thePath, aWriter.SetNameMode(aNode->InternalParameters.WriteName); aWriter.SetLayerMode(aNode->InternalParameters.WriteLayer); aWriter.SetPropsMode(aNode->InternalParameters.WriteProps); + aWriter.SetShapeFixParameters(aNode->ShapeFixParameters); DESTEP_Parameters aParams = aNode->InternalParameters; Standard_Real aScaleFactorMM = 1.; if (XCAFDoc_DocumentTool::GetLengthUnit(theDocument, @@ -200,6 +201,7 @@ bool DESTEP_Provider::Read(const TCollection_AsciiString& thePath, personizeWS(theWS); STEPControl_Reader aReader; aReader.SetWS(theWS); + aReader.SetShapeFixParameters(aNode->ShapeFixParameters); IFSelect_ReturnStatus aReadstat = IFSelect_RetVoid; DESTEP_Parameters aParams = aNode->InternalParameters; aReadstat = aReader.ReadFile(thePath.ToCString(), aParams); @@ -259,6 +261,7 @@ bool DESTEP_Provider::Write(const TCollection_AsciiString& thePath, { aModel->SetWriteLengthUnit(aNode->GlobalParameters.LengthUnit); } + aWriter.SetShapeFixParameters(aNode->ShapeFixParameters); aWritestat = aWriter.Transfer(theShape, aNode->InternalParameters.WriteModelType, aParams, diff --git a/src/IGESControl/IGESControl_ActorWrite.cxx b/src/IGESControl/IGESControl_ActorWrite.cxx index 9935b82ea3..d8d4a33c88 100644 --- a/src/IGESControl/IGESControl_ActorWrite.cxx +++ b/src/IGESControl/IGESControl_ActorWrite.cxx @@ -80,7 +80,7 @@ Handle(Transfer_Binder) IGESControl_ActorWrite::Transfer return NullResult(); } - XSAlgo_ShapeProcessor aShapeProcessor(GetParameters()); + XSAlgo_ShapeProcessor aShapeProcessor(GetShapeFixParameters()); shape = aShapeProcessor.ProcessShape(shape, GetShapeProcessFlags().first, theProgress); BRepToIGES_BREntity BR0; BR0.SetModel(modl); BR0.SetTransferProcess(FP); diff --git a/src/IGESControl/IGESControl_Reader.cxx b/src/IGESControl/IGESControl_Reader.cxx index 864b7778f2..3f220962c0 100644 --- a/src/IGESControl/IGESControl_Reader.cxx +++ b/src/IGESControl/IGESControl_Reader.cxx @@ -318,9 +318,9 @@ void IGESControl_Reader::PrintTransferInfo //================================================================================================= -DE_ShapeFixParameters IGESControl_Reader::GetDefaultParameters() const +DE_ShapeFixParameters IGESControl_Reader::GetDefaultShapeFixParameters() const { - return DEIGES_Parameters::GetDefaultReadingParamsIGES(); + return DEIGES_Parameters::GetDefaultShapeFixParameters(); } //================================================================================================= diff --git a/src/IGESControl/IGESControl_Reader.hxx b/src/IGESControl/IGESControl_Reader.hxx index cc3d0023dd..31d0b9bbef 100644 --- a/src/IGESControl/IGESControl_Reader.hxx +++ b/src/IGESControl/IGESControl_Reader.hxx @@ -94,7 +94,7 @@ public: protected: //! Returns default parameters for shape fixing. //! @return default parameters for shape fixing. - Standard_EXPORT virtual DE_ShapeFixParameters GetDefaultParameters() const Standard_OVERRIDE; + Standard_EXPORT virtual DE_ShapeFixParameters GetDefaultShapeFixParameters() const Standard_OVERRIDE; //! Returns default flags for shape processing. //! @return Default flags for shape processing. diff --git a/src/IGESControl/IGESControl_Writer.cxx b/src/IGESControl/IGESControl_Writer.cxx index ac0e6c3838..3d5cd16406 100644 --- a/src/IGESControl/IGESControl_Writer.cxx +++ b/src/IGESControl/IGESControl_Writer.cxx @@ -271,21 +271,21 @@ Standard_Boolean IGESControl_Writer::Write //============================================================================= -void IGESControl_Writer::SetParameters(const ParameterMap& theParameters) +void IGESControl_Writer::SetShapeFixParameters(const ParameterMap& theParameters) { myShapeProcParams = theParameters; } //============================================================================= -void IGESControl_Writer::SetParameters(ParameterMap&& theParameters) +void IGESControl_Writer::SetShapeFixParameters(ParameterMap&& theParameters) { myShapeProcParams = std::move(theParameters); } //============================================================================= -void IGESControl_Writer::SetParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) +void IGESControl_Writer::SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) { myShapeProcParams.clear(); XSAlgo_ShapeProcessor::FillParameterMap(theParameters, true, myShapeProcParams); @@ -310,9 +310,9 @@ void IGESControl_Writer::SetShapeProcessFlags(const ShapeProcess::OperationsFlag void IGESControl_Writer::InitializeMissingParameters() { - if (GetParameters().empty()) + if (GetShapeFixParameters().empty()) { - SetParameters(DEIGES_Parameters::GetDefaultWritingParamsIGES()); + SetShapeFixParameters(DEIGES_Parameters::GetDefaultShapeFixParameters()); } if (!myShapeProcFlags.second) diff --git a/src/IGESControl/IGESControl_Writer.hxx b/src/IGESControl/IGESControl_Writer.hxx index 226a4e59b2..99cd1b635d 100644 --- a/src/IGESControl/IGESControl_Writer.hxx +++ b/src/IGESControl/IGESControl_Writer.hxx @@ -127,12 +127,12 @@ public: //! Sets parameters for shape processing. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(const ParameterMap& theParameters); + Standard_EXPORT void SetShapeFixParameters(const ParameterMap& theParameters); //! Sets parameters for shape processing. //! Parameters are moved from the input map. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(ParameterMap&& theParameters); + Standard_EXPORT void SetShapeFixParameters(ParameterMap&& theParameters); //! Sets parameters for shape processing. //! Parameters from @p theParameters are copied to the internal map. @@ -140,12 +140,12 @@ public: //! if they are not present in @p theParameters. //! @param theParameters the parameters for shape processing. //! @param theAdditionalParameters the additional parameters for shape processing. - Standard_EXPORT void SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters = {}); + Standard_EXPORT void SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters = {}); //! Returns parameters for shape processing that was set by SetParameters() method. //! @return the parameters for shape processing. Empty map if no parameters were set. - inline const ParameterMap& GetParameters() const { return myShapeProcParams; } + inline const ParameterMap& GetShapeFixParameters() const { return myShapeProcParams; } //! Sets flags defining operations to be performed on shapes. //! @param theFlags The flags defining operations to be performed on shapes. @@ -157,7 +157,7 @@ public: private: //! If parameters haven't yet been provided, initializes them with default values - //! provided by GetDefaultParameters() method. + //! provided by GetDefaultShapeFixParameters() method. void InitializeMissingParameters(); private: diff --git a/src/IGESToBRep/IGESToBRep_Actor.cxx b/src/IGESToBRep/IGESToBRep_Actor.cxx index cd79287cff..425918538c 100644 --- a/src/IGESToBRep/IGESToBRep_Actor.cxx +++ b/src/IGESToBRep/IGESToBRep_Actor.cxx @@ -191,7 +191,7 @@ Handle(Transfer_Binder) IGESToBRep_Actor::Transfer // Set tolerances for shape processing. // These parameters are calculated inside IGESToBRep_Actor::Transfer() and cannot be set from outside. - Transfer_ActorOfTransientProcess::ParameterMap aParameters = GetParameters(); + Transfer_ActorOfTransientProcess::ParameterMap aParameters = GetShapeFixParameters(); XSAlgo_ShapeProcessor::SetParameter("FixShape.Tolerance3d", theeps, true, aParameters); XSAlgo_ShapeProcessor::SetParameter("FixShape.MaxTolerance3d", CAS.GetMaxTol(), true, aParameters); diff --git a/src/IGESToBRep/IGESToBRep_Reader.cxx b/src/IGESToBRep/IGESToBRep_Reader.cxx index b9a84d90d9..526fe996f1 100644 --- a/src/IGESToBRep/IGESToBRep_Reader.cxx +++ b/src/IGESToBRep/IGESToBRep_Reader.cxx @@ -579,21 +579,21 @@ TopoDS_Shape IGESToBRep_Reader::OneShape() const //============================================================================= -void IGESToBRep_Reader::SetParameters(const ParameterMap& theParameters) +void IGESToBRep_Reader::SetShapeFixParameters(const ParameterMap& theParameters) { myShapeProcParams = theParameters; } //============================================================================= -void IGESToBRep_Reader::SetParameters(ParameterMap&& theParameters) +void IGESToBRep_Reader::SetShapeFixParameters(ParameterMap&& theParameters) { myShapeProcParams = std::move(theParameters); } //============================================================================= -void IGESToBRep_Reader::SetParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) +void IGESToBRep_Reader::SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) { myShapeProcParams.clear(); XSAlgo_ShapeProcessor::FillParameterMap(theParameters, true, myShapeProcParams); @@ -618,9 +618,9 @@ void IGESToBRep_Reader::SetShapeProcessFlags(const ShapeProcess::OperationsFlags void IGESToBRep_Reader::InitializeMissingParameters() { - if (GetParameters().empty()) + if (GetShapeFixParameters().empty()) { - SetParameters(DEIGES_Parameters::GetDefaultReadingParamsIGES()); + SetShapeFixParameters(DEIGES_Parameters::GetDefaultShapeFixParameters()); } if (!myShapeProcFlags.second) diff --git a/src/IGESToBRep/IGESToBRep_Reader.hxx b/src/IGESToBRep/IGESToBRep_Reader.hxx index 2efcc1f331..bb08ddd89d 100644 --- a/src/IGESToBRep/IGESToBRep_Reader.hxx +++ b/src/IGESToBRep/IGESToBRep_Reader.hxx @@ -118,12 +118,12 @@ public: //! Sets parameters for shape processing. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(const ParameterMap& theParameters); + Standard_EXPORT void SetShapeFixParameters(const ParameterMap& theParameters); //! Sets parameters for shape processing. //! Parameters are moved from the input map. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(ParameterMap&& theParameters); + Standard_EXPORT void SetShapeFixParameters(ParameterMap&& theParameters); //! Sets parameters for shape processing. //! Parameters from @p theParameters are copied to the internal map. @@ -131,12 +131,12 @@ public: //! if they are not present in @p theParameters. //! @param theParameters the parameters for shape processing. //! @param theAdditionalParameters the additional parameters for shape processing. - Standard_EXPORT void SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters = {}); + Standard_EXPORT void SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters = {}); //! Returns parameters for shape processing that was set by SetParameters() method. //! @return the parameters for shape processing. Empty map if no parameters were set. - inline const ParameterMap& GetParameters() const { return myShapeProcParams; } + inline const ParameterMap& GetShapeFixParameters() const { return myShapeProcParams; } //! Sets flags defining operations to be performed on shapes. //! @param theFlags The flags defining operations to be performed on shapes. diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx index bac85d5b5e..cb7f2348a2 100644 --- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx @@ -5370,31 +5370,31 @@ Standard_Boolean STEPCAFControl_Reader::GetViewMode() const //============================================================================= -void STEPCAFControl_Reader::SetParameters(const ParameterMap& theParameters) +void STEPCAFControl_Reader::SetShapeFixParameters(const ParameterMap& theParameters) { - myReader.SetParameters(theParameters); + myReader.SetShapeFixParameters(theParameters); } //============================================================================= -void STEPCAFControl_Reader::SetParameters(ParameterMap&& theParameters) +void STEPCAFControl_Reader::SetShapeFixParameters(ParameterMap&& theParameters) { - myReader.SetParameters(std::move(theParameters)); + myReader.SetShapeFixParameters(std::move(theParameters)); } //============================================================================= -void STEPCAFControl_Reader::SetParameters(const DE_ShapeFixParameters& theParameters, +void STEPCAFControl_Reader::SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) { - myReader.SetParameters(theParameters, theAdditionalParameters); + myReader.SetShapeFixParameters(theParameters, theAdditionalParameters); } //============================================================================= -const STEPCAFControl_Reader::ParameterMap& STEPCAFControl_Reader::GetParameters() const +const STEPCAFControl_Reader::ParameterMap& STEPCAFControl_Reader::GetShapeFixParameters() const { - return myReader.GetParameters(); + return myReader.GetShapeFixParameters(); } //============================================================================= diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.hxx b/src/STEPCAFControl/STEPCAFControl_Reader.hxx index fee945ee5b..3a1e724ebd 100644 --- a/src/STEPCAFControl/STEPCAFControl_Reader.hxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.hxx @@ -213,12 +213,12 @@ public: //! Sets parameters for shape processing. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(const ParameterMap& theParameters); + Standard_EXPORT void SetShapeFixParameters(const ParameterMap& theParameters); //! Sets parameters for shape processing. //! Parameters are moved from the input map. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(ParameterMap&& theParameters); + Standard_EXPORT void SetShapeFixParameters(ParameterMap&& theParameters); //! Sets parameters for shape processing. //! Parameters from @p theParameters are copied to the internal map. @@ -226,12 +226,12 @@ public: //! if they are not present in @p theParameters. //! @param theParameters the parameters for shape processing. //! @param theAdditionalParameters the additional parameters for shape processing. - Standard_EXPORT void SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters = {}); + Standard_EXPORT void SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters = {}); //! Returns parameters for shape processing that was set by SetParameters() method. //! @return the parameters for shape processing. Empty map if no parameters were set. - Standard_EXPORT const ParameterMap& GetParameters() const; + Standard_EXPORT const ParameterMap& GetShapeFixParameters() const; //! Sets flags defining operations to be performed on shapes. //! @param theFlags The flags defining operations to be performed on shapes. diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx index 1070ad55cc..95f83aa338 100644 --- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx @@ -565,31 +565,31 @@ Standard_Boolean STEPCAFControl_Writer::ExternFile(const Standard_CString theNam //============================================================================= -void STEPCAFControl_Writer::SetParameters(const ParameterMap& theParameters) +void STEPCAFControl_Writer::SetShapeFixParameters(const ParameterMap& theParameters) { - myWriter.SetParameters(theParameters); + myWriter.SetShapeFixParameters(theParameters); } //============================================================================= -void STEPCAFControl_Writer::SetParameters(ParameterMap&& theParameters) +void STEPCAFControl_Writer::SetShapeFixParameters(ParameterMap&& theParameters) { - myWriter.SetParameters(std::move(theParameters)); + myWriter.SetShapeFixParameters(std::move(theParameters)); } //============================================================================= -void STEPCAFControl_Writer::SetParameters(const DE_ShapeFixParameters& theParameters, +void STEPCAFControl_Writer::SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) { - myWriter.SetParameters(theParameters, theAdditionalParameters); + myWriter.SetShapeFixParameters(theParameters, theAdditionalParameters); } //============================================================================= -const STEPCAFControl_Writer::ParameterMap& STEPCAFControl_Writer::GetParameters() const +const STEPCAFControl_Writer::ParameterMap& STEPCAFControl_Writer::GetShapeFixParameters() const { - return myWriter.GetParameters(); + return myWriter.GetShapeFixParameters(); } //============================================================================= diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.hxx b/src/STEPCAFControl/STEPCAFControl_Writer.hxx index 5cb27b312a..dc71d7bb9e 100644 --- a/src/STEPCAFControl/STEPCAFControl_Writer.hxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.hxx @@ -216,12 +216,12 @@ public: //! Sets parameters for shape processing. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(const ParameterMap& theParameters); + Standard_EXPORT void SetShapeFixParameters(const ParameterMap& theParameters); //! Sets parameters for shape processing. //! Parameters are moved from the input map. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(ParameterMap&& theParameters); + Standard_EXPORT void SetShapeFixParameters(ParameterMap&& theParameters); //! Sets parameters for shape processing. //! Parameters from @p theParameters are copied to the internal map. @@ -229,12 +229,12 @@ public: //! if they are not present in @p theParameters. //! @param theParameters the parameters for shape processing. //! @param theAdditionalParameters the additional parameters for shape processing. - Standard_EXPORT void SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters = {}); + Standard_EXPORT void SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters = {}); //! Returns parameters for shape processing that was set by SetParameters() method. //! @return the parameters for shape processing. Empty map if no parameters were set. - Standard_EXPORT const ParameterMap& GetParameters() const; + Standard_EXPORT const ParameterMap& GetShapeFixParameters() const; //! Sets flags defining operations to be performed on shapes. //! @param theFlags The flags defining operations to be performed on shapes. diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx index 3f09e2c6c8..e1a5c1fa7b 100644 --- a/src/STEPControl/STEPControl_ActorRead.cxx +++ b/src/STEPControl/STEPControl_ActorRead.cxx @@ -935,7 +935,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity( // Set tolerances for shape processing. // These parameters are calculated inside STEPControl_ActorRead::Transfer() and cannot be set from outside. - Transfer_ActorOfTransientProcess::ParameterMap aParameters = GetParameters(); + Transfer_ActorOfTransientProcess::ParameterMap aParameters = GetShapeFixParameters(); XSAlgo_ShapeProcessor::SetParameter("FixShape.Tolerance3d", myPrecision, true, aParameters); XSAlgo_ShapeProcessor::SetParameter("FixShape.MaxTolerance3d", myMaxTol, true, aParameters); XSAlgo_ShapeProcessor::SetParameter("FixShape.NonManifold", std::to_string(true), true, aParameters); @@ -1559,7 +1559,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity { // Set tolerances for shape processing. // These parameters are calculated inside STEPControl_ActorRead::Transfer() and cannot be set from outside. - Transfer_ActorOfTransientProcess::ParameterMap aParameters = GetParameters(); + Transfer_ActorOfTransientProcess::ParameterMap aParameters = GetShapeFixParameters(); XSAlgo_ShapeProcessor::SetParameter("FixShape.Tolerance3d", myPrecision, true, aParameters); XSAlgo_ShapeProcessor::SetParameter("FixShape.MaxTolerance3d", myMaxTol, true, aParameters); XSAlgo_ShapeProcessor aShapeProcessor(aParameters); @@ -1731,7 +1731,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity { TopoDS_Shape S = sb->Result(); - Transfer_ActorOfTransientProcess::ParameterMap aParameters = GetParameters(); + Transfer_ActorOfTransientProcess::ParameterMap aParameters = GetShapeFixParameters(); XSAlgo_ShapeProcessor::SetParameter("FixShape.Tolerance3d", myPrecision, true, aParameters); XSAlgo_ShapeProcessor::SetParameter("FixShape.MaxTolerance3d", myMaxTol, true, aParameters); XSAlgo_ShapeProcessor aShapeProcessor(aParameters); diff --git a/src/STEPControl/STEPControl_ActorWrite.cxx b/src/STEPControl/STEPControl_ActorWrite.cxx index afdfeedccb..6231ba17a1 100644 --- a/src/STEPControl/STEPControl_ActorWrite.cxx +++ b/src/STEPControl/STEPControl_ActorWrite.cxx @@ -962,7 +962,7 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferShape TopoDS_Shape aShape = xShape; - Transfer_ActorOfFinderProcess::ParameterMap aParameters = GetParameters(); + Transfer_ActorOfFinderProcess::ParameterMap aParameters = GetShapeFixParameters(); XSAlgo_ShapeProcessor::SetParameter("FixShape.Tolerance3d", Tol, true, aParameters); XSAlgo_ShapeProcessor::SetParameter("FixShape.MaxTolerance3d", aStepModel->InternalParameters.ReadMaxPrecisionVal, diff --git a/src/STEPControl/STEPControl_Reader.cxx b/src/STEPControl/STEPControl_Reader.cxx index 32a1c01514..ffe2f804d2 100644 --- a/src/STEPControl/STEPControl_Reader.cxx +++ b/src/STEPControl/STEPControl_Reader.cxx @@ -654,9 +654,9 @@ inline static TCollection_AsciiString getSiName(const Handle(StepBasic_SiUnit)& //================================================================================================= -DE_ShapeFixParameters STEPControl_Reader::GetDefaultParameters() const +DE_ShapeFixParameters STEPControl_Reader::GetDefaultShapeFixParameters() const { - return DESTEP_Parameters::GetDefaultReadingParamsSTEP(); + return DESTEP_Parameters::GetDefaultShapeFixParameters(); } //================================================================================================= diff --git a/src/STEPControl/STEPControl_Reader.hxx b/src/STEPControl/STEPControl_Reader.hxx index 3ae8d7ea85..2726b8b81e 100644 --- a/src/STEPControl/STEPControl_Reader.hxx +++ b/src/STEPControl/STEPControl_Reader.hxx @@ -130,7 +130,7 @@ protected: //! Returns default parameters for shape fixing. //! This method is used by the base class to get default parameters for shape fixing. //! @return default parameters for shape fixing. - Standard_EXPORT virtual DE_ShapeFixParameters GetDefaultParameters() const Standard_OVERRIDE; + Standard_EXPORT virtual DE_ShapeFixParameters GetDefaultShapeFixParameters() const Standard_OVERRIDE; //! Returns default flags for shape processing. //! @return Default flags for shape processing. diff --git a/src/STEPControl/STEPControl_Writer.cxx b/src/STEPControl/STEPControl_Writer.cxx index d61418fe80..a7a39e0235 100644 --- a/src/STEPControl/STEPControl_Writer.cxx +++ b/src/STEPControl/STEPControl_Writer.cxx @@ -219,42 +219,42 @@ void STEPControl_Writer::PrintStatsTransfer } //============================================================================= -void STEPControl_Writer::SetParameters(const ParameterMap& theParameters) +void STEPControl_Writer::SetShapeFixParameters(const ParameterMap& theParameters) { if (Handle(Transfer_ActorOfFinderProcess) anActor = GetActor()) { - anActor->SetParameters(theParameters); + anActor->SetShapeFixParameters(theParameters); } } //============================================================================= -void STEPControl_Writer::SetParameters(ParameterMap&& theParameters) +void STEPControl_Writer::SetShapeFixParameters(ParameterMap&& theParameters) { if (Handle(Transfer_ActorOfFinderProcess) anActor = GetActor()) { - anActor->SetParameters(std::move(theParameters)); + anActor->SetShapeFixParameters(std::move(theParameters)); } } //============================================================================= -void STEPControl_Writer::SetParameters(const DE_ShapeFixParameters& theParameters, +void STEPControl_Writer::SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) { if (Handle(Transfer_ActorOfFinderProcess) anActor = GetActor()) { - anActor->SetParameters(theParameters, theAdditionalParameters); + anActor->SetShapeFixParameters(theParameters, theAdditionalParameters); } } //============================================================================= -const STEPControl_Writer::ParameterMap& STEPControl_Writer::GetParameters() const +const STEPControl_Writer::ParameterMap& STEPControl_Writer::GetShapeFixParameters() const { static const ParameterMap anEmptyMap; const Handle(Transfer_ActorOfFinderProcess) anActor = GetActor(); - return anActor.IsNull() ? anEmptyMap : anActor->GetParameters(); + return anActor.IsNull() ? anEmptyMap : anActor->GetShapeFixParameters(); } //============================================================================= @@ -299,9 +299,9 @@ Handle(Transfer_ActorOfFinderProcess) STEPControl_Writer::GetActor() const void STEPControl_Writer::InitializeMissingParameters() { - if (GetParameters().empty()) + if (GetShapeFixParameters().empty()) { - SetParameters(DESTEP_Parameters::GetDefaultWritingParamsSTEP()); + SetShapeFixParameters(DESTEP_Parameters::GetDefaultShapeFixParameters()); } if (GetShapeProcessFlags().second == false) { diff --git a/src/STEPControl/STEPControl_Writer.hxx b/src/STEPControl/STEPControl_Writer.hxx index 1fbc364556..961550d25f 100644 --- a/src/STEPControl/STEPControl_Writer.hxx +++ b/src/STEPControl/STEPControl_Writer.hxx @@ -135,12 +135,12 @@ public: //! Sets parameters for shape processing. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(const ParameterMap& theParameters); + Standard_EXPORT void SetShapeFixParameters(const ParameterMap& theParameters); //! Sets parameters for shape processing. //! Parameters are moved from the input map. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(ParameterMap&& theParameters); + Standard_EXPORT void SetShapeFixParameters(ParameterMap&& theParameters); //! Sets parameters for shape processing. //! Parameters from @p theParameters are copied to the internal map. @@ -148,12 +148,12 @@ public: //! if they are not present in @p theParameters. //! @param theParameters the parameters for shape processing. //! @param theAdditionalParameters the additional parameters for shape processing. - Standard_EXPORT void SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters = {}); + Standard_EXPORT void SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters = {}); //! Returns parameters for shape processing that was set by SetParameters() method. //! @return the parameters for shape processing. Empty map if no parameters were set. - Standard_EXPORT const ParameterMap& GetParameters() const; + Standard_EXPORT const ParameterMap& GetShapeFixParameters() const; //! Sets flags defining operations to be performed on shapes. //! @param theFlags The flags defining operations to be performed on shapes. @@ -171,7 +171,7 @@ private: Handle(Transfer_ActorOfFinderProcess) GetActor() const; //! If parameters haven't yet been provided, initializes them with default values - //! provided by GetDefaultParameters() method. + //! provided by GetDefaultShapeFixParameters() method. void InitializeMissingParameters(); private: diff --git a/src/Transfer/Transfer_ActorOfFinderProcess.cxx b/src/Transfer/Transfer_ActorOfFinderProcess.cxx index 0214b6e5be..bda5ac1b15 100644 --- a/src/Transfer/Transfer_ActorOfFinderProcess.cxx +++ b/src/Transfer/Transfer_ActorOfFinderProcess.cxx @@ -70,22 +70,22 @@ Handle(Standard_Transient) Transfer_ActorOfFinderProcess::TransferTransient //============================================================================= -void Transfer_ActorOfFinderProcess::SetParameters(const ParameterMap& theParameters) +void Transfer_ActorOfFinderProcess::SetShapeFixParameters(const ParameterMap& theParameters) { myShapeProcParams = theParameters; } //============================================================================= -void Transfer_ActorOfFinderProcess::SetParameters(ParameterMap&& theParameters) +void Transfer_ActorOfFinderProcess::SetShapeFixParameters(ParameterMap&& theParameters) { myShapeProcParams = std::move(theParameters); } //============================================================================= -void Transfer_ActorOfFinderProcess::SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters) +void Transfer_ActorOfFinderProcess::SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters) { myShapeProcParams.clear(); XSAlgo_ShapeProcessor::FillParameterMap(theParameters, true, myShapeProcParams); diff --git a/src/Transfer/Transfer_ActorOfFinderProcess.hxx b/src/Transfer/Transfer_ActorOfFinderProcess.hxx index eb93725535..a534654ae5 100644 --- a/src/Transfer/Transfer_ActorOfFinderProcess.hxx +++ b/src/Transfer/Transfer_ActorOfFinderProcess.hxx @@ -70,12 +70,12 @@ public: //! Sets parameters for shape processing. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(const ParameterMap& theParameters); + Standard_EXPORT void SetShapeFixParameters(const ParameterMap& theParameters); //! Sets parameters for shape processing. //! Parameters are moved from the input map. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(ParameterMap&& theParameters); + Standard_EXPORT void SetShapeFixParameters(ParameterMap&& theParameters); //! Sets parameters for shape processing. //! Parameters from @p theParameters are copied to the internal map. @@ -83,12 +83,12 @@ public: //! if they are not present in @p theParameters. //! @param theParameters the parameters for shape processing. //! @param theAdditionalParameters the additional parameters for shape processing. - Standard_EXPORT void SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters = {}); + Standard_EXPORT void SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters = {}); //! Returns parameters for shape processing that was set by SetParameters() method. //! @return the parameters for shape processing. Empty map if no parameters were set. - inline const ParameterMap& GetParameters() const { return myShapeProcParams; } + inline const ParameterMap& GetShapeFixParameters() const { return myShapeProcParams; } //! Sets flags defining operations to be performed on shapes. //! @param theFlags The flags defining operations to be performed on shapes. diff --git a/src/Transfer/Transfer_ActorOfTransientProcess.cxx b/src/Transfer/Transfer_ActorOfTransientProcess.cxx index 9b8e942a83..9767439bcc 100644 --- a/src/Transfer/Transfer_ActorOfTransientProcess.cxx +++ b/src/Transfer/Transfer_ActorOfTransientProcess.cxx @@ -59,22 +59,22 @@ Handle(Standard_Transient) Transfer_ActorOfTransientProcess::TransferTransient //============================================================================= -void Transfer_ActorOfTransientProcess::SetParameters(const ParameterMap& theParameters) +void Transfer_ActorOfTransientProcess::SetShapeFixParameters(const ParameterMap& theParameters) { myShapeProcParams = theParameters; } //============================================================================= -void Transfer_ActorOfTransientProcess::SetParameters(ParameterMap&& theParameters) +void Transfer_ActorOfTransientProcess::SetShapeFixParameters(ParameterMap&& theParameters) { myShapeProcParams = std::move(theParameters); } //============================================================================= -void Transfer_ActorOfTransientProcess::SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters) +void Transfer_ActorOfTransientProcess::SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters) { myShapeProcParams.clear(); XSAlgo_ShapeProcessor::FillParameterMap(theParameters, true, myShapeProcParams); diff --git a/src/Transfer/Transfer_ActorOfTransientProcess.hxx b/src/Transfer/Transfer_ActorOfTransientProcess.hxx index c3c4a2b24d..8aa21e28eb 100644 --- a/src/Transfer/Transfer_ActorOfTransientProcess.hxx +++ b/src/Transfer/Transfer_ActorOfTransientProcess.hxx @@ -62,12 +62,12 @@ public: //! Sets parameters for shape processing. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(const ParameterMap& theParameters); + Standard_EXPORT void SetShapeFixParameters(const ParameterMap& theParameters); //! Sets parameters for shape processing. //! Parameters are moved from the input map. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(ParameterMap&& theParameters); + Standard_EXPORT void SetShapeFixParameters(ParameterMap&& theParameters); //! Sets parameters for shape processing. //! Parameters from @p theParameters are copied to the internal map. @@ -75,12 +75,12 @@ public: //! if they are not present in @p theParameters. //! @param theParameters the parameters for shape processing. //! @param theAdditionalParameters the additional parameters for shape processing. - Standard_EXPORT void SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters = {}); + Standard_EXPORT void SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters = {}); //! Returns parameters for shape processing that was set by SetParameters() method. //! @return the parameters for shape processing. Empty map if no parameters were set. - inline const ParameterMap& GetParameters() const { return myShapeProcParams; } + inline const ParameterMap& GetShapeFixParameters() const { return myShapeProcParams; } //! Sets flags defining operations to be performed on shapes. //! @param theFlags The flags defining operations to be performed on shapes. diff --git a/src/XSControl/XSControl_Reader.cxx b/src/XSControl/XSControl_Reader.cxx index 7f8fe81c5e..0c94e18c25 100644 --- a/src/XSControl/XSControl_Reader.cxx +++ b/src/XSControl/XSControl_Reader.cxx @@ -490,41 +490,41 @@ void XSControl_Reader::GetStatsTransfer (const Handle(TColStd_HSequenceOfTransie //============================================================================= -void XSControl_Reader::SetParameters(const ParameterMap& theParameters) +void XSControl_Reader::SetShapeFixParameters(const ParameterMap& theParameters) { if (Handle(Transfer_ActorOfTransientProcess) anActor = GetActor()) { - anActor->SetParameters(theParameters); + anActor->SetShapeFixParameters(theParameters); } } //============================================================================= -void XSControl_Reader::SetParameters(ParameterMap&& theParameters) +void XSControl_Reader::SetShapeFixParameters(ParameterMap&& theParameters) { if (Handle(Transfer_ActorOfTransientProcess) anActor = GetActor()) { - anActor->SetParameters(std::move(theParameters)); + anActor->SetShapeFixParameters(std::move(theParameters)); } } //============================================================================= -void XSControl_Reader::SetParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) +void XSControl_Reader::SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, const ParameterMap& theAdditionalParameters) { if (Handle(Transfer_ActorOfTransientProcess) anActor = GetActor()) { - anActor->SetParameters(theParameters, theAdditionalParameters); + anActor->SetShapeFixParameters(theParameters, theAdditionalParameters); } } //============================================================================= -const XSControl_Reader::ParameterMap& XSControl_Reader::GetParameters() const +const XSControl_Reader::ParameterMap& XSControl_Reader::GetShapeFixParameters() const { static const ParameterMap anEmptyMap; const Handle(Transfer_ActorOfTransientProcess) anActor = GetActor(); - return anActor.IsNull() ? anEmptyMap : anActor->GetParameters(); + return anActor.IsNull() ? anEmptyMap : anActor->GetShapeFixParameters(); } //============================================================================= @@ -569,9 +569,9 @@ Handle(Transfer_ActorOfTransientProcess) XSControl_Reader::GetActor() const void XSControl_Reader::InitializeMissingParameters() { - if (GetParameters().empty()) + if (GetShapeFixParameters().empty()) { - SetParameters(GetDefaultParameters()); + SetShapeFixParameters(GetDefaultShapeFixParameters()); } if (!GetShapeProcessFlags().second) { diff --git a/src/XSControl/XSControl_Reader.hxx b/src/XSControl/XSControl_Reader.hxx index 6b9bd7461d..0d79e7d56c 100644 --- a/src/XSControl/XSControl_Reader.hxx +++ b/src/XSControl/XSControl_Reader.hxx @@ -269,12 +269,12 @@ public: //! Sets parameters for shape processing. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(const ParameterMap& theParameters); + Standard_EXPORT void SetShapeFixParameters(const ParameterMap& theParameters); //! Sets parameters for shape processing. //! Parameters are moved from the input map. //! @param theParameters the parameters for shape processing. - Standard_EXPORT void SetParameters(ParameterMap&& theParameters); + Standard_EXPORT void SetShapeFixParameters(ParameterMap&& theParameters); //! Sets parameters for shape processing. //! Parameters from @p theParameters are copied to the internal map. @@ -282,12 +282,12 @@ public: //! if they are not present in @p theParameters. //! @param theParameters the parameters for shape processing. //! @param theAdditionalParameters the additional parameters for shape processing. - Standard_EXPORT void SetParameters(const DE_ShapeFixParameters& theParameters, - const ParameterMap& theAdditionalParameters = {}); + Standard_EXPORT void SetShapeFixParameters(const DE_ShapeFixParameters& theParameters, + const ParameterMap& theAdditionalParameters = {}); //! Returns parameters for shape processing that was set by SetParameters() method. //! @return the parameters for shape processing. Empty map if no parameters were set. - Standard_EXPORT const ParameterMap& GetParameters() const; + Standard_EXPORT const ParameterMap& GetShapeFixParameters() const; //! Sets flags defining operations to be performed on shapes. //! @param theFlags The flags defining operations to be performed on shapes. @@ -305,7 +305,7 @@ protected: //! Returns default parameters for shape fixing. //! This method should be implemented in the derived classes to return default parameters for shape fixing. //! @return Default parameters for shape fixing. - virtual DE_ShapeFixParameters GetDefaultParameters() const { return DE_ShapeFixParameters(); } + virtual DE_ShapeFixParameters GetDefaultShapeFixParameters() const { return DE_ShapeFixParameters(); } //! Returns default flags for shape processing. //! This method should be implemented in the derived classes to return default flags for shape processing. @@ -319,7 +319,7 @@ private: Handle(Transfer_ActorOfTransientProcess) GetActor() const; //! If parameters haven't yet been provided, initializes them with default values - //! provided by GetDefaultParameters() method. + //! provided by GetDefaultShapeFixParameters() method. void InitializeMissingParameters(); protected: diff --git a/src/XSDRAWIGES/XSDRAWIGES.cxx b/src/XSDRAWIGES/XSDRAWIGES.cxx index 17ff75fe92..b8e6aa525e 100644 --- a/src/XSDRAWIGES/XSDRAWIGES.cxx +++ b/src/XSDRAWIGES/XSDRAWIGES.cxx @@ -218,7 +218,7 @@ static Standard_Integer igesbrep(Draw_Interpretor& theDI, XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("read.iges.resource.name", "read.iges.sequence"); - Reader.SetParameters(std::move(aProcessingData.first)); + Reader.SetShapeFixParameters(std::move(aProcessingData.first)); Reader.SetShapeProcessFlags(aProcessingData.second); if (modepri == 0) @@ -496,7 +496,7 @@ static Standard_Integer testread(Draw_Interpretor& theDI, XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("read.iges.resource.name", "read.iges.sequence"); - Reader.SetParameters(std::move(aProcessingData.first)); + Reader.SetShapeFixParameters(std::move(aProcessingData.first)); Reader.SetShapeProcessFlags(aProcessingData.second); Reader.TransferRoots(); @@ -532,7 +532,7 @@ static Standard_Integer brepiges(Draw_Interpretor& theDI, XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("write.iges.resource.name", "write.iges.sequence"); - anIgesWriter.SetParameters(std::move(aProcessingData.first)); + anIgesWriter.SetShapeFixParameters(std::move(aProcessingData.first)); anIgesWriter.SetShapeProcessFlags(aProcessingData.second); Message_ProgressScope aStepProgress(aRootProgress.Next(90), NULL, theNbArgs); @@ -594,7 +594,7 @@ static Standard_Integer testwrite(Draw_Interpretor& theDI, IGESControl_Writer Writer; XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("write.iges.resource.name", "write.iges.sequence"); - Writer.SetParameters(std::move(aProcessingData.first)); + Writer.SetShapeFixParameters(std::move(aProcessingData.first)); Writer.SetShapeProcessFlags(aProcessingData.second); Standard_CString filename = theArgVec[1]; TopoDS_Shape shape = DBRep::Get(theArgVec[2]); @@ -831,7 +831,7 @@ static Standard_Integer etest(Draw_Interpretor& theDI, aReader.SetReadVisible(Standard_True); XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("read.iges.resource.name", "read.iges.sequence"); - aReader.SetParameters(std::move(aProcessingData.first)); + aReader.SetShapeFixParameters(std::move(aProcessingData.first)); aReader.SetShapeProcessFlags(aProcessingData.second); aReader.TransferRoots(); TopoDS_Shape shape = aReader.OneShape(); @@ -907,7 +907,7 @@ static Standard_Integer ReadIges(Draw_Interpretor& theDI, XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("read.iges.resource.name", "read.iges.sequence"); - aReader.SetParameters(std::move(aProcessingData.first)); + aReader.SetShapeFixParameters(std::move(aProcessingData.first)); aReader.SetShapeProcessFlags(aProcessingData.second); Handle(TDocStd_Document) aDocument; @@ -973,7 +973,7 @@ static Standard_Integer WriteIges(Draw_Interpretor& theDI, Standard_Integer theN } XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("write.iges.resource.name", "write.iges.sequence"); - aWriter.SetParameters(std::move(aProcessingData.first)); + aWriter.SetShapeFixParameters(std::move(aProcessingData.first)); aWriter.SetShapeProcessFlags(aProcessingData.second); aWriter.Transfer(aDocument, aRootScope.Next()); diff --git a/src/XSDRAWSTEP/XSDRAWSTEP.cxx b/src/XSDRAWSTEP/XSDRAWSTEP.cxx index c75e06df02..7fb38482b9 100644 --- a/src/XSDRAWSTEP/XSDRAWSTEP.cxx +++ b/src/XSDRAWSTEP/XSDRAWSTEP.cxx @@ -128,7 +128,7 @@ static Standard_Integer stepread(Draw_Interpretor& theDI, sr.SetSystemLengthUnit(XSDRAW::GetLengthUnit()); XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("read.step.resource.name", "read.step.sequence"); - sr.SetParameters(std::move(aProcessingData.first)); + sr.SetShapeFixParameters(std::move(aProcessingData.first)); sr.SetShapeProcessFlags(aProcessingData.second); // nom = "." -> fichier deja lu @@ -299,7 +299,7 @@ static Standard_Integer testreadstep(Draw_Interpretor& theDI, STEPControl_Reader aReader; XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("read.step.resource.name", "read.step.sequence"); - aReader.SetParameters(std::move(aProcessingData.first)); + aReader.SetShapeFixParameters(std::move(aProcessingData.first)); aReader.SetShapeProcessFlags(aProcessingData.second); aReader.SetSystemLengthUnit(UnitsMethods::GetCasCadeLengthUnit()); if (useStream) @@ -436,7 +436,7 @@ static Standard_Integer stepwrite(Draw_Interpretor& theDI, XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("write.step.resource.name", "write.step.sequence"); - sw.SetParameters(std::move(aProcessingData.first)); + sw.SetShapeFixParameters(std::move(aProcessingData.first)); sw.SetShapeProcessFlags(aProcessingData.second); Standard_Integer stat = sw.Transfer(shape, mode, Standard_True, aPSRoot.Next(90)); if (stat == IFSelect_RetDone) @@ -520,7 +520,7 @@ static Standard_Integer testwrite(Draw_Interpretor& theDI, STEPControl_Writer aWriter; XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("write.step.resource.name", "write.step.sequence"); - aWriter.SetParameters(std::move(aProcessingData.first)); + aWriter.SetShapeFixParameters(std::move(aProcessingData.first)); aWriter.SetShapeProcessFlags(aProcessingData.second); if (aWriter.Transfer(aShape, STEPControl_AsIs, aParameters) != IFSelect_RetDone) @@ -800,7 +800,7 @@ static Standard_Integer ReadStep(Draw_Interpretor& theDI, XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("read.step.resource.name", "read.step.sequence"); - aReader.SetParameters(std::move(aProcessingData.first)); + aReader.SetShapeFixParameters(std::move(aProcessingData.first)); aReader.SetShapeProcessFlags(aProcessingData.second); if (!aReader.Transfer(aDocument, aRootScope.Next())) @@ -967,7 +967,7 @@ static Standard_Integer WriteStep(Draw_Interpretor& theDI, XSAlgo_ShapeProcessor::ProcessingData aProcessingData = XSAlgo_ShapeProcessor::ReadProcessingData("write.step.resource.name", "write.step.sequence"); - aWriter.SetParameters(std::move(aProcessingData.first)); + aWriter.SetShapeFixParameters(std::move(aProcessingData.first)); aWriter.SetShapeProcessFlags(aProcessingData.second); if (!aLabel.IsNull()) diff --git a/tests/de_wrapper/configuration/A3 b/tests/de_wrapper/configuration/A3 index 73ad2d30c5..a2654a75e6 100644 --- a/tests/de_wrapper/configuration/A3 +++ b/tests/de_wrapper/configuration/A3 @@ -5,158 +5,254 @@ puts "" # Checking the stability of the initial configuration set ref_conf " -global.priority.STEP : OCC -global.priority.VRML : OCC -global.priority.STL : OCC -global.priority.OBJ : OCC -global.priority.GLTF : OCC -global.priority.BREP : OCC -global.priority.XCAF : OCC -global.priority.IGES : OCC -global.priority.PLY : OCC -global.general.length.unit : 1 -global.general.system.unit : 1 -provider.STEP.OCC.read.iges.bspline.continuity : 1 -provider.STEP.OCC.read.precision.mode : 0 -provider.STEP.OCC.read.precision.val : 0.0001 -provider.STEP.OCC.read.maxprecision.mode : 0 -provider.STEP.OCC.read.maxprecision.val : 1 -provider.STEP.OCC.read.stdsameparameter.mode : 0 -provider.STEP.OCC.read.surfacecurve.mode : 0 -provider.STEP.OCC.read.encoderegularity.angle : 0.572958 -provider.STEP.OCC.angleunit.mode : 0 -provider.STEP.OCC.read.resource.name : STEP -provider.STEP.OCC.read.sequence : FromSTEP -provider.STEP.OCC.read.product.mode : 1 -provider.STEP.OCC.read.product.context : 1 -provider.STEP.OCC.read.shape.repr : 1 -provider.STEP.OCC.read.tessellated : 1 -provider.STEP.OCC.read.assembly.level : 1 -provider.STEP.OCC.read.shape.relationship : 1 -provider.STEP.OCC.read.shape.aspect : 1 -provider.STEP.OCC.read.constructivegeom.relationship : 0 -provider.STEP.OCC.read.stepcaf.subshapes.name : 0 -provider.STEP.OCC.read.codepage : 4 -provider.STEP.OCC.read.nonmanifold : 0 -provider.STEP.OCC.read.ideas : 0 -provider.STEP.OCC.read.all.shapes : 0 -provider.STEP.OCC.read.root.transformation : 1 -provider.STEP.OCC.read.color : 1 -provider.STEP.OCC.read.name : 1 -provider.STEP.OCC.read.layer : 1 -provider.STEP.OCC.read.props : 1 -provider.STEP.OCC.read.metadata : 1 -provider.STEP.OCC.write.precision.mode : 0 -provider.STEP.OCC.write.precision.val : 0.0001 -provider.STEP.OCC.write.assembly : 2 -provider.STEP.OCC.write.schema : 1 -provider.STEP.OCC.write.tessellated : 2 -provider.STEP.OCC.write.product.name : -provider.STEP.OCC.write.surfacecurve.mode : 1 -provider.STEP.OCC.write.unit : 2 -provider.STEP.OCC.write.resource.name : STEP -provider.STEP.OCC.write.sequence : ToSTEP -provider.STEP.OCC.write.vertex.mode : 0 -provider.STEP.OCC.write.stepcaf.subshapes.name : 0 -provider.STEP.OCC.write.color : 1 -provider.STEP.OCC.write.name : 1 -provider.STEP.OCC.write.layer : 1 -provider.STEP.OCC.write.props : 1 -provider.STEP.OCC.write.model.type : 0 -provider.VRML.OCC.read.file.unit : 1 -provider.VRML.OCC.read.file.coordinate.system : 1 -provider.VRML.OCC.read.system.coordinate.system : 0 -provider.VRML.OCC.read.fill.incomplete : 1 -provider.VRML.OCC.writer.version : 2 -provider.VRML.OCC.write.representation.type : 1 -provider.STL.OCC.read.merge.angle : 90 -provider.STL.OCC.read.brep : 0 -provider.STL.OCC.write.ascii : 1 -provider.OBJ.OCC.file.length.unit : 1 -provider.OBJ.OCC.system.cs : 0 -provider.OBJ.OCC.file.cs : 1 -provider.OBJ.OCC.read.single.precision : 0 -provider.OBJ.OCC.read.create.shapes : 0 -provider.OBJ.OCC.read.root.prefix : -provider.OBJ.OCC.read.fill.doc : 1 -provider.OBJ.OCC.read.fill.incomplete : 1 -provider.OBJ.OCC.read.memory.limit.mib : -1 -provider.OBJ.OCC.write.comment : -provider.OBJ.OCC.write.author : -provider.GLTF.OCC.file.length.unit : 1 -provider.GLTF.OCC.system.cs : 0 -provider.GLTF.OCC.file.cs : 1 -provider.GLTF.OCC.read.single.precision : 1 -provider.GLTF.OCC.read.create.shapes : 0 -provider.GLTF.OCC.read.root.prefix : -provider.GLTF.OCC.read.fill.doc : 1 -provider.GLTF.OCC.read.fill.incomplete : 1 -provider.GLTF.OCC.read.memory.limit.mib : -1 -provider.GLTF.OCC.read.parallel : 0 -provider.GLTF.OCC.read.skip.empty.nodes : 1 -provider.GLTF.OCC.read.load.all.scenes : 0 -provider.GLTF.OCC.read.use.mesh.name.as.fallback : 1 -provider.GLTF.OCC.read.skip.late.data.loading : 0 -provider.GLTF.OCC.read.keep.late.data : 1 -provider.GLTF.OCC.read.print.debug.message : 0 -provider.GLTF.OCC.write.comment : -provider.GLTF.OCC.write.author : -provider.GLTF.OCC.write.trsf.format : 0 -provider.GLTF.OCC.write.node.name.format : 3 -provider.GLTF.OCC.write.mesh.name.format : 1 -provider.GLTF.OCC.write.forced.uv.export : 0 -provider.GLTF.OCC.write.embed.textures.in.glb : 1 -provider.GLTF.OCC.write.merge.faces : 0 -provider.GLTF.OCC.write.split.indices16 : 0 -provider.BREP.OCC.write.binary : 1 -provider.BREP.OCC.write.version.binary : 4 -provider.BREP.OCC.write.version.ascii : 3 -provider.BREP.OCC.write.triangles : 1 -provider.BREP.OCC.write.normals : 1 -provider.XCAF.OCC.read.append.mode : 0 -provider.XCAF.OCC.read.skip.values : -provider.XCAF.OCC.read.values : -provider.IGES.OCC.read.iges.bspline.continuity : 1 -provider.IGES.OCC.read.precision.mode : 0 -provider.IGES.OCC.read.precision.val : 0.0001 -provider.IGES.OCC.read.maxprecision.mode : 0 -provider.IGES.OCC.read.maxprecision.val : 1 -provider.IGES.OCC.read.stdsameparameter.mode : 0 -provider.IGES.OCC.read.surfacecurve.mode : 0 -provider.IGES.OCC.read.encoderegularity.angle : 0.572958 -provider.IGES.OCC.read.bspline.approxd1.mode : 0 -provider.IGES.OCC.read.resource.name : IGES -provider.IGES.OCC.read.sequence : FromIGES -provider.IGES.OCC.read.fau_lty.entities : 0 -provider.IGES.OCC.read.onlyvisible : 0 -provider.IGES.OCC.read.color : 1 -provider.IGES.OCC.read.name : 1 -provider.IGES.OCC.read.layer : 1 -provider.IGES.OCC.write.brep.mode : 0 -provider.IGES.OCC.write.convertsurface.mode : 0 -provider.IGES.OCC.write.header.author : -provider.IGES.OCC.write.header.company : -provider.IGES.OCC.write.header.product : -provider.IGES.OCC.write.header.receiver : -provider.IGES.OCC.write.resource.name : IGES -provider.IGES.OCC.write.sequence : ToIGES -provider.IGES.OCC.write.precision.mode : 0 -provider.IGES.OCC.write.precision.val : 0.0001 -provider.IGES.OCC.write.plane.mode : 0 -provider.IGES.OCC.write.offset : 0 -provider.IGES.OCC.write.color : 1 -provider.IGES.OCC.write.name : 1 -provider.IGES.OCC.write.layer : 1 -provider.PLY.OCC.file.length.unit : 1 -provider.PLY.OCC.system.cs : 0 -provider.PLY.OCC.file.cs : 1 -provider.PLY.OCC.write.normals : 1 -provider.PLY.OCC.write.colors : 1 -provider.PLY.OCC.write.tex.coords : 0 -provider.PLY.OCC.write.part.id : 1 -provider.PLY.OCC.write.face.id : 0 -provider.PLY.OCC.write.comment : -provider.PLY.OCC.write.author : +global.priority.VRML : OCC +global.priority.IGES : OCC +global.priority.OBJ : OCC +global.priority.GLTF : OCC +global.priority.PLY : OCC +global.priority.XCAF : OCC +global.priority.STEP : OCC +global.priority.STL : OCC +global.priority.BREP : OCC +global.general.length.unit : 1 +global.general.system.unit : 1 +provider.VRML.OCC.read.file.unit : 1 +provider.VRML.OCC.read.file.coordinate.system : 1 +provider.VRML.OCC.read.system.coordinate.system : 0 +provider.VRML.OCC.read.fill.incomplete : 1 +provider.VRML.OCC.writer.version : 2 +provider.VRML.OCC.write.representation.type : 1 +provider.IGES.OCC.read.iges.bspline.continuity : 1 +provider.IGES.OCC.read.precision.mode : 0 +provider.IGES.OCC.read.precision.val : 0.0001 +provider.IGES.OCC.read.maxprecision.mode : 0 +provider.IGES.OCC.read.maxprecision.val : 1 +provider.IGES.OCC.read.stdsameparameter.mode : 0 +provider.IGES.OCC.read.surfacecurve.mode : 0 +provider.IGES.OCC.read.encoderegularity.angle : 0.572958 +provider.IGES.OCC.read.bspline.approxd1.mode : 0 +provider.IGES.OCC.read.fau_lty.entities : 0 +provider.IGES.OCC.read.onlyvisible : 0 +provider.IGES.OCC.read.color : 1 +provider.IGES.OCC.read.name : 1 +provider.IGES.OCC.read.layer : 1 +provider.IGES.OCC.write.brep.mode : 0 +provider.IGES.OCC.write.convertsurface.mode : 0 +provider.IGES.OCC.write.header.author : +provider.IGES.OCC.write.header.company : +provider.IGES.OCC.write.header.product : +provider.IGES.OCC.write.header.receiver : +provider.IGES.OCC.write.precision.mode : 0 +provider.IGES.OCC.write.precision.val : 0.0001 +provider.IGES.OCC.write.plane.mode : 0 +provider.IGES.OCC.write.offset : 0 +provider.IGES.OCC.write.color : 1 +provider.IGES.OCC.write.name : 1 +provider.IGES.OCC.write.layer : 1 +provider.IGES.OCC.healing.tolerance3d : 1e-06 +provider.IGES.OCC.healing.max.tolerance3d : 1 +provider.IGES.OCC.healing.min.tolerance3d : 1e-07 +provider.IGES.OCC.healing.free.shell : -1 +provider.IGES.OCC.healing.free.face : -1 +provider.IGES.OCC.healing.free.wire : -1 +provider.IGES.OCC.healing.same.parameter : -1 +provider.IGES.OCC.healing.solid : -1 +provider.IGES.OCC.healing.shell.orientation : -1 +provider.IGES.OCC.healing.create.open.solid : 1 +provider.IGES.OCC.healing.shell : -1 +provider.IGES.OCC.healing.face.orientation : -1 +provider.IGES.OCC.healing.face : -1 +provider.IGES.OCC.healing.wire : -1 +provider.IGES.OCC.healing.orientation : -1 +provider.IGES.OCC.healing.add.natural.bound : -1 +provider.IGES.OCC.healing.missing.seam : -1 +provider.IGES.OCC.healing.small.area.wire : -1 +provider.IGES.OCC.healing.remove.small.area.face : -1 +provider.IGES.OCC.healing.intersecting.wires : -1 +provider.IGES.OCC.healing.loop.wires : -1 +provider.IGES.OCC.healing.split.face : -1 +provider.IGES.OCC.healing.auto.correct.precision : -1 +provider.IGES.OCC.healing.modify.topology : 0 +provider.IGES.OCC.healing.modify.geometry : 1 +provider.IGES.OCC.healing.closed.wire : 1 +provider.IGES.OCC.healing.preference.pcurve : 1 +provider.IGES.OCC.healing.reorder.edges : -1 +provider.IGES.OCC.healing.remove.small.edges : -1 +provider.IGES.OCC.healing.connected.edges : -1 +provider.IGES.OCC.healing.edge.curves : -1 +provider.IGES.OCC.healing.add.degenerated.edges : -1 +provider.IGES.OCC.healing.add.lacking.edges : -1 +provider.IGES.OCC.healing.selfintersection : -1 +provider.IGES.OCC.healing.remove.loop : -1 +provider.IGES.OCC.healing.reversed2d : -1 +provider.IGES.OCC.healing.remove.pcurve : -1 +provider.IGES.OCC.healing.remove.curve3d : -1 +provider.IGES.OCC.healing.add.pcurve : -1 +provider.IGES.OCC.healing.add.curve3d : -1 +provider.IGES.OCC.healing.correct.order.in.seam : -1 +provider.IGES.OCC.healing.shifted : -1 +provider.IGES.OCC.healing.edge.same.parameter : 0 +provider.IGES.OCC.healing.notched.edges : -1 +provider.IGES.OCC.healing.tail : -1 +provider.IGES.OCC.healing.max.tail.angle : -1 +provider.IGES.OCC.healing.max.tail.width : -1 +provider.IGES.OCC.healing.selfintersecting.edge : -1 +provider.IGES.OCC.healing.intersecting.edges : -1 +provider.IGES.OCC.healing.nonadjacent.intersecting.edges : -1 +provider.IGES.OCC.healing.vertex.position : 0 +provider.IGES.OCC.healing.vertex.tolerance : -1 +provider.OBJ.OCC.file.length.unit : 1 +provider.OBJ.OCC.system.cs : 0 +provider.OBJ.OCC.file.cs : 1 +provider.OBJ.OCC.read.single.precision : 0 +provider.OBJ.OCC.read.create.shapes : 0 +provider.OBJ.OCC.read.root.prefix : +provider.OBJ.OCC.read.fill.doc : 1 +provider.OBJ.OCC.read.fill.incomplete : 1 +provider.OBJ.OCC.read.memory.limit.mib : -1 +provider.OBJ.OCC.write.comment : +provider.OBJ.OCC.write.author : +provider.GLTF.OCC.file.length.unit : 1 +provider.GLTF.OCC.system.cs : 0 +provider.GLTF.OCC.file.cs : 1 +provider.GLTF.OCC.read.single.precision : 1 +provider.GLTF.OCC.read.create.shapes : 0 +provider.GLTF.OCC.read.root.prefix : +provider.GLTF.OCC.read.fill.doc : 1 +provider.GLTF.OCC.read.fill.incomplete : 1 +provider.GLTF.OCC.read.memory.limit.mib : -1 +provider.GLTF.OCC.read.parallel : 0 +provider.GLTF.OCC.read.skip.empty.nodes : 1 +provider.GLTF.OCC.read.load.all.scenes : 0 +provider.GLTF.OCC.read.use.mesh.name.as.fallback : 1 +provider.GLTF.OCC.read.skip.late.data.loading : 0 +provider.GLTF.OCC.read.keep.late.data : 1 +provider.GLTF.OCC.read.print.debug.message : 0 +provider.GLTF.OCC.write.comment : +provider.GLTF.OCC.write.author : +provider.GLTF.OCC.write.trsf.format : 0 +provider.GLTF.OCC.write.node.name.format : 3 +provider.GLTF.OCC.write.mesh.name.format : 1 +provider.GLTF.OCC.write.forced.uv.export : 0 +provider.GLTF.OCC.write.embed.textures.in.glb : 1 +provider.GLTF.OCC.write.merge.faces : 0 +provider.GLTF.OCC.write.split.indices16 : 0 +provider.PLY.OCC.file.length.unit : 1 +provider.PLY.OCC.system.cs : 0 +provider.PLY.OCC.file.cs : 1 +provider.PLY.OCC.write.normals : 1 +provider.PLY.OCC.write.colors : 1 +provider.PLY.OCC.write.tex.coords : 0 +provider.PLY.OCC.write.part.id : 1 +provider.PLY.OCC.write.face.id : 0 +provider.PLY.OCC.write.comment : +provider.PLY.OCC.write.author : +provider.XCAF.OCC.read.append.mode : 0 +provider.XCAF.OCC.read.skip.values : +provider.XCAF.OCC.read.values : +provider.STEP.OCC.read.iges.bspline.continuity : 1 +provider.STEP.OCC.read.precision.mode : 0 +provider.STEP.OCC.read.precision.val : 0.0001 +provider.STEP.OCC.read.maxprecision.mode : 0 +provider.STEP.OCC.read.maxprecision.val : 1 +provider.STEP.OCC.read.stdsameparameter.mode : 0 +provider.STEP.OCC.read.surfacecurve.mode : 0 +provider.STEP.OCC.read.encoderegularity.angle : 0.572958 +provider.STEP.OCC.angleunit.mode : 0 +provider.STEP.OCC.read.product.mode : 1 +provider.STEP.OCC.read.product.context : 1 +provider.STEP.OCC.read.shape.repr : 1 +provider.STEP.OCC.read.tessellated : 1 +provider.STEP.OCC.read.assembly.level : 1 +provider.STEP.OCC.read.shape.relationship : 1 +provider.STEP.OCC.read.shape.aspect : 1 +provider.STEP.OCC.read.constructivegeom.relationship : 0 +provider.STEP.OCC.read.stepcaf.subshapes.name : 0 +provider.STEP.OCC.read.codepage : 4 +provider.STEP.OCC.read.nonmanifold : 0 +provider.STEP.OCC.read.ideas : 0 +provider.STEP.OCC.read.all.shapes : 0 +provider.STEP.OCC.read.root.transformation : 1 +provider.STEP.OCC.read.color : 1 +provider.STEP.OCC.read.name : 1 +provider.STEP.OCC.read.layer : 1 +provider.STEP.OCC.read.props : 1 +provider.STEP.OCC.read.metadata : 1 +provider.STEP.OCC.write.precision.mode : 0 +provider.STEP.OCC.write.precision.val : 0.0001 +provider.STEP.OCC.write.assembly : 2 +provider.STEP.OCC.write.schema : 1 +provider.STEP.OCC.write.tessellated : 2 +provider.STEP.OCC.write.product.name : +provider.STEP.OCC.write.surfacecurve.mode : 1 +provider.STEP.OCC.write.unit : 2 +provider.STEP.OCC.write.vertex.mode : 0 +provider.STEP.OCC.write.stepcaf.subshapes.name : 0 +provider.STEP.OCC.write.color : 1 +provider.STEP.OCC.write.name : 1 +provider.STEP.OCC.write.layer : 1 +provider.STEP.OCC.write.props : 1 +provider.STEP.OCC.write.model.type : 0 +provider.STEP.OCC.healing.tolerance3d : 1e-06 +provider.STEP.OCC.healing.max.tolerance3d : 1 +provider.STEP.OCC.healing.min.tolerance3d : 1e-07 +provider.STEP.OCC.healing.free.shell : -1 +provider.STEP.OCC.healing.free.face : -1 +provider.STEP.OCC.healing.free.wire : -1 +provider.STEP.OCC.healing.same.parameter : -1 +provider.STEP.OCC.healing.solid : -1 +provider.STEP.OCC.healing.shell.orientation : -1 +provider.STEP.OCC.healing.create.open.solid : 0 +provider.STEP.OCC.healing.shell : -1 +provider.STEP.OCC.healing.face.orientation : -1 +provider.STEP.OCC.healing.face : -1 +provider.STEP.OCC.healing.wire : -1 +provider.STEP.OCC.healing.orientation : -1 +provider.STEP.OCC.healing.add.natural.bound : -1 +provider.STEP.OCC.healing.missing.seam : -1 +provider.STEP.OCC.healing.small.area.wire : -1 +provider.STEP.OCC.healing.remove.small.area.face : -1 +provider.STEP.OCC.healing.intersecting.wires : -1 +provider.STEP.OCC.healing.loop.wires : -1 +provider.STEP.OCC.healing.split.face : -1 +provider.STEP.OCC.healing.auto.correct.precision : -1 +provider.STEP.OCC.healing.modify.topology : 0 +provider.STEP.OCC.healing.modify.geometry : 1 +provider.STEP.OCC.healing.closed.wire : 1 +provider.STEP.OCC.healing.preference.pcurve : 1 +provider.STEP.OCC.healing.reorder.edges : -1 +provider.STEP.OCC.healing.remove.small.edges : -1 +provider.STEP.OCC.healing.connected.edges : -1 +provider.STEP.OCC.healing.edge.curves : -1 +provider.STEP.OCC.healing.add.degenerated.edges : -1 +provider.STEP.OCC.healing.add.lacking.edges : -1 +provider.STEP.OCC.healing.selfintersection : -1 +provider.STEP.OCC.healing.remove.loop : -1 +provider.STEP.OCC.healing.reversed2d : -1 +provider.STEP.OCC.healing.remove.pcurve : -1 +provider.STEP.OCC.healing.remove.curve3d : -1 +provider.STEP.OCC.healing.add.pcurve : -1 +provider.STEP.OCC.healing.add.curve3d : -1 +provider.STEP.OCC.healing.correct.order.in.seam : -1 +provider.STEP.OCC.healing.shifted : -1 +provider.STEP.OCC.healing.edge.same.parameter : 0 +provider.STEP.OCC.healing.notched.edges : -1 +provider.STEP.OCC.healing.tail : 0 +provider.STEP.OCC.healing.max.tail.angle : 0 +provider.STEP.OCC.healing.max.tail.width : -1 +provider.STEP.OCC.healing.selfintersecting.edge : -1 +provider.STEP.OCC.healing.intersecting.edges : -1 +provider.STEP.OCC.healing.nonadjacent.intersecting.edges : -1 +provider.STEP.OCC.healing.vertex.position : 0 +provider.STEP.OCC.healing.vertex.tolerance : -1 +provider.STL.OCC.read.merge.angle : 90 +provider.STL.OCC.read.brep : 0 +provider.STL.OCC.write.ascii : 1 +provider.BREP.OCC.write.binary : 1 +provider.BREP.OCC.write.version.binary : 4 +provider.BREP.OCC.write.version.ascii : 3 +provider.BREP.OCC.write.triangles : 1 +provider.BREP.OCC.write.normals : 1 " diff --git a/tests/de_wrapper/configuration/A4 b/tests/de_wrapper/configuration/A4 index b7aec9dd31..222674c9bf 100644 --- a/tests/de_wrapper/configuration/A4 +++ b/tests/de_wrapper/configuration/A4 @@ -5,95 +5,191 @@ puts "" # Checking the dumping resource for the two format only set conf_ref " -global.priority.STEP : OCC -global.priority.VRML : OCC -global.priority.STL : OCC -global.priority.OBJ : OCC -global.priority.GLTF : OCC -global.priority.BREP : OCC -global.priority.XCAF : OCC -global.priority.IGES : OCC -global.priority.PLY : OCC -global.general.length.unit : 1 -global.general.system.unit : 1 -provider.STEP.OCC.read.iges.bspline.continuity : 1 -provider.STEP.OCC.read.precision.mode : 0 -provider.STEP.OCC.read.precision.val : 0.0001 -provider.STEP.OCC.read.maxprecision.mode : 0 -provider.STEP.OCC.read.maxprecision.val : 1 -provider.STEP.OCC.read.stdsameparameter.mode : 0 -provider.STEP.OCC.read.surfacecurve.mode : 0 -provider.STEP.OCC.read.encoderegularity.angle : 0.572958 -provider.STEP.OCC.angleunit.mode : 0 -provider.STEP.OCC.read.resource.name : STEP -provider.STEP.OCC.read.sequence : FromSTEP -provider.STEP.OCC.read.product.mode : 1 -provider.STEP.OCC.read.product.context : 1 -provider.STEP.OCC.read.shape.repr : 1 -provider.STEP.OCC.read.tessellated : 1 -provider.STEP.OCC.read.assembly.level : 1 -provider.STEP.OCC.read.shape.relationship : 1 -provider.STEP.OCC.read.shape.aspect : 1 -provider.STEP.OCC.read.constructivegeom.relationship : 0 -provider.STEP.OCC.read.stepcaf.subshapes.name : 0 -provider.STEP.OCC.read.codepage : 4 -provider.STEP.OCC.read.nonmanifold : 0 -provider.STEP.OCC.read.ideas : 0 -provider.STEP.OCC.read.all.shapes : 0 -provider.STEP.OCC.read.root.transformation : 1 -provider.STEP.OCC.read.color : 1 -provider.STEP.OCC.read.name : 1 -provider.STEP.OCC.read.layer : 1 -provider.STEP.OCC.read.props : 1 -provider.STEP.OCC.read.metadata : 1 -provider.STEP.OCC.write.precision.mode : 0 -provider.STEP.OCC.write.precision.val : 0.0001 -provider.STEP.OCC.write.assembly : 2 -provider.STEP.OCC.write.schema : 1 -provider.STEP.OCC.write.tessellated : 2 -provider.STEP.OCC.write.product.name : -provider.STEP.OCC.write.surfacecurve.mode : 1 -provider.STEP.OCC.write.unit : 2 -provider.STEP.OCC.write.resource.name : STEP -provider.STEP.OCC.write.sequence : ToSTEP -provider.STEP.OCC.write.vertex.mode : 0 -provider.STEP.OCC.write.stepcaf.subshapes.name : 0 -provider.STEP.OCC.write.color : 1 -provider.STEP.OCC.write.name : 1 -provider.STEP.OCC.write.layer : 1 -provider.STEP.OCC.write.props : 1 -provider.STEP.OCC.write.model.type : 0 -provider.IGES.OCC.read.iges.bspline.continuity : 1 -provider.IGES.OCC.read.precision.mode : 0 -provider.IGES.OCC.read.precision.val : 0.0001 -provider.IGES.OCC.read.maxprecision.mode : 0 -provider.IGES.OCC.read.maxprecision.val : 1 -provider.IGES.OCC.read.stdsameparameter.mode : 0 -provider.IGES.OCC.read.surfacecurve.mode : 0 -provider.IGES.OCC.read.encoderegularity.angle : 0.572958 -provider.IGES.OCC.read.bspline.approxd1.mode : 0 -provider.IGES.OCC.read.resource.name : IGES -provider.IGES.OCC.read.sequence : FromIGES -provider.IGES.OCC.read.fau_lty.entities : 0 -provider.IGES.OCC.read.onlyvisible : 0 -provider.IGES.OCC.read.color : 1 -provider.IGES.OCC.read.name : 1 -provider.IGES.OCC.read.layer : 1 -provider.IGES.OCC.write.brep.mode : 0 -provider.IGES.OCC.write.convertsurface.mode : 0 -provider.IGES.OCC.write.header.author : -provider.IGES.OCC.write.header.company : -provider.IGES.OCC.write.header.product : -provider.IGES.OCC.write.header.receiver : -provider.IGES.OCC.write.resource.name : IGES -provider.IGES.OCC.write.sequence : ToIGES -provider.IGES.OCC.write.precision.mode : 0 -provider.IGES.OCC.write.precision.val : 0.0001 -provider.IGES.OCC.write.plane.mode : 0 -provider.IGES.OCC.write.offset : 0 -provider.IGES.OCC.write.color : 1 -provider.IGES.OCC.write.name : 1 -provider.IGES.OCC.write.layer : 1 +global.priority.VRML : OCC +global.priority.IGES : OCC +global.priority.OBJ : OCC +global.priority.GLTF : OCC +global.priority.PLY : OCC +global.priority.XCAF : OCC +global.priority.STEP : OCC +global.priority.STL : OCC +global.priority.BREP : OCC +global.general.length.unit : 1 +global.general.system.unit : 1 +provider.IGES.OCC.read.iges.bspline.continuity : 1 +provider.IGES.OCC.read.precision.mode : 0 +provider.IGES.OCC.read.precision.val : 0.0001 +provider.IGES.OCC.read.maxprecision.mode : 0 +provider.IGES.OCC.read.maxprecision.val : 1 +provider.IGES.OCC.read.stdsameparameter.mode : 0 +provider.IGES.OCC.read.surfacecurve.mode : 0 +provider.IGES.OCC.read.encoderegularity.angle : 0.572958 +provider.IGES.OCC.read.bspline.approxd1.mode : 0 +provider.IGES.OCC.read.fau_lty.entities : 0 +provider.IGES.OCC.read.onlyvisible : 0 +provider.IGES.OCC.read.color : 1 +provider.IGES.OCC.read.name : 1 +provider.IGES.OCC.read.layer : 1 +provider.IGES.OCC.write.brep.mode : 0 +provider.IGES.OCC.write.convertsurface.mode : 0 +provider.IGES.OCC.write.header.author : +provider.IGES.OCC.write.header.company : +provider.IGES.OCC.write.header.product : +provider.IGES.OCC.write.header.receiver : +provider.IGES.OCC.write.precision.mode : 0 +provider.IGES.OCC.write.precision.val : 0.0001 +provider.IGES.OCC.write.plane.mode : 0 +provider.IGES.OCC.write.offset : 0 +provider.IGES.OCC.write.color : 1 +provider.IGES.OCC.write.name : 1 +provider.IGES.OCC.write.layer : 1 +provider.IGES.OCC.healing.tolerance3d : 1e-06 +provider.IGES.OCC.healing.max.tolerance3d : 1 +provider.IGES.OCC.healing.min.tolerance3d : 1e-07 +provider.IGES.OCC.healing.free.shell : -1 +provider.IGES.OCC.healing.free.face : -1 +provider.IGES.OCC.healing.free.wire : -1 +provider.IGES.OCC.healing.same.parameter : -1 +provider.IGES.OCC.healing.solid : -1 +provider.IGES.OCC.healing.shell.orientation : -1 +provider.IGES.OCC.healing.create.open.solid : 1 +provider.IGES.OCC.healing.shell : -1 +provider.IGES.OCC.healing.face.orientation : -1 +provider.IGES.OCC.healing.face : -1 +provider.IGES.OCC.healing.wire : -1 +provider.IGES.OCC.healing.orientation : -1 +provider.IGES.OCC.healing.add.natural.bound : -1 +provider.IGES.OCC.healing.missing.seam : -1 +provider.IGES.OCC.healing.small.area.wire : -1 +provider.IGES.OCC.healing.remove.small.area.face : -1 +provider.IGES.OCC.healing.intersecting.wires : -1 +provider.IGES.OCC.healing.loop.wires : -1 +provider.IGES.OCC.healing.split.face : -1 +provider.IGES.OCC.healing.auto.correct.precision : -1 +provider.IGES.OCC.healing.modify.topology : 0 +provider.IGES.OCC.healing.modify.geometry : 1 +provider.IGES.OCC.healing.closed.wire : 1 +provider.IGES.OCC.healing.preference.pcurve : 1 +provider.IGES.OCC.healing.reorder.edges : -1 +provider.IGES.OCC.healing.remove.small.edges : -1 +provider.IGES.OCC.healing.connected.edges : -1 +provider.IGES.OCC.healing.edge.curves : -1 +provider.IGES.OCC.healing.add.degenerated.edges : -1 +provider.IGES.OCC.healing.add.lacking.edges : -1 +provider.IGES.OCC.healing.selfintersection : -1 +provider.IGES.OCC.healing.remove.loop : -1 +provider.IGES.OCC.healing.reversed2d : -1 +provider.IGES.OCC.healing.remove.pcurve : -1 +provider.IGES.OCC.healing.remove.curve3d : -1 +provider.IGES.OCC.healing.add.pcurve : -1 +provider.IGES.OCC.healing.add.curve3d : -1 +provider.IGES.OCC.healing.correct.order.in.seam : -1 +provider.IGES.OCC.healing.shifted : -1 +provider.IGES.OCC.healing.edge.same.parameter : 0 +provider.IGES.OCC.healing.notched.edges : -1 +provider.IGES.OCC.healing.tail : -1 +provider.IGES.OCC.healing.max.tail.angle : -1 +provider.IGES.OCC.healing.max.tail.width : -1 +provider.IGES.OCC.healing.selfintersecting.edge : -1 +provider.IGES.OCC.healing.intersecting.edges : -1 +provider.IGES.OCC.healing.nonadjacent.intersecting.edges : -1 +provider.IGES.OCC.healing.vertex.position : 0 +provider.IGES.OCC.healing.vertex.tolerance : -1 +provider.STEP.OCC.read.iges.bspline.continuity : 1 +provider.STEP.OCC.read.precision.mode : 0 +provider.STEP.OCC.read.precision.val : 0.0001 +provider.STEP.OCC.read.maxprecision.mode : 0 +provider.STEP.OCC.read.maxprecision.val : 1 +provider.STEP.OCC.read.stdsameparameter.mode : 0 +provider.STEP.OCC.read.surfacecurve.mode : 0 +provider.STEP.OCC.read.encoderegularity.angle : 0.572958 +provider.STEP.OCC.angleunit.mode : 0 +provider.STEP.OCC.read.product.mode : 1 +provider.STEP.OCC.read.product.context : 1 +provider.STEP.OCC.read.shape.repr : 1 +provider.STEP.OCC.read.tessellated : 1 +provider.STEP.OCC.read.assembly.level : 1 +provider.STEP.OCC.read.shape.relationship : 1 +provider.STEP.OCC.read.shape.aspect : 1 +provider.STEP.OCC.read.constructivegeom.relationship : 0 +provider.STEP.OCC.read.stepcaf.subshapes.name : 0 +provider.STEP.OCC.read.codepage : 4 +provider.STEP.OCC.read.nonmanifold : 0 +provider.STEP.OCC.read.ideas : 0 +provider.STEP.OCC.read.all.shapes : 0 +provider.STEP.OCC.read.root.transformation : 1 +provider.STEP.OCC.read.color : 1 +provider.STEP.OCC.read.name : 1 +provider.STEP.OCC.read.layer : 1 +provider.STEP.OCC.read.props : 1 +provider.STEP.OCC.read.metadata : 1 +provider.STEP.OCC.write.precision.mode : 0 +provider.STEP.OCC.write.precision.val : 0.0001 +provider.STEP.OCC.write.assembly : 2 +provider.STEP.OCC.write.schema : 1 +provider.STEP.OCC.write.tessellated : 2 +provider.STEP.OCC.write.product.name : +provider.STEP.OCC.write.surfacecurve.mode : 1 +provider.STEP.OCC.write.unit : 2 +provider.STEP.OCC.write.vertex.mode : 0 +provider.STEP.OCC.write.stepcaf.subshapes.name : 0 +provider.STEP.OCC.write.color : 1 +provider.STEP.OCC.write.name : 1 +provider.STEP.OCC.write.layer : 1 +provider.STEP.OCC.write.props : 1 +provider.STEP.OCC.write.model.type : 0 +provider.STEP.OCC.healing.tolerance3d : 1e-06 +provider.STEP.OCC.healing.max.tolerance3d : 1 +provider.STEP.OCC.healing.min.tolerance3d : 1e-07 +provider.STEP.OCC.healing.free.shell : -1 +provider.STEP.OCC.healing.free.face : -1 +provider.STEP.OCC.healing.free.wire : -1 +provider.STEP.OCC.healing.same.parameter : -1 +provider.STEP.OCC.healing.solid : -1 +provider.STEP.OCC.healing.shell.orientation : -1 +provider.STEP.OCC.healing.create.open.solid : 0 +provider.STEP.OCC.healing.shell : -1 +provider.STEP.OCC.healing.face.orientation : -1 +provider.STEP.OCC.healing.face : -1 +provider.STEP.OCC.healing.wire : -1 +provider.STEP.OCC.healing.orientation : -1 +provider.STEP.OCC.healing.add.natural.bound : -1 +provider.STEP.OCC.healing.missing.seam : -1 +provider.STEP.OCC.healing.small.area.wire : -1 +provider.STEP.OCC.healing.remove.small.area.face : -1 +provider.STEP.OCC.healing.intersecting.wires : -1 +provider.STEP.OCC.healing.loop.wires : -1 +provider.STEP.OCC.healing.split.face : -1 +provider.STEP.OCC.healing.auto.correct.precision : -1 +provider.STEP.OCC.healing.modify.topology : 0 +provider.STEP.OCC.healing.modify.geometry : 1 +provider.STEP.OCC.healing.closed.wire : 1 +provider.STEP.OCC.healing.preference.pcurve : 1 +provider.STEP.OCC.healing.reorder.edges : -1 +provider.STEP.OCC.healing.remove.small.edges : -1 +provider.STEP.OCC.healing.connected.edges : -1 +provider.STEP.OCC.healing.edge.curves : -1 +provider.STEP.OCC.healing.add.degenerated.edges : -1 +provider.STEP.OCC.healing.add.lacking.edges : -1 +provider.STEP.OCC.healing.selfintersection : -1 +provider.STEP.OCC.healing.remove.loop : -1 +provider.STEP.OCC.healing.reversed2d : -1 +provider.STEP.OCC.healing.remove.pcurve : -1 +provider.STEP.OCC.healing.remove.curve3d : -1 +provider.STEP.OCC.healing.add.pcurve : -1 +provider.STEP.OCC.healing.add.curve3d : -1 +provider.STEP.OCC.healing.correct.order.in.seam : -1 +provider.STEP.OCC.healing.shifted : -1 +provider.STEP.OCC.healing.edge.same.parameter : 0 +provider.STEP.OCC.healing.notched.edges : -1 +provider.STEP.OCC.healing.tail : 0 +provider.STEP.OCC.healing.max.tail.angle : 0 +provider.STEP.OCC.healing.max.tail.width : -1 +provider.STEP.OCC.healing.selfintersecting.edge : -1 +provider.STEP.OCC.healing.intersecting.edges : -1 +provider.STEP.OCC.healing.nonadjacent.intersecting.edges : -1 +provider.STEP.OCC.healing.vertex.position : 0 +provider.STEP.OCC.healing.vertex.tolerance : -1 " set conf [DumpConfiguration -vendor OCC -format STEP IGES]