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

0028315: Data Exchange - Import/Export GD&Ts without semantic

Implement import/export of Dimensions without semantic.
Add new type of dimension for GDTs with presentation and connecting to shapes.
Update test cases.

Small corrections for issue CR28315
This commit is contained in:
ika
2017-01-19 16:05:09 +03:00
committed by apn
parent 465e686173
commit 1209c1b923
49 changed files with 1095 additions and 425 deletions

View File

@@ -1,5 +1,9 @@
StepVisual_AnnotationCurveOccurrence.cxx
StepVisual_AnnotationCurveOccurrence.hxx
StepVisual_AnnotationFillArea.cxx
StepVisual_AnnotationFillArea.hxx
StepVisual_AnnotationFillAreaOccurrence.cxx
StepVisual_AnnotationFillAreaOccurrence.hxx
StepVisual_AnnotationOccurrence.cxx
StepVisual_AnnotationOccurrence.hxx
StepVisual_AnnotationPlane.cxx

View File

@@ -16,6 +16,6 @@
#include <Standard_Type.hxx>
#include <StepVisual_AnnotationCurveOccurrence.hxx>
IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrence,StepVisual_StyledItem)
IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrence,StepVisual_AnnotationOccurrence)
StepVisual_AnnotationCurveOccurrence::StepVisual_AnnotationCurveOccurrence () {}

View File

@@ -19,18 +19,18 @@
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <StepVisual_StyledItem.hxx>
#include <StepVisual_AnnotationOccurrence.hxx>
class StepVisual_AnnotationCurveOccurrence;
DEFINE_STANDARD_HANDLE(StepVisual_AnnotationCurveOccurrence, StepVisual_StyledItem)
DEFINE_STANDARD_HANDLE(StepVisual_AnnotationCurveOccurrence, StepVisual_AnnotationOccurrence)
class StepVisual_AnnotationCurveOccurrence : public StepVisual_StyledItem
class StepVisual_AnnotationCurveOccurrence : public StepVisual_AnnotationOccurrence
{
public:
//! Returns a AnnotationCurveOccurrence
Standard_EXPORT StepVisual_AnnotationCurveOccurrence();
DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrence,StepVisual_StyledItem)
DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrence,StepVisual_AnnotationOccurrence)
};
#endif // _StepVisual_AnnotationCurveOccurrence_HeaderFile

View File

@@ -0,0 +1,26 @@
// Created on: 2016-12-28
// 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 <Standard_Type.hxx>
#include <StepVisual_AnnotationFillArea.hxx>
IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationFillArea, StepShape_GeometricCurveSet)
//=======================================================================
//function : StepVisual_AnnotationFillArea
//purpose :
//=======================================================================
StepVisual_AnnotationFillArea::StepVisual_AnnotationFillArea () {}

View File

@@ -0,0 +1,40 @@
// Created on: 2016-12-28
// 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_AnnotationFillArea_HeaderFile
#define _StepVisual_AnnotationFillArea_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <StepRepr_HArray1OfRepresentationItem.hxx>
#include <StepShape_GeometricCurveSet.hxx>
#include <Standard_Integer.hxx>
class TCollection_HAsciiString;
class StepVisual_AnnotationFillArea;
DEFINE_STANDARD_HANDLE(StepVisual_AnnotationFillArea, StepShape_GeometricCurveSet)
class StepVisual_AnnotationFillArea : public StepShape_GeometricCurveSet
{
public:
//! Returns a AnnotationFillArea
Standard_EXPORT StepVisual_AnnotationFillArea();
DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationFillArea, StepShape_GeometricCurveSet)
};
#endif // _StepVisual_AnnotationFillArea_HeaderFile

View File

@@ -0,0 +1,38 @@
// Created on: 2016-12-28
// 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 <Standard_Type.hxx>
#include <StepVisual_AnnotationFillAreaOccurrence.hxx>
IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationFillAreaOccurrence, StepVisual_AnnotationOccurrence)
//=======================================================================
//function : StepVisual_AnnotationFillAreaOccurrence
//purpose :
//=======================================================================
StepVisual_AnnotationFillAreaOccurrence::StepVisual_AnnotationFillAreaOccurrence () {}
//=======================================================================
//function : Init
//purpose :
//=======================================================================
void StepVisual_AnnotationFillAreaOccurrence::Init(const Handle(TCollection_HAsciiString)& theName,
const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& theStyles,
const Handle(MMgt_TShared)& theItem,
const Handle(StepGeom_GeometricRepresentationItem)& theFillStyleTarget)
{
StepVisual_AnnotationOccurrence::Init(theName, theStyles, theItem);
myFillStyleTarget = theFillStyleTarget;
}

