From 59e349919f8fa8fb1f9ce6b2eeda52a4fc4d28f9 Mon Sep 17 00:00:00 2001 From: ink Date: Thu, 2 Jul 2015 14:30:42 +0300 Subject: [PATCH] 0026342: No materials are read from STEP Changed number of arguments for descriptive_representation_item (for the case when description is absent). Test case for issue CR26342 --- ...epRepr_RWDescriptiveRepresentationItem.cxx | 13 ++++++++++- tests/bugs/step/bug26342 | 22 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100755 tests/bugs/step/bug26342 diff --git a/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cxx index 31ab0b473e..82e85963aa 100644 --- a/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cxx +++ b/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cxx @@ -12,6 +12,7 @@ // commercial license or contractual agreement. #include +#include RWStepRepr_RWDescriptiveRepresentationItem::RWStepRepr_RWDescriptiveRepresentationItem () {} @@ -26,7 +27,17 @@ void RWStepRepr_RWDescriptiveRepresentationItem::ReadStep // --- Number of Parameter Control --- - if (!data->CheckNbParams(num,2,ach,"descriptive_representation_item")) return; + //if (!data->CheckNbParams(num,2,ach,"descriptive_representation_item")) return; + // for the case when description is absent + if (data->NbParams(num) != 2 && data->NbParams(num) != 1) + { + Handle(TCollection_HAsciiString) errmess = new TCollection_HAsciiString( + "Count of Parameters is not 1 or 2 for descriptive_representation_item"); + Handle(TCollection_HAsciiString) errmesso = new TCollection_HAsciiString( + "Count of Parameters is not %d or %d for %s"); + ach->AddFail (errmess->ToCString(),errmesso->ToCString()); + return; + } // --- inherited field : name --- diff --git a/tests/bugs/step/bug26342 b/tests/bugs/step/bug26342 new file mode 100755 index 0000000000..0441618765 --- /dev/null +++ b/tests/bugs/step/bug26342 @@ -0,0 +1,22 @@ +puts "============" +puts "OCC26342" +puts "============" +puts "" + +####################################################################### +# No materials are read from STEP +####################################################################### + +pload DCAF + +ReadStep D [locate_data_file OCC23251-dm1-oc-214.stp] res + +set dump_info [ XDumpDF D ] + +set XCAFDoc_Material_ID "efd212f8-6dfd-11d4-b9c8-0060b0ee281b" + +if { [regexp ${XCAFDoc_Material_ID} ${dump_info}] == 1 } { + puts "OK: materials are read from STEP" +} else { + puts "Error : No materials are read from STEP" +}