OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0027336: Update STEP entities, according to AP242

Browse Source 
Add header  and parameter for AP242.

Update entities:
product_definition_relationship
styled_item

Update select types:
security_classification_item
person_and_organization_item
organization_item
group_item
external_identification_item
document_reference_item
date_item
approval_item
external_identification_item
draughting_callout_element
value_qualifier
invisibility_context

update gdt tests.

fix compilation warnings.
This commit is contained in:
ika
2016-03-09 14:25:17 +03:00
committed by bugmaster
parent f98965d2bc
commit d658f27576
78 changed files with 2083 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/StepVisual/FILES
View File

@@ -175,6 +175,8 @@ StepVisual_StyleContextSelect.cxx
StepVisual_StyleContextSelect.hxx
StepVisual_StyledItem.cxx
StepVisual_StyledItem.hxx
StepVisual_StyledItemTarget.cxx
StepVisual_StyledItemTarget.hxx
StepVisual_SurfaceSide.hxx
StepVisual_SurfaceSideStyle.cxx
StepVisual_SurfaceSideStyle.hxx

2
src/StepVisual/StepVisual_AnnotationPlane.cxx
View File

@@ -30,7 +30,7 @@ StepVisual_AnnotationPlane::StepVisual_AnnotationPlane () {}
//=======================================================================
void StepVisual_AnnotationPlane::Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& theStyles,
const Handle(StepRepr_RepresentationItem)& theItem,
const Handle(MMgt_TShared)& theItem,
const Handle(StepVisual_HArray1OfAnnotationPlaneElement)& theElements)
{
StepVisual_AnnotationOccurrence::Init(theName, theStyles, theItem);

2
src/StepVisual/StepVisual_AnnotationPlane.hxx
View File

@@ -34,7 +34,7 @@ public:
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& theStyles,
const Handle(StepRepr_RepresentationItem)& theItem,
const Handle(MMgt_TShared)& theItem,
const Handle(StepVisual_HArray1OfAnnotationPlaneElement)& theElements);
//! Returns field Elements

2
src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx
View File

@@ -26,7 +26,7 @@ StepVisual_ContextDependentOverRidingStyledItem::StepVisual_ContextDependentOver
void StepVisual_ContextDependentOverRidingStyledItem::Init(
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles,
const Handle(StepRepr_RepresentationItem)& aItem,
const Handle(MMgt_TShared)& aItem,
const Handle(StepVisual_StyledItem)& aOverRiddenStyle,
const Handle(StepVisual_HArray1OfStyleContextSelect)& aStyleContext)
{

2
src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx
View File

@@ -43,7 +43,7 @@ public:
//! Returns a ContextDependentOverRidingStyledItem
Standard_EXPORT StepVisual_ContextDependentOverRidingStyledItem();
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles, const Handle(StepRepr_RepresentationItem)& aItem, const Handle(StepVisual_StyledItem)& aOverRiddenStyle, const Handle(StepVisual_HArray1OfStyleContextSelect)& aStyleContext);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles, const Handle(MMgt_TShared)& aItem, const Handle(StepVisual_StyledItem)& aOverRiddenStyle, const Handle(StepVisual_HArray1OfStyleContextSelect)& aStyleContext);
Standard_EXPORT void SetStyleContext (const Handle(StepVisual_HArray1OfStyleContextSelect)& aStyleContext);

9
src/StepVisual/StepVisual_DraughtingCalloutElement.cxx
View File

