diff --git a/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx b/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx index 2c79553fcf..6800a448a5 100644 --- a/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx +++ b/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx @@ -197,7 +197,7 @@ void STEPCAFControl_GDTProperty::GetDimClassOfTolerance(const Handle(StepShape_L Standard_Boolean aFound; theHolle = Standard_False; //it is not verified information - for(Standard_Integer c = 0; c <= 1; c++) + for(Standard_Integer c = 0; c <= 1 && !aFormV.IsNull(); c++) { aFound = Standard_False; Standard_Boolean aCaseSens = Standard_False; diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx index 2772edc2d6..ae1f11569b 100644 --- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx @@ -1491,6 +1491,18 @@ Standard_Boolean STEPCAFControl_Reader::ReadLayers(const Handle(XSControl_WorkSe Handle(TCollection_HAsciiString) descr = SVPLA->Description(); Handle(TCollection_HAsciiString) hName = SVPLA->Name(); TCollection_ExtendedString aLayerName(hName->String()); + TDF_Label aLayerLabel; + + // check invisibility + Standard_Boolean isVisible = Standard_True;; + Interface_EntityIterator subs = WS->Graph().Sharings(SVPLA); + for (subs.Start(); subs.More() && isVisible; subs.Next()) { + if (!subs.Value()->IsKind(STANDARD_TYPE(StepVisual_Invisibility))) continue; +#ifdef OCCT_DEBUG + std::cout << "\tLayer \"" << aLayerName << "\" is invisible" << std::endl; +#endif + isVisible = Standard_False; + } // find a target shape and its label in the document for (Standard_Integer j = 1; j <= SVPLA->NbAssignedItems(); j++) { @@ -1503,20 +1515,13 @@ Standard_Boolean STEPCAFControl_Reader::ReadLayers(const Handle(XSControl_WorkSe TDF_Label shL; if (!STool->Search(S, shL, Standard_True, Standard_True, Standard_True)) continue; - LTool->SetLayer(shL, aLayerName); + if (aLayerLabel.IsNull()) + aLayerLabel = LTool->AddLayer(aLayerName, isVisible); + LTool->SetLayer(shL, aLayerLabel); } - // check invisibility - Interface_EntityIterator subs = WS->Graph().Sharings(SVPLA); - for (subs.Start(); subs.More(); subs.Next()) { - if (!subs.Value()->IsKind(STANDARD_TYPE(StepVisual_Invisibility))) continue; -#ifdef OCCT_DEBUG - std::cout << "\tLayer \"" << aLayerName << "\" is invisible" << std::endl; -#endif - //TDF_Label InvLayerLab = LTool->FindLayer(aLayerName); - TDF_Label InvLayerLab = LTool->AddLayer(aLayerName); //skl for OCC3926 - TDataStd_UAttribute::Set (InvLayerLab, XCAFDoc::InvisibleGUID()); - } + if (!aLayerLabel.IsNull()) + LTool->SetVisibility(aLayerLabel, isVisible); } return Standard_True; } @@ -4181,6 +4186,8 @@ Standard_Boolean STEPCAFControl_Reader::ReadMaterials(const Handle(XSControl_Wor for (Standard_Integer idu = 1; idu <= DU->NbElements(); idu++) { Handle(StepBasic_DerivedUnitElement) DUE = DU->ElementsValue(idu); Handle(StepBasic_NamedUnit) NU = DUE->Unit(); + if (NU.IsNull()) + continue; if (NU->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndLengthUnit)) || NU->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndLengthUnit))) { diff --git a/src/XCAFDoc/XCAFDoc_LayerTool.cxx b/src/XCAFDoc/XCAFDoc_LayerTool.cxx index a95810b05e..50e92c6d93 100644 --- a/src/XCAFDoc/XCAFDoc_LayerTool.cxx +++ b/src/XCAFDoc/XCAFDoc_LayerTool.cxx @@ -147,14 +147,18 @@ Standard_Boolean XCAFDoc_LayerTool::FindLayer(const TCollection_ExtendedString& //purpose : //======================================================================= -TDF_Label XCAFDoc_LayerTool::FindLayer(const TCollection_ExtendedString& aLayer) const +TDF_Label XCAFDoc_LayerTool::FindLayer(const TCollection_ExtendedString& aLayer, + const Standard_Boolean theToFindWithProperty, + const Standard_Boolean theToFindVisible) const { TDF_ChildIterator it( Label() ); TDF_Label lab; for (; it.More(); it.Next()) { TDF_Label aLabel = it.Value(); Handle(TDataStd_Name) aName; - if ( aLabel.FindAttribute (TDataStd_Name::GetID(), aName) && (aName->Get().IsEqual(aLayer)) ) { + if ( aLabel.FindAttribute (TDataStd_Name::GetID(), aName) && (aName->Get().IsEqual(aLayer)) && + (!theToFindWithProperty || (theToFindWithProperty && (IsVisible(aLabel) == theToFindVisible))) ) + { lab = aLabel; break; } @@ -168,18 +172,35 @@ TDF_Label XCAFDoc_LayerTool::FindLayer(const TCollection_ExtendedString& aLayer) //purpose : //======================================================================= -TDF_Label XCAFDoc_LayerTool::AddLayer(const TCollection_ExtendedString& aLayer) const +TDF_Label XCAFDoc_LayerTool::AddLayer(const TCollection_ExtendedString& theLayer) const { TDF_Label lab; - if ( FindLayer(aLayer, lab) ) + if ( FindLayer(theLayer, lab) ) return lab; TDF_TagSource aTag; TDF_Label aLabel = aTag.NewChild( Label() ); Handle(TDataStd_Name) aName = new TDataStd_Name; - aName->Set(aLabel, aLayer); + aName->Set(aLabel, theLayer); return aLabel; } +//======================================================================= +//function : AddLayer +//purpose : +//======================================================================= + +TDF_Label XCAFDoc_LayerTool::AddLayer(const TCollection_ExtendedString& theLayer, + const Standard_Boolean theToFindVisible) const +{ + TDF_Label lab = FindLayer(theLayer, Standard_True, theToFindVisible); + if (!lab.IsNull()) + return lab; + TDF_TagSource aTag; + TDF_Label aLabel = aTag.NewChild(Label()); + Handle(TDataStd_Name) aName = new TDataStd_Name; + aName->Set(aLabel, theLayer); + return aLabel; +} //======================================================================= //function : RemoveLayer diff --git a/src/XCAFDoc/XCAFDoc_LayerTool.hxx b/src/XCAFDoc/XCAFDoc_LayerTool.hxx index 6e85a903c8..65a1d63f40 100644 --- a/src/XCAFDoc/XCAFDoc_LayerTool.hxx +++ b/src/XCAFDoc/XCAFDoc_LayerTool.hxx @@ -73,14 +73,21 @@ public: //! Returns False if Layer is not found in Layertable Standard_EXPORT Standard_Boolean FindLayer (const TCollection_ExtendedString& aLayer, TDF_Label& lab) const; - //! Finds a Layer definition in a Layertable and returns - //! its label if found (or Null label else) - Standard_EXPORT TDF_Label FindLayer (const TCollection_ExtendedString& aLayer) const; + //! Finds a Layer definition in a Layertable by name + //! Returns first founded label with the same name if is false + //! If is true returns first label that + //! contains or not contains visible attr, according to the parameter + Standard_EXPORT TDF_Label FindLayer (const TCollection_ExtendedString& aLayer, const Standard_Boolean theToFindWithProperty = Standard_False, const Standard_Boolean theToFindVisible = Standard_True) const; //! Adds a Layer definition to a Layertable and returns //! its label (returns existing label if the same Layer //! is already defined) - Standard_EXPORT TDF_Label AddLayer (const TCollection_ExtendedString& aLayer) const; + Standard_EXPORT TDF_Label AddLayer (const TCollection_ExtendedString& theLayer) const; + + //! Adds a Layer definition to a Layertable and returns its label + //! Returns existing label (if it is already defined) + //! of visible or invisible layer, according to parameter + Standard_EXPORT TDF_Label AddLayer(const TCollection_ExtendedString& theLayer, const Standard_Boolean theToFindVisible) const; //! Removes Layer from the Layertable Standard_EXPORT void RemoveLayer (const TDF_Label& lab) const; diff --git a/tests/bugs/step/bug32049 b/tests/bugs/step/bug32049 new file mode 100644 index 0000000000..e1a3eb673e --- /dev/null +++ b/tests/bugs/step/bug32049 @@ -0,0 +1,21 @@ +puts "========================" +puts "0032049: Data Exchange - STEP file import problems" +puts "========================" + +pload OCAF +catch { Close D } + +# Read file +ReadStep D [locate_data_file bug32049_sp7_04dx_242.stp] + +# Check file +set xst [ XStat D ] +if { [regexp {Number of labels with layer link = 191} $xst] != 1 } { + puts "Error: Incorrect number of layer references" +} + +if { [regexp {Number of layers = 5} $xst] != 1 } { + puts "Error: incorrect number of layers" +} + +Close D diff --git a/tests/bugs/step/bug32049_1 b/tests/bugs/step/bug32049_1 new file mode 100644 index 0000000000..be59f4fcbd --- /dev/null +++ b/tests/bugs/step/bug32049_1 @@ -0,0 +1,12 @@ +puts "========================" +puts "0032049: Data Exchange - STEP file import problems" +puts "========================" + +pload OCAF + +# Read files +ReadStep D_1 [locate_data_file bug32049_test.stp] +ReadStep D_2 [locate_data_file bug32049_sp7_10nx_242.stp] + +Close D_1 +Close D_2 diff --git a/tests/de/step_1/A2 b/tests/de/step_1/A2 index 82c97a88a2..7e66588eeb 100644 --- a/tests/de/step_1/A2 +++ b/tests/de/step_1/A2 @@ -1,7 +1,4 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: LAYERS : Faulty" - - set filename tr9_r0701-db.stp set ref_data { @@ -15,7 +12,7 @@ LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) To PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) COLORS : Colors = WHITE ( WHITE ) -NLAYERS : NLayers = 1 ( 2 ) -LAYERS : Layers = 2 ( { 0} { 2} ) +NLAYERS : NLayers = 1 ( 1 ) +LAYERS : Layers = 2 ( { 2} ) } diff --git a/tests/de/step_1/A5 b/tests/de/step_1/A5 index dc12c8c3d4..9354f81009 100644 --- a/tests/de/step_1/A5 +++ b/tests/de/step_1/A5 @@ -1,7 +1,4 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: LAYERS : Faulty" - - set filename tr8_pr3_al.stp set ref_data { @@ -15,7 +12,7 @@ LABELS : N0Labels = 1 ( 1 ) N1Labels = 4 ( 4 ) N2Labels = 0 ( 0 ) To PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) COLORS : Colors = BLUE GREEN RED YELLOW ( BLUE GREEN RED YELLOW ) -NLAYERS : NLayers = 0 ( 1 ) -LAYERS : Layers = ( LayerA ) +NLAYERS : NLayers = 0 ( 0 ) +LAYERS : Layers = ( ) } diff --git a/tests/de/step_1/C8 b/tests/de/step_1/C8 index ec01885bc3..0cf922a741 100644 --- a/tests/de/step_1/C8 +++ b/tests/de/step_1/C8 @@ -1,7 +1,4 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: LAYERS : Faulty" - - set filename tr10_r0701_db.stp set ref_data { @@ -15,7 +12,7 @@ LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) To PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) COLORS : Colors = WHITE ( WHITE ) -NLAYERS : NLayers = 1 ( 2 ) -LAYERS : Layers = 2 ( { 0} { 2} ) +NLAYERS : NLayers = 1 ( 1 ) +LAYERS : Layers = 2 ( { 2} ) }