0033641: Data Exchange, Step Import - Changing default value for metadata flag

Value for myMetaMode flag changed from 'false' to 'true'.

diff --git a/src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx b/src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx
index 46ca4fe79a2ec569cb1112a8249dd4c7fb9573e4..f93174e070c4bf06105584b5e9f37127b8763ae8 100644 (file)
--- a/src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx
@@ -374,7 +374,7 @@ TCollection_AsciiString STEPCAFControl_ConfigurationNode::Save() const
 
   aResult += "!\n";
   aResult += "!Setting up the read.metadata parameter which is used to indicate read Metadata or not\n";
-  aResult += "!Default value: 0(\"OFF\"). Available values: 0(\"OFF\"), 1(\"ON\")\n";
+  aResult += "!Default value: 1(\"ON\"). Available values: 0(\"OFF\"), 1(\"ON\")\n";
   aResult += aScope + "read.metadata :\t " + InternalParameters.ReadMetadata + "\n";
   aResult += "!\n";
 

diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index 05c52fbb36b107688f1924ab5c934cb604a87197..9c61aa1f85d3e4d8cedd5d5ee314e10ba7ce9e74 100644 (file)
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -291,7 +291,7 @@ STEPCAFControl_Reader::STEPCAFControl_Reader()
   myNameMode(Standard_True),
   myLayerMode(Standard_True),
   myPropsMode(Standard_True),
-  myMetaMode(Standard_False),
+  myMetaMode(Standard_True),
   mySHUOMode(Standard_False),
   myGDTMode(Standard_True),
   myMatMode(Standard_True),
@@ -316,7 +316,7 @@ STEPCAFControl_Reader::STEPCAFControl_Reader(const Handle(XSControl_WorkSession)
   myNameMode(Standard_True),
   myLayerMode(Standard_True),
   myPropsMode(Standard_True),
-  myMetaMode(Standard_False),
+  myMetaMode(Standard_True),
   mySHUOMode(Standard_False),
   myGDTMode(Standard_True),
   myMatMode(Standard_True),

diff --git a/src/StepData/StepData_ConfParameters.hxx b/src/StepData/StepData_ConfParameters.hxx
index 2304e12fcc45f0ddc62733b571e88f3861ed571c..99fd113caa4e67895d5ee712aa24f8fb5197fc71 100644 (file)
--- a/src/StepData/StepData_ConfParameters.hxx
+++ b/src/StepData/StepData_ConfParameters.hxx
@@ -166,7 +166,7 @@ public:
   bool ReadName = true; //<! NameMode is used to indicate read Name or not
   bool ReadLayer = true; //<! LayerMode is used to indicate read Layers or not
   bool ReadProps = true; //<! PropsMode is used to indicate read Validation properties or not
-  bool ReadMetadata = false; //! Parameter for metadata reading
+  bool ReadMetadata = true; //! Parameter for metadata reading
   
   // Write
   WriteMode_PrecisionMode WritePrecisionMode = WriteMode_PrecisionMode_Average; //<! Specifies the mode of writing the resolution value into the STEP file

diff --git a/tests/de_wrapper/configuration/A3 b/tests/de_wrapper/configuration/A3
index 50835a1ab6b41f3d463dd84eb646e4d00f937d4f..61f2db99ce62abb699ab06c102eaff9f3c9d7a95 100644 (file)
--- a/tests/de_wrapper/configuration/A3
+++ b/tests/de_wrapper/configuration/A3
@@ -44,7 +44,7 @@ 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 :   0
+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 :       0

diff --git a/tests/de_wrapper/configuration/A4 b/tests/de_wrapper/configuration/A4
index 81d5587611cfa65c7db7ecc911f7617a422cb04e..e760e2d5465757cece03cf484d0a97ffc62eb7f8 100644 (file)
--- a/tests/de_wrapper/configuration/A4
+++ b/tests/de_wrapper/configuration/A4
@@ -44,7 +44,7 @@ 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 :   0
+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 :       0

diff --git a/tests/metadata/end b/tests/metadata/end
index fc085fc91108cff2e00353f1ada755cd959abbab..fc54e89d6c85d2660ee5022ee90d6f62aad33c33 100644 (file)
--- a/tests/metadata/end
+++ b/tests/metadata/end
@@ -11,7 +11,7 @@ set end_line "\" \n"
 # Read original file
 if { [string length $filename] > 1} {
   set path_file [locate_data_file $filename]
-  if { [catch { ReadFile D $path_file -conf $conf} catch_result] } {
+  if { [catch { ReadFile D $path_file } catch_result] } {
     set err_msg "Error: file was not read - exception "
     puts $err_msg
     append todo_msg $todo_mask $err_msg $end_line

diff --git a/tests/metadata/step/begin b/tests/metadata/step/begin
deleted file mode 100644 (file)
index 95e00a7..0000000
--- a/tests/metadata/step/begin
+++ /dev/null
@@ -1,2 +0,0 @@
-set conf "provider.STEP.OCC.read.metadata : 1"
-