@@ -16,7 +16,7 @@
#include <StepVisual_DraughtingCalloutElement.hxx>
#include <Interface_Macros.hxx>
#include <StepVisual_AnnotationCurveOccurrence.hxx>
#include <StepVisual_AnnotationTextOccurrence.hxx>
#include <StepVisual_TessellatedAnnotationOccurrence.hxx>
//=======================================================================
@@ -35,15 +35,16 @@ Standard_Integer StepVisual_DraughtingCalloutElement::CaseNum(const Handle(Stand
{
if (ent.IsNull()) return 0;
if (ent->IsKind(STANDARD_TYPE(StepVisual_AnnotationCurveOccurrence))) return 1;
else if (ent->IsKind(STANDARD_TYPE(StepVisual_TessellatedAnnotationOccurrence))) return 2;
if (ent->IsKind(STANDARD_TYPE(StepVisual_AnnotationTextOccurrence))) return 2;
if (ent->IsKind(STANDARD_TYPE(StepVisual_TessellatedAnnotationOccurrence))) return 3;
return 0;
}
Handle(StepVisual_AnnotationCurveOccurrence) StepVisual_DraughtingCalloutElement::AnnotationCurveOccurrence() const
{ return GetCasted(StepVisual_AnnotationCurveOccurrence,Value()); }
Handle(StepVisual_TessellatedAnnotationOccurrence) StepVisual_DraughtingCalloutElement::TessellatedAnnotationOccurrence() const
{ return GetCasted(StepVisual_TessellatedAnnotationOccurrence,Value()); }
Handle(StepVisual_AnnotationTextOccurrence) StepVisual_DraughtingCalloutElement::AnnotationTextOccurrence() const
{ return GetCasted(StepVisual_AnnotationTextOccurrence, Value()); }

8
src/StepVisual/StepVisual_DraughtingCalloutElement.hxx
View File

@@ -24,6 +24,7 @@
#include <Standard_Integer.hxx>
class Standard_Transient;
class StepVisual_AnnotationCurveOccurrence;
class StepVisual_AnnotationTextOccurrence;
class StepVisual_TessellatedAnnotationOccurrence;
class StepVisual_DraughtingCalloutElement : public StepData_SelectType
@@ -37,13 +38,18 @@ public:
//! Recognizes a IdAttributeSelect Kind Entity that is :
//! 1 -> AnnotationCurveOccurrence
//! 2 -> AnnotationTextOccurrence
//! 3 -> TessellatedAnnotationOccurrence
//! 0 else
Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const;
//! returns Value as a AnnotationCurveOccurrence (Null if another type)
Standard_EXPORT Handle(StepVisual_AnnotationCurveOccurrence) AnnotationCurveOccurrence() const;
//! returns Value as a AnnotationOccurrence for Tesselated Anotation Occurence
//! returns Value as a AnnotationTextOccurrence
Standard_EXPORT Handle(StepVisual_AnnotationTextOccurrence) AnnotationTextOccurrence() const;
//! returns Value as a TessellatedAnnotationOccurrence
Standard_EXPORT Handle(StepVisual_TessellatedAnnotationOccurrence) TessellatedAnnotationOccurrence() const;
};
#endif // StepVisual_DraughtingCalloutElement

15
src/StepVisual/StepVisual_InvisibilityContext.cxx
View File

@@ -14,6 +14,7 @@
#include <Interface_Macros.hxx>
#include <Standard_Transient.hxx>
#include <StepVisual_DraughtingModel.hxx>
#include <StepVisual_InvisibilityContext.hxx>
#include <StepVisual_PresentationRepresentation.hxx>
#include <StepVisual_PresentationSet.hxx>
@@ -22,10 +23,11 @@ StepVisual_InvisibilityContext::StepVisual_InvisibilityContext () { }
Standard_Integer StepVisual_InvisibilityContext::CaseNum(const Handle(Standard_Transient)& ent) const
{
if (ent.IsNull()) return 0;
if (ent->IsKind(STANDARD_TYPE(StepVisual_PresentationRepresentation))) return 1;
if (ent->IsKind(STANDARD_TYPE(StepVisual_PresentationSet))) return 2;
return 0;
if (ent.IsNull()) return 0;
if (ent->IsKind(STANDARD_TYPE(StepVisual_PresentationRepresentation))) return 1;
if (ent->IsKind(STANDARD_TYPE(StepVisual_PresentationSet))) return 2;
if (ent->IsKind(STANDARD_TYPE(StepVisual_DraughtingModel))) return 3;
return 0;
}
Handle(StepVisual_PresentationRepresentation) StepVisual_InvisibilityContext::PresentationRepresentation () const
@@ -37,3 +39,8 @@ Handle(StepVisual_PresentationSet) StepVisual_InvisibilityContext::PresentationS
{
return GetCasted(StepVisual_PresentationSet,Value());
}
Handle(StepVisual_DraughtingModel) StepVisual_InvisibilityContext::DraughtingModel () const
{
return GetCasted(StepVisual_DraughtingModel, Value());
}

4
src/StepVisual/StepVisual_InvisibilityContext.hxx
View File

@@ -24,6 +24,7 @@
#include <StepData_SelectType.hxx>
#include <Standard_Integer.hxx>
class Standard_Transient;
class StepVisual_DraughtingModel;
class StepVisual_PresentationRepresentation;
class StepVisual_PresentationSet;
@@ -42,6 +43,7 @@ public:
//! Recognizes a InvisibilityContext Kind Entity that is :
//! 1 -> PresentationRepresentation
//! 2 -> PresentationSet
//! 2 -> DraughtingModel
//! 0 else
Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const;
@@ -51,6 +53,8 @@ public:
//! returns Value as a PresentationSet (Null if another type)
Standard_EXPORT Handle(StepVisual_PresentationSet) PresentationSet() const;
//! returns Value as a PresentationSet (Null if another type)
Standard_EXPORT Handle(StepVisual_DraughtingModel) DraughtingModel() const;

2
src/StepVisual/StepVisual_OverRidingStyledItem.cxx
View File

@@ -25,7 +25,7 @@ StepVisual_OverRidingStyledItem::StepVisual_OverRidingStyledItem () {}
void StepVisual_OverRidingStyledItem::Init(
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles,
const Handle(StepRepr_RepresentationItem)& aItem,
const Handle(MMgt_TShared)& aItem,
const Handle(StepVisual_StyledItem)& aOverRiddenStyle)
{
// --- classe own fields ---

2
src/StepVisual/StepVisual_OverRidingStyledItem.hxx
View File

@@ -40,7 +40,7 @@ public:
//! Returns a OverRidingStyledItem
Standard_EXPORT StepVisual_OverRidingStyledItem();
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles, const Handle(StepRepr_RepresentationItem)& aItem, const Handle(StepVisual_StyledItem)& aOverRiddenStyle);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles, const Handle(MMgt_TShared)& aItem, const Handle(StepVisual_StyledItem)& aOverRiddenStyle);
Standard_EXPORT void SetOverRiddenStyle (const Handle(StepVisual_StyledItem)& aOverRiddenStyle);

49
src/StepVisual/StepVisual_StyledItem.cxx
View File

@@ -11,11 +11,11 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Standard_Type.hxx>
#include <StepRepr_RepresentationItem.hxx>
#include <StepVisual_PresentationStyleAssignment.hxx>
#include <StepVisual_StyledItem.hxx>
#include <StepVisual_StyledItemTarget.hxx>
#include <TCollection_HAsciiString.hxx>
IMPLEMENT_STANDARD_RTTIEXT(StepVisual_StyledItem,StepRepr_RepresentationItem)
@@ -23,45 +23,60 @@ IMPLEMENT_STANDARD_RTTIEXT(StepVisual_StyledItem,StepRepr_RepresentationItem)
StepVisual_StyledItem::StepVisual_StyledItem () {}
void StepVisual_StyledItem::Init(
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles,
const Handle(StepRepr_RepresentationItem)& aItem)
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles,
const Handle(MMgt_TShared)& aItem)
{
// --- classe own fields ---
styles = aStyles;
item = aItem;
// --- classe inherited fields ---
StepRepr_RepresentationItem::Init(aName);
// --- classe own fields ---
myStyles = aStyles;
myItem = aItem;
// --- classe inherited fields ---
StepRepr_RepresentationItem::Init(aName);
}
void StepVisual_StyledItem::SetStyles(const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles)
{
styles = aStyles;
myStyles = aStyles;
}
Handle(StepVisual_HArray1OfPresentationStyleAssignment) StepVisual_StyledItem::Styles() const
{
return styles;
return myStyles;
}
Handle(StepVisual_PresentationStyleAssignment) StepVisual_StyledItem::StylesValue(const Standard_Integer num) const
{
return styles->Value(num);
return myStyles->Value(num);
}
Standard_Integer StepVisual_StyledItem::NbStyles () const
{
if (styles.IsNull()) return 0;
return styles->Length();
if (myStyles.IsNull()) return 0;
return myStyles->Length();
}
void StepVisual_StyledItem::SetItem(const Handle(StepRepr_RepresentationItem)& aItem)
{
item = aItem;
myItem = aItem;
}
void StepVisual_StyledItem::SetItem(const StepVisual_StyledItemTarget& theItem)
{
myItem = Handle(MMgt_TShared)::DownCast(theItem.Value());
}
Handle(StepRepr_RepresentationItem) StepVisual_StyledItem::Item() const
{
return item;
if (myItem->IsKind(STANDARD_TYPE(StepRepr_RepresentationItem)))
return Handle(StepRepr_RepresentationItem)::DownCast(myItem);
else
return NULL;
}
StepVisual_StyledItemTarget StepVisual_StyledItem::ItemAP242() const
{
StepVisual_StyledItemTarget anItem;
if (anItem.CaseNum(myItem) > 0)
anItem.SetValue(myItem);
return anItem;
}

12
src/StepVisual/StepVisual_StyledItem.hxx
View File

