diff --git a/src/DEBRepCascade/DEBRepCascade_Provider.cxx b/src/DEBRepCascade/DEBRepCascade_Provider.cxx index 200540e35e..6af321edc9 100644 --- a/src/DEBRepCascade/DEBRepCascade_Provider.cxx +++ b/src/DEBRepCascade/DEBRepCascade_Provider.cxx @@ -110,6 +110,13 @@ bool DEBRepCascade_Provider::Write(const TCollection_AsciiString& thePath, return false; } + Handle(DEBRepCascade_ConfigurationNode) aNode = Handle(DEBRepCascade_ConfigurationNode)::DownCast(GetNode()); + if (aNode->GlobalParameters.LengthUnit != 1.0) + { + Message::SendWarning() << "Warning in the DEBRepCascade_Provider during writing the file " << + thePath << "\t: Target Units for writing were changed, but current format doesn't support scaling"; + } + if (aLabels.Length() == 1) { aShape = aSTool->GetShape(aLabels.Value(1)); @@ -223,6 +230,11 @@ bool DEBRepCascade_Provider::Write(const TCollection_AsciiString& thePath, return false; } Handle(DEBRepCascade_ConfigurationNode) aNode = Handle(DEBRepCascade_ConfigurationNode)::DownCast(GetNode()); + if (aNode->GlobalParameters.LengthUnit != 1.0) + { + Message::SendWarning() << "Warning in the DEBRepCascade_Provider during writing the file " << + thePath << "\t: Target Units for writing were changed, but current format doesn't support scaling"; + } if (aNode->InternalParameters.WriteBinary) { if (aNode->InternalParameters.WriteVersionBin > static_cast(BinTools_FormatVersion_UPPER) || diff --git a/src/DEXCAFCascade/DEXCAFCascade_Provider.cxx b/src/DEXCAFCascade/DEXCAFCascade_Provider.cxx index cef6ceb014..6b8908580c 100644 --- a/src/DEXCAFCascade/DEXCAFCascade_Provider.cxx +++ b/src/DEXCAFCascade/DEXCAFCascade_Provider.cxx @@ -145,6 +145,14 @@ bool DEXCAFCascade_Provider::Write(const TCollection_AsciiString& thePath, { Handle(TDocStd_Application) anApp = new TDocStd_Application(); BinXCAFDrivers::DefineFormat(anApp); + + Handle(DEXCAFCascade_ConfigurationNode) aNode = Handle(DEXCAFCascade_ConfigurationNode)::DownCast(GetNode()); + if (aNode->GlobalParameters.LengthUnit != 1.0) + { + Message::SendWarning() << "Warning in the DEXCAFCascade_Provider during writing the file " << + thePath << "\t: Target Units for writing were changed, but current format doesn't support scaling"; + } + PCDM_StoreStatus aStatus = PCDM_SS_Doc_IsNull; if (!thePath.IsEmpty()) { diff --git a/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx b/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx index dff11a3de1..3a4217e703 100644 --- a/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx +++ b/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx @@ -96,8 +96,6 @@ bool IGESCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext theResource->IntegerVal("write.brep.mode", InternalParameters.WriteBRepMode, aScope); InternalParameters.WriteConvertSurfaceMode = (WriteMode_ConvertSurface) theResource->IntegerVal("write.convertsurface.mode", InternalParameters.WriteConvertSurfaceMode, aScope); - InternalParameters.WriteUnit = (UnitsMethods_LengthUnit) - theResource->IntegerVal("write.unit", InternalParameters.WriteUnit, aScope); InternalParameters.WriteHeaderAuthor = theResource->StringVal("write.header.author", InternalParameters.WriteHeaderAuthor, aScope); InternalParameters.WriteHeaderCompany = @@ -272,14 +270,6 @@ TCollection_AsciiString IGESCAFControl_ConfigurationNode::Save() const aResult += aScope + "write.convertsurface.mode :\t " + InternalParameters.WriteConvertSurfaceMode + "\n"; aResult += "!\n"; - aResult += "!\n"; - aResult += "!Allows choosing the unit. The default unit for Open CASCADE Technology is \"MM\" (millimeter)."; - aResult += "You can choose to write a file into any unit accepted by IGES\n"; - aResult += "!Default value: MM(2). Available values: \"INCH\"(1), \"MM\"(2), \"??\"(3), \"FT\"(4), \"MI\"(5), "; - aResult += "\"M\"(6), \"KM\"(7), \"MIL\"(8), \"UM\"(9), \"CM\"(10), \"UIN\"(11)\n"; - aResult += aScope + "write.unit :\t " + InternalParameters.WriteUnit + "\n"; - aResult += "!\n"; - aResult += "!\n"; aResult += "!Gives the name of the author of the file\n"; aResult += "!Default value: {System name of the user}. Available values: \n"; diff --git a/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.hxx b/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.hxx index c3eafca60b..7549e13238 100644 --- a/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.hxx +++ b/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.hxx @@ -157,7 +157,6 @@ public: // Write WriteMode_BRep WriteBRepMode = WriteMode_BRep_Faces; //InternalParameters.WriteUnit, UnitsMethods_LengthUnit_Millimeter); - IGESCAFControl_Writer aWriter(theWS); + Standard_Integer aFlag = IGESData_BasicEditor::GetFlagByValue(aNode->GlobalParameters.LengthUnit); + IGESCAFControl_Writer aWriter(theWS, (aFlag > 0) ? IGESData_BasicEditor::UnitFlagName(aFlag) : "MM"); + IGESData_GlobalSection aGS = aWriter.Model()->GlobalSection(); + Standard_Real aScaleFactorMM = 1.; + Standard_Boolean aHasUnits = XCAFDoc_DocumentTool::GetLengthUnit(theDocument, aScaleFactorMM, UnitsMethods_LengthUnit_Millimeter); + if (aHasUnits) + { + aGS.SetCascadeUnit(aScaleFactorMM); + } + else + { + aGS.SetCascadeUnit(aNode->GlobalParameters.SystemUnit); + Message::SendWarning() << "Warning in the IGESCAFControl_Provider during writing the file " << + thePath << "\t: The document has no information on Units. Using global parameter as initial Unit."; + } + if (aFlag == 0) + { + aGS.SetScale(aNode->GlobalParameters.LengthUnit); + } + aWriter.Model()->SetGlobalSection(aGS); aWriter.SetColorMode(aNode->InternalParameters.WriteColor); aWriter.SetNameMode(aNode->InternalParameters.WriteName); aWriter.SetLayerMode(aNode->InternalParameters.WriteLayer); @@ -342,10 +358,16 @@ bool IGESCAFControl_Provider::Write(const TCollection_AsciiString& thePath, } Handle(IGESCAFControl_ConfigurationNode) aNode = Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode()); initStatic(aNode); - TCollection_AsciiString aUnit(UnitsMethods::DumpLengthUnit(aNode->InternalParameters.WriteUnit)); - aUnit.UpperCase(); - IGESControl_Writer aWriter(aUnit.ToCString(), - aNode->InternalParameters.WriteBRepMode); + Standard_Integer aFlag = IGESData_BasicEditor::GetFlagByValue(aNode->GlobalParameters.LengthUnit); + IGESControl_Writer aWriter((aFlag > 0) ? IGESData_BasicEditor::UnitFlagName(aFlag) : "MM", + aNode->InternalParameters.WriteBRepMode); + IGESData_GlobalSection aGS = aWriter.Model()->GlobalSection(); + aGS.SetCascadeUnit(aNode->GlobalParameters.SystemUnit); + if (!aFlag) + { + aGS.SetScale(aNode->GlobalParameters.LengthUnit); + } + aWriter.Model()->SetGlobalSection(aGS); Standard_Boolean aIsOk = aWriter.AddShape(theShape); if (!aIsOk) { diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.cxx b/src/IGESCAFControl/IGESCAFControl_Writer.cxx index 53059072c5..70677b193e 100644 --- a/src/IGESCAFControl/IGESCAFControl_Writer.cxx +++ b/src/IGESCAFControl/IGESCAFControl_Writer.cxx @@ -134,6 +134,23 @@ IGESCAFControl_Writer::IGESCAFControl_Writer (const Handle(XSControl_WorkSession // SetWS (WS,scratch); // this should be the only required command here } +//======================================================================= +//function : IGESCAFControl_Writer +//purpose : +//======================================================================= + +IGESCAFControl_Writer::IGESCAFControl_Writer(const Handle(XSControl_WorkSession)& WS, + const Standard_CString theUnit) + :IGESControl_Writer(theUnit) +{ + + WS->SetModel(Model()); + WS->SetMapWriter(TransferProcess()); + myColorMode = Standard_True; + myNameMode = Standard_True; + myLayerMode = Standard_True; +} + //======================================================================= //function : Transfer //purpose : diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.hxx b/src/IGESCAFControl/IGESCAFControl_Writer.hxx index 3e4a9e0b52..56d6fe4a93 100644 --- a/src/IGESCAFControl/IGESCAFControl_Writer.hxx +++ b/src/IGESCAFControl/IGESCAFControl_Writer.hxx @@ -65,6 +65,11 @@ public: //! Creates a reader tool and attaches it to an already existing Session //! Clears the session if it was not yet set for IGES Standard_EXPORT IGESCAFControl_Writer(const Handle(XSControl_WorkSession)& WS, const Standard_Boolean scratch = Standard_True); + + //! Creates a reader tool and attaches it to an already existing Session + //! Clears the session if it was not yet set for IGES + //! Sets target Unit for the writing process. + Standard_EXPORT IGESCAFControl_Writer(const Handle(XSControl_WorkSession)& theWS, const Standard_CString theUnit); //! Transfers a document to a IGES model //! Returns True if translation is OK diff --git a/src/IGESData/IGESData_BasicEditor.cxx b/src/IGESData/IGESData_BasicEditor.cxx index d7b7bebd15..a4fc278714 100644 --- a/src/IGESData/IGESData_BasicEditor.cxx +++ b/src/IGESData/IGESData_BasicEditor.cxx @@ -92,17 +92,27 @@ void IGESData_BasicEditor::Init (const Handle(IGESData_IGESModel)& model, const //#73 rln 10.03.99 S4135: "read.scale.unit" does not affect GlobalSection //if (Interface_Static::IVal("read.scale.unit") == 1) vmm = vmm * 1000.; // vmm est exprime en MILLIMETRES - if (vmm >= 25. && vmm <= 26. ) return SetUnitFlag(1); - if (vmm >= 0.9 && vmm <= 1.1 ) return SetUnitFlag(2); - if (vmm >= 300. && vmm <= 310. ) return SetUnitFlag(4); - if (vmm >= 1600000. && vmm <= 1620000. ) return SetUnitFlag(5); - if (vmm >= 990. && vmm <= 1010. ) return SetUnitFlag(6); - if (vmm >= 990000. && vmm <= 1010000. ) return SetUnitFlag(7); - if (vmm >= 0.025 && vmm <= 0.026 ) return SetUnitFlag(8); - if (vmm >= 0.0009 && vmm <= 0.0011 ) return SetUnitFlag(9); - if (vmm >= 9. && vmm <= 11. ) return SetUnitFlag(10); - if (vmm >= 0.000025 && vmm <= 0.000026) return SetUnitFlag(11); - return Standard_False; + Standard_Integer aFlag = GetFlagByValue(vmm); + return (aFlag > 0) ? SetUnitFlag(aFlag) : Standard_False; +} + +//======================================================================= +//function : GetFlagByValue +//purpose : +//======================================================================= +Standard_Integer IGESData_BasicEditor::GetFlagByValue(const Standard_Real theValue) +{ + if (theValue >= 25. && theValue <= 26.) return 1; + if (theValue >= 0.9 && theValue <= 1.1) return 2; + if (theValue >= 300. && theValue <= 310.) return 4; + if (theValue >= 1600000. && theValue <= 1620000.) return 5; + if (theValue >= 990. && theValue <= 1010.) return 6; + if (theValue >= 990000. && theValue <= 1010000.) return 7; + if (theValue >= 0.025 && theValue <= 0.026) return 8; + if (theValue >= 0.0009 && theValue <= 0.0011) return 9; + if (theValue >= 9. && theValue <= 11.) return 10; + if (theValue >= 0.000025 && theValue <= 0.000026) return 11; + return 0; } //======================================================================= diff --git a/src/IGESData/IGESData_BasicEditor.hxx b/src/IGESData/IGESData_BasicEditor.hxx index 563b8c2b49..dbf7384bcb 100644 --- a/src/IGESData/IGESData_BasicEditor.hxx +++ b/src/IGESData/IGESData_BasicEditor.hxx @@ -131,6 +131,10 @@ public: //! Returns the maximum allowed value for Drafting Flag Standard_EXPORT static Standard_Integer DraftingMax(); + //! Returns Flag corresponding to the scaling theValue. + //! Returns 0 if there's no such flag. + Standard_EXPORT static Standard_Integer GetFlagByValue(const Standard_Real theValue); + diff --git a/src/RWObj/RWObj_Provider.cxx b/src/RWObj/RWObj_Provider.cxx index 90435cbd21..aa6d986520 100644 --- a/src/RWObj/RWObj_Provider.cxx +++ b/src/RWObj/RWObj_Provider.cxx @@ -131,9 +131,19 @@ bool RWObj_Provider::Write(const TCollection_AsciiString& thePath, } RWMesh_CoordinateSystemConverter aConverter; - aConverter.SetInputLengthUnit(aNode->GlobalParameters.LengthUnit / 1000); + Standard_Real aScaleFactorMM = 1.; + if (XCAFDoc_DocumentTool::GetLengthUnit(theDocument, aScaleFactorMM, UnitsMethods_LengthUnit_Millimeter)) + { + aConverter.SetInputLengthUnit(aScaleFactorMM / 1000.); + } + else + { + aConverter.SetInputLengthUnit(aNode->GlobalParameters.SystemUnit / 1000.); + Message::SendWarning() << "Warning in the RWObj_Provider during writing the file " << + thePath << "\t: The document has no information on Units. Using global parameter as initial Unit."; + } aConverter.SetInputCoordinateSystem(aNode->InternalParameters.SystemCS); - aConverter.SetOutputLengthUnit(aNode->InternalParameters.FileLengthUnit); + aConverter.SetOutputLengthUnit(aNode->GlobalParameters.LengthUnit / 1000.); aConverter.SetOutputCoordinateSystem(aNode->InternalParameters.FileCS); RWObj_CafWriter aWriter(thePath); diff --git a/src/RWPly/RWPly_Provider.cxx b/src/RWPly/RWPly_Provider.cxx index 1f81de5bbc..bdabd37376 100644 --- a/src/RWPly/RWPly_Provider.cxx +++ b/src/RWPly/RWPly_Provider.cxx @@ -89,9 +89,19 @@ bool RWPly_Provider::Write(const TCollection_AsciiString& thePath, aFileInfo.Add("Comments", aNode->InternalParameters.WriteComment); } RWMesh_CoordinateSystemConverter aConverter; - aConverter.SetInputLengthUnit(aNode->GlobalParameters.LengthUnit / 1000); + Standard_Real aScaleFactorM = 1.; + if (XCAFDoc_DocumentTool::GetLengthUnit(theDocument, aScaleFactorM)) + { + aConverter.SetInputLengthUnit(aScaleFactorM); + } + else + { + aConverter.SetInputLengthUnit(aNode->GlobalParameters.SystemUnit / 1000.); + Message::SendWarning() << "Warning in the RWPly_Provider during writing the file " << + thePath << "\t: The document has no information on Units. Using global parameter as initial Unit."; + } aConverter.SetInputCoordinateSystem(aNode->InternalParameters.SystemCS); - aConverter.SetOutputLengthUnit(aNode->InternalParameters.FileLengthUnit); + aConverter.SetOutputLengthUnit(aNode->GlobalParameters.LengthUnit / 1000.); aConverter.SetOutputCoordinateSystem(aNode->InternalParameters.FileCS); RWPly_CafWriter aPlyCtx(thePath); diff --git a/src/RWStl/RWStl_Provider.cxx b/src/RWStl/RWStl_Provider.cxx index 8f862530b4..302c9b661d 100644 --- a/src/RWStl/RWStl_Provider.cxx +++ b/src/RWStl/RWStl_Provider.cxx @@ -110,6 +110,13 @@ bool RWStl_Provider::Write(const TCollection_AsciiString& thePath, return false; } + Handle(RWStl_ConfigurationNode) aNode = Handle(RWStl_ConfigurationNode)::DownCast(GetNode()); + if (aNode->GlobalParameters.LengthUnit != 1.0) + { + Message::SendWarning() << "Warning in the RWStl_Provider during writing the file " << + thePath << "\t: Target Units for writing were changed, but current format doesn't support scaling"; + } + if (aLabels.Length() == 1) { aShape = aSTool->GetShape(aLabels.Value(1)); @@ -220,6 +227,11 @@ bool RWStl_Provider::Write(const TCollection_AsciiString& thePath, return false; } Handle(RWStl_ConfigurationNode) aNode = Handle(RWStl_ConfigurationNode)::DownCast(GetNode()); + if (aNode->GlobalParameters.LengthUnit != 1.0) + { + Message::SendWarning() << "Warning in the RWStl_Provider during writing the file " << + thePath << "\t: Target Units for writing were changed, but current format doesn't support scaling"; + } StlAPI_Writer aWriter; aWriter.ASCIIMode() = aNode->InternalParameters.WriteAscii; diff --git a/src/Vrml/Vrml_Provider.cxx b/src/Vrml/Vrml_Provider.cxx index 005af99a69..39527456dc 100644 --- a/src/Vrml/Vrml_Provider.cxx +++ b/src/Vrml/Vrml_Provider.cxx @@ -131,8 +131,19 @@ bool Vrml_Provider::Write(const TCollection_AsciiString& thePath, VrmlAPI_Writer aWriter; aWriter.SetRepresentation(static_cast(aNode->InternalParameters.WriteRepresentationType)); - Standard_Real aScaleFactorM = aNode->GlobalParameters.LengthUnit; - if (!aWriter.WriteDoc(theDocument, thePath.ToCString(), aScaleFactorM)) + Standard_Real aScaling = 1.; + Standard_Real aScaleFactorMM = 1.; + if (XCAFDoc_DocumentTool::GetLengthUnit(theDocument, aScaleFactorMM, UnitsMethods_LengthUnit_Millimeter)) + { + aScaling = aScaleFactorMM / aNode->GlobalParameters.LengthUnit; + } + else + { + aScaling = aNode->GlobalParameters.SystemUnit / aNode->GlobalParameters.LengthUnit; + Message::SendWarning() << "Warning in the Vrml_Provider during writing the file " << + thePath << "\t: The document has no information on Units. Using global parameter as initial Unit."; + } + if (!aWriter.WriteDoc(theDocument, thePath.ToCString(), aScaling)) { Message::SendFail() << "Error in the Vrml_Provider during wtiting the file " << thePath << "\t: File was not written"; diff --git a/tests/de_wrapper/iges/A6 b/tests/de_wrapper/iges/A6 index 8f8563f3a9..d41ed02628 100644 --- a/tests/de_wrapper/iges/A6 +++ b/tests/de_wrapper/iges/A6 @@ -28,7 +28,7 @@ if [catch {ReadIges D1 $filename } catch_result] { } XGetOneShape S1 D1 -if [catch {WriteFile D0 $write_path -conf "provider.IGES.write.iges.unit : 1 "} catch_result] { +if [catch {WriteFile D0 $write_path -conf "global.general.length.unit : 25.4 "} catch_result] { puts "Error : Problem with writing file" } else { puts "OK : Writing is correct" @@ -50,7 +50,7 @@ if [catch {readfile S3 $write_path} catch_result] { puts "OK : Reading is correct" } -if [catch {WriteFile D1 $write_path -conf "provider.IGES.write.iges.unit : 6 "} catch_result] { +if [catch {WriteFile D1 $write_path -conf "global.general.length.unit : 1000 "} catch_result] { puts "Error : Problem with writing file" } else { puts "OK : Writing is correct" @@ -72,7 +72,7 @@ if [catch {readfile S5 $write_path} catch_result] { puts "OK : Reading is correct" } -if [catch {WriteFile D0 $write_path -conf "provider.IGES.write.iges.unit : 2 "} catch_result] { +if [catch {WriteFile D0 $write_path -conf "global.general.length.unit : 1 "} catch_result] { puts "Error : Problem with writing file" } else { puts "OK : Writing is correct" @@ -84,7 +84,7 @@ if [catch {ReadFile D6 $write_path -conf "global.general.length.unit : 1 "} catc } XGetOneShape S6 D6 -if [catch {writefile S1 $write_path -conf "provider.IGES.write.iges.unit : 1 "} catch_result] { +if [catch {writefile S1 $write_path -conf "global.general.length.unit : 25.4 "} catch_result] { puts "Error : Problem with writing file" } else { puts "OK : Writing is correct" @@ -96,7 +96,7 @@ if [catch {ReadFile D7 $write_path -conf "global.general.length.unit : 0.0254 "} } XGetOneShape S7 D7 -array set areas {0 11995.4 1 0.0119954 2 47916.8 3 11979.2 4 0.0479168 5 0.0119792 6 47916.8 7 18.5678} +array set areas {0 11995.4 1 0.0119954 2 11979.2 3 11979.2 4 11979.2 5 0.0119792 6 11979.2 7 18.5678} array set results {0 S0 1 S1 2 S2 3 S3 4 S4 5 S5 6 S6 7 S7} for { set anind 0} { $anind < 8 } { incr anind } { checkprops $results($anind) -s $areas($anind) -eps 1e-2 diff --git a/tests/de_wrapper/obj/A6 b/tests/de_wrapper/obj/A6 index 975a597efa..02f94f35c3 100644 --- a/tests/de_wrapper/obj/A6 +++ b/tests/de_wrapper/obj/A6 @@ -28,12 +28,12 @@ if [catch {ReadObj D1 $filename -fileUnit mm } catch_result] { } XGetOneShape S1 D1 -if [catch {WriteFile D0 $write_path -conf "provider.OBJ.OCC.file.length.unit : 0.001 "} catch_result] { +if [catch {WriteFile D0 $write_path -conf "global.general.length.unit : 1 "} catch_result] { puts "Error : Problem with writing file" } else { puts "OK : Writing is correct" } -if [catch {readfile S2 $write_path} catch_result] { +if [catch {readfile S2 $write_path -conf "provider.OBJ.OCC.file.length.unit : 0.001 "} catch_result] { puts "Error : Problem with reading file" } else { puts "OK : Reading is correct" @@ -44,18 +44,18 @@ if [catch {writefile S0 $write_path} catch_result] { } else { puts "OK : Writing is correct" } -if [catch {readfile S3 $write_path} catch_result] { +if [catch {readfile S3 $write_path -conf "provider.OBJ.OCC.file.length.unit : 0.001 "} catch_result] { puts "Error : Problem with reading file" } else { puts "OK : Reading is correct" } -if [catch {WriteFile D1 $write_path -conf "provider.OBJ.OCC.file.length.unit : 1 "} catch_result] { +if [catch {WriteFile D1 $write_path -conf "global.general.length.unit : 1000 "} catch_result] { puts "Error : Problem with writing file" } else { puts "OK : Writing is correct" } -if [catch {readfile S4 $write_path -conf "global.general.length.unit : 1000 "} catch_result] { +if [catch {readfile S4 $write_path -conf "global.general.length.unit : 1000 \n provider.OBJ.OCC.file.length.unit : 1"} catch_result] { puts "Error : Problem with reading file" } else { puts "OK : Reading is correct" @@ -66,13 +66,13 @@ if [catch {writefile S1 $write_path} catch_result] { } else { puts "OK : Writing is correct" } -if [catch {readfile S5 $write_path} catch_result] { +if [catch {readfile S5 $write_path -conf "provider.OBJ.OCC.file.length.unit : 0.001 "} catch_result] { puts "Error : Problem with reading file" } else { puts "OK : Reading is correct" } -if [catch {WriteFile D0 $write_path -conf "provider.GLTF.OCC.file.length.unit : 0.001 "} catch_result] { +if [catch {WriteFile D0 $write_path -conf "global.general.length.unit : 1 "} catch_result] { puts "Error : Problem with writing file" } else { puts "OK : Writing is correct" @@ -84,12 +84,12 @@ if [catch {ReadFile D6 $write_path -conf "global.general.length.unit : 1 "} catc } XGetOneShape S6 D6 -if [catch {writefile S1 $write_path -conf "provider.GLTF.OCC.file.length.unit : 1 "} catch_result] { +if [catch {writefile S1 $write_path -conf "global.general.length.unit : 1000 "} catch_result] { puts "Error : Problem with writing file" } else { puts "OK : Writing is correct" } -if [catch {ReadFile D7 $write_path -conf "global.general.length.unit : 1000 "} catch_result] { +if [catch {ReadFile D7 $write_path -conf "global.general.length.unit : 1000 \n provider.OBJ.OCC.file.length.unit : 1"} catch_result] { puts "Error : Problem with reading file" } else { puts "OK : Reading is correct" diff --git a/tests/de_wrapper/vrml/A6 b/tests/de_wrapper/vrml/A6 index 449b313526..38501aa6fa 100644 --- a/tests/de_wrapper/vrml/A6 +++ b/tests/de_wrapper/vrml/A6 @@ -98,7 +98,7 @@ if [catch {ReadFile D7 $write_path -conf "provider.VRML.OCC.read.file.unit : 0.0 } XGetOneShape S7 D7 -array set areas {0 5.3415e+06 1 5.3415 2 5.3415e+06 3 5.3415e+06 4 5.3415 5 5.3415 6 5.3415e+06 7 5.3415e-06} +array set areas {0 5.3415e+06 1 5.3415 2 5.3415e+06 3 5.3415e+06 4 5.3415e+06 5 5.3415 6 5.3415e+06 7 5.3415e-06} array set results {0 S0 1 S1 2 S2 3 S3 4 S4 5 S5 6 S6 7 S7} for { set anind 0} { $anind < 8 } { incr anind } { checkprops $results($anind) -s $areas($anind) -eps 1e-2