View File

@@ -0,0 +1,57 @@
// Created on: 2016-12-28
// 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_AnnotationFillAreaOccurrence_HeaderFile
#define _StepVisual_AnnotationFillAreaOccurrence_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <StepVisual_AnnotationOccurrence.hxx>
class StepVisual_AnnotationFillAreaOccurrence;
DEFINE_STANDARD_HANDLE(StepVisual_AnnotationFillAreaOccurrence, StepVisual_AnnotationOccurrence)
class StepVisual_AnnotationFillAreaOccurrence : public StepVisual_AnnotationOccurrence
{
public:
//! Returns a AnnotationFillAreaOccurrence
Standard_EXPORT StepVisual_AnnotationFillAreaOccurrence();
//! Initialize all fields (own and inherited)
Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& theStyles,
const Handle(MMgt_TShared)& theItem,
const Handle(StepGeom_GeometricRepresentationItem)& theFillStyleTarget);
//! Returns field fill_style_target
Standard_EXPORT Handle(StepGeom_GeometricRepresentationItem) FillStyleTarget() const
{
return myFillStyleTarget;
}
//! Set field fill_style_target
Standard_EXPORT void SetFillStyleTarget (const Handle(StepGeom_GeometricRepresentationItem)& theTarget)
{
myFillStyleTarget = theTarget;
}
DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationFillAreaOccurrence, StepVisual_AnnotationOccurrence)
private:
Handle(StepGeom_GeometricRepresentationItem) myFillStyleTarget;
};
#endif // _StepVisual_AnnotationFillAreaOccurrence_HeaderFile

View File

@@ -16,6 +16,7 @@
#include <StepVisual_DraughtingCalloutElement.hxx>
#include <Interface_Macros.hxx>
#include <StepVisual_AnnotationCurveOccurrence.hxx>
#include <StepVisual_AnnotationFillAreaOccurrence.hxx>
#include <StepVisual_AnnotationTextOccurrence.hxx>
#include <StepVisual_TessellatedAnnotationOccurrence.hxx>
@@ -37,6 +38,7 @@ Standard_Integer StepVisual_DraughtingCalloutElement::CaseNum(const Handle(Stand
if (ent->IsKind(STANDARD_TYPE(StepVisual_AnnotationCurveOccurrence))) return 1;
if (ent->IsKind(STANDARD_TYPE(StepVisual_AnnotationTextOccurrence))) return 2;
if (ent->IsKind(STANDARD_TYPE(StepVisual_TessellatedAnnotationOccurrence))) return 3;
if (ent->IsKind(STANDARD_TYPE(StepVisual_AnnotationFillAreaOccurrence))) return 4;
return 0;
}
@@ -47,4 +49,7 @@ Handle(StepVisual_TessellatedAnnotationOccurrence) StepVisual_DraughtingCalloutE
{ return GetCasted(StepVisual_TessellatedAnnotationOccurrence,Value()); }
Handle(StepVisual_AnnotationTextOccurrence) StepVisual_DraughtingCalloutElement::AnnotationTextOccurrence() const
{ return GetCasted(StepVisual_AnnotationTextOccurrence, Value()); }
{ return GetCasted(StepVisual_AnnotationTextOccurrence, Value()); }
Handle(StepVisual_AnnotationFillAreaOccurrence) StepVisual_DraughtingCalloutElement::AnnotationFillAreaOccurrence() const
{ return GetCasted(StepVisual_AnnotationFillAreaOccurrence, Value()); }

View File

@@ -24,6 +24,7 @@
#include <Standard_Integer.hxx>
class Standard_Transient;
class StepVisual_AnnotationCurveOccurrence;
class StepVisual_AnnotationFillAreaOccurrence;
class StepVisual_AnnotationTextOccurrence;
class StepVisual_TessellatedAnnotationOccurrence;
@@ -40,6 +41,7 @@ public:
//! 1 -> AnnotationCurveOccurrence
//! 2 -> AnnotationTextOccurrence
//! 3 -> TessellatedAnnotationOccurrence
//! 4 -> AnnotationFillAreaOccurrence
//! 0 else
Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const;
@@ -51,5 +53,8 @@ public:
//! returns Value as a TessellatedAnnotationOccurrence
Standard_EXPORT Handle(StepVisual_TessellatedAnnotationOccurrence) TessellatedAnnotationOccurrence() const;
//! returns Value as a AnnotationFillAreaOccurrence
Standard_EXPORT Handle(StepVisual_AnnotationFillAreaOccurrence) AnnotationFillAreaOccurrence() const;
};
#endif // StepVisual_DraughtingCalloutElement