@@ -22,6 +22,7 @@
#include <StepVisual_HArray1OfPresentationStyleAssignment.hxx>
#include <StepRepr_RepresentationItem.hxx>
#include <StepVisual_StyledItemTarget.hxx>
#include <Standard_Integer.hxx>
class StepRepr_RepresentationItem;
class TCollection_HAsciiString;
@@ -41,7 +42,7 @@ public:
//! Returns a StyledItem
Standard_EXPORT StepVisual_StyledItem();
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles, const Handle(StepRepr_RepresentationItem)& aItem);
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles, const Handle(MMgt_TShared)& aItem);
Standard_EXPORT void SetStyles (const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& aStyles);
@@ -55,6 +56,9 @@ public:
Standard_EXPORT Handle(StepRepr_RepresentationItem) Item() const;
Standard_EXPORT void SetItem (const StepVisual_StyledItemTarget& aItem);
Standard_EXPORT StepVisual_StyledItemTarget ItemAP242() const;
@@ -68,9 +72,9 @@ protected:
private:
Handle(StepVisual_HArray1OfPresentationStyleAssignment) styles;
Handle(StepRepr_RepresentationItem) item;
Handle(StepVisual_HArray1OfPresentationStyleAssignment) myStyles;
// May be StepRepr_RepresentationItem for AP214(203) and StepVisual_StyledItemTarget for AP242
Handle(MMgt_TShared) myItem;
};

63
src/StepVisual/StepVisual_StyledItemTarget.cxx Normal file
View File

@@ -0,0 +1,63 @@
// Created on: 2016-03-18
// Created by: Irina KRYLOVA
// Copyright (c) 2016 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <StepVisual_StyledItemTarget.hxx>
#include <Interface_Macros.hxx>
#include <StepGeom_GeometricRepresentationItem.hxx>
#include <StepRepr_MappedItem.hxx>
#include <StepRepr_Representation.hxx>
#include <StepShape_TopologicalRepresentationItem.hxx>
//=======================================================================
//function : StepVisual_StyledItemTarget
//purpose :
//=======================================================================
StepVisual_StyledItemTarget::StepVisual_StyledItemTarget () { }
//=======================================================================
//function : CaseNum
//purpose :
//=======================================================================
Standard_Integer StepVisual_StyledItemTarget::CaseNum(const Handle(Standard_Transient)& ent) const
{
if (ent.IsNull()) return 0;
if (ent->IsKind(STANDARD_TYPE(StepGeom_GeometricRepresentationItem))) return 1;
if (ent->IsKind(STANDARD_TYPE(StepRepr_MappedItem))) return 2;
if (ent->IsKind(STANDARD_TYPE(StepRepr_Representation))) return 3;
if (ent->IsKind(STANDARD_TYPE(StepShape_TopologicalRepresentationItem))) return 4;
return 0;
}
Handle(StepGeom_GeometricRepresentationItem) StepVisual_StyledItemTarget::GeometricRepresentationItem() const
{
return GetCasted(StepGeom_GeometricRepresentationItem,Value());
}
Handle(StepRepr_MappedItem) StepVisual_StyledItemTarget::MappedItem() const
{
return GetCasted(StepRepr_MappedItem,Value());
}
Handle(StepRepr_Representation) StepVisual_StyledItemTarget::Representation() const
{
return GetCasted(StepRepr_Representation,Value());
}
Handle(StepShape_TopologicalRepresentationItem) StepVisual_StyledItemTarget::TopologicalRepresentationItem() const
{
return GetCasted(StepShape_TopologicalRepresentationItem,Value());
}

61
src/StepVisual/StepVisual_StyledItemTarget.hxx Normal file
View File

@@ -0,0 +1,61 @@
// Created on: 2016-03-18
// Created by: Irina KRYLOVA
// Copyright (c) 2016 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _StepVisual_StyledItemTarget_HeaderFile
#define _StepVisual_StyledItemTarget_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <StepData_SelectType.hxx>
#include <Standard_Integer.hxx>
class Standard_Transient;
class StepGeom_GeometricRepresentationItem;
class StepRepr_MappedItem;
class StepRepr_Representation;
class StepShape_TopologicalRepresentationItem;
class StepVisual_StyledItemTarget : public StepData_SelectType
{
public:
DEFINE_STANDARD_ALLOC
//! Returns a StyledItemTarget select type
Standard_EXPORT StepVisual_StyledItemTarget();
//! Recognizes a StyledItemTarget Kind Entity that is :
//! 1 -> GeometricRepresentationItem
//! 2 -> MappedItem
//! 3 -> Representation
//! 4 -> TopologicalRepresentationItem
//! 0 else
Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const;
//! returns Value as a GeometricRepresentationItem (Null if another type)
Standard_EXPORT Handle(StepGeom_GeometricRepresentationItem) GeometricRepresentationItem() const;
//! returns Value as a MappedItem (Null if another type)
Standard_EXPORT Handle(StepRepr_MappedItem) MappedItem() const;
//! returns Value as a Representation (Null if another type)
Standard_EXPORT Handle(StepRepr_Representation) Representation() const;
//! returns Value as a TopologicalRepresentationItem (Null if another type)
Standard_EXPORT Handle(StepShape_TopologicalRepresentationItem) TopologicalRepresentationItem() const;
};
#endif // _StepVisual_StyledItemTarget_HeaderFile