0027684: Coding rules - drop unused declarations from Graphic3d

The following headers have been removed:
- Graphic3d_TypeOfPolygon
- Graphic3d_TypeOfPrimitive
- Graphic3d_Array1OfVector.hxx
- Graphic3d_Array1OfVertex.hxx
- Graphic3d_Array2OfVertex.hxx
- Graphic3d_CBitFields4.hxx
- Graphic3d_CBitFields8.hxx
- Graphic3d_CBitFields16.hxx
- Graphic3d_CBitFields20.hxx
- Graphic3d_CStructurePtr.hxx
- Graphic3d_CycleError.hxx
- Graphic3d_DataStructure.pxx
- Graphic3d_HSequenceOfStructure.hxx
- Graphic3d_InitialisationError.hxx
- Graphic3d_ListIteratorOfListOfShortReal.hxx
- Graphic3d_ListOfShortReal.hxx
- Graphic3d_NListOfHAsciiString.hxx
- Graphic3d_StructureManagerPtr.hxx
- Graphic3d_StructurePtr.hxx

Graphic3d_StructureManager - remove default aspects, which have been never used.

do not include non-existing header Graphic3d_Array1OfVertex.hxx from MFC sample

Graphic3d_Group::MinMaxValues() - add missing Standard_EXPORT

samples/mfc/standard/01_Geometry/src/StdAfx.h

@@ -186,7 +186,6 @@
 #include <GeomTools.hxx>
 #include <GeomTools_Curve2dSet.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Graphic3d_Array1OfVertex.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_ArrayOfSegments.hxx>
 #include <GProp_PEquation.hxx>

samples/mfc/standard/Common/Primitive/Sample2D_Markers.h

@@ -3,7 +3,6 @@
 
 #include <Standard_Macro.hxx>
 #include <Standard_DefineHandle.hxx>
-#include <Graphic3d_Array1OfVertex.hxx>
 #include <Graphic3d_ArrayOfPoints.hxx>
 class Sample2D_Markers;
 DEFINE_STANDARD_HANDLE(Sample2D_Markers,AIS_InteractiveObject)

samples/mfc/standard/Common/StdAfx.h

@@ -55,7 +55,6 @@
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_HorizontalTextAlignment.hxx>
 #include <Graphic3d_VerticalTextAlignment.hxx>
-#include <Graphic3d_Array1OfVertex.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_ExportFormat.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>

samples/mfc/standard/Common/User_Cylinder.cxx

@@ -18,7 +18,6 @@ IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject)
 #include <Poly_Triangulation.hxx>
 #include <TColgp_Array1OfDir.hxx>
 #include <GProp_PGProps.hxx>
-#include <Graphic3d_Array1OfVertex.hxx>
 #include <Quantity_Color.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <Prs3d.hxx>

src/Graphic3d/FILES

@@ -1,6 +1,3 @@
-Graphic3d_Array1OfVector.hxx
-Graphic3d_Array1OfVertex.hxx
-Graphic3d_Array2OfVertex.hxx
 Graphic3d_ArrayOfPoints.cxx
 Graphic3d_ArrayOfPoints.hxx
 Graphic3d_ArrayOfPolygons.cxx
@@ -40,21 +37,14 @@ Graphic3d_Buffer.hxx
 Graphic3d_BufferType.hxx
 Graphic3d_Camera.cxx
 Graphic3d_Camera.hxx
-Graphic3d_CBitFields4.hxx
-Graphic3d_CBitFields8.hxx
-Graphic3d_CBitFields16.hxx
-Graphic3d_CBitFields20.hxx
 Graphic3d_CLight.hxx
 Graphic3d_ClipPlane.cxx
 Graphic3d_ClipPlane.hxx
 Graphic3d_CStructure.cxx
 Graphic3d_CStructure.hxx
-Graphic3d_CStructurePtr.hxx
 Graphic3d_CTexture.hxx
 Graphic3d_CView.cxx
 Graphic3d_CView.hxx
-Graphic3d_CycleError.hxx
-Graphic3d_DataStructure.pxx
 Graphic3d_DataStructureManager.cxx
 Graphic3d_DataStructureManager.hxx
 Graphic3d_ExportFormat.hxx
@@ -66,13 +56,9 @@ Graphic3d_Group.hxx
 Graphic3d_GroupAspect.hxx
 Graphic3d_GroupDefinitionError.hxx
 Graphic3d_HorizontalTextAlignment.hxx
-Graphic3d_HSequenceOfStructure.hxx
 Graphic3d_IndexBuffer.hxx
 Graphic3d_IndexedMapOfAddress.hxx
-Graphic3d_InitialisationError.hxx
 Graphic3d_LevelOfTextureAnisotropy.hxx
-Graphic3d_ListIteratorOfListOfShortReal.hxx
-Graphic3d_ListOfShortReal.hxx
 Graphic3d_MapIteratorOfMapOfStructure.hxx
 Graphic3d_MapOfObject.hxx
 Graphic3d_MapOfStructure.hxx
@@ -88,7 +74,6 @@ Graphic3d_NameOfTexture1D.hxx
 Graphic3d_NameOfTexture2D.hxx
 Graphic3d_NameOfTextureEnv.hxx
 Graphic3d_NameOfTexturePlane.hxx
-Graphic3d_NListOfHAsciiString.hxx
 Graphic3d_NMapOfTransient.hxx
 Graphic3d_PolygonOffset.hxx
 Graphic3d_PriorityDefinitionError.hxx
@@ -115,8 +100,6 @@ Graphic3d_Structure.pxx
 Graphic3d_StructureDefinitionError.hxx
 Graphic3d_StructureManager.cxx
 Graphic3d_StructureManager.hxx
-Graphic3d_StructureManagerPtr.hxx
-Graphic3d_StructurePtr.hxx
 Graphic3d_TextPath.hxx
 Graphic3d_Texture1D.cxx
 Graphic3d_Texture1D.hxx
@@ -149,8 +132,6 @@ Graphic3d_TypeOfComposition.hxx
 Graphic3d_TypeOfConnection.hxx
 Graphic3d_TypeOfLightSource.hxx
 Graphic3d_TypeOfMaterial.hxx
-Graphic3d_TypeOfPolygon.hxx
-Graphic3d_TypeOfPrimitive.hxx
 Graphic3d_TypeOfPrimitiveArray.hxx
 Graphic3d_TypeOfReflection.hxx
 Graphic3d_TypeOfShaderObject.hxx

src/Graphic3d/Graphic3d_Array1OfVector.hxx

@@ -1,26 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 Graphic3d_Array1OfVector_HeaderFile
-#define Graphic3d_Array1OfVector_HeaderFile
-
-#include <Graphic3d_Vector.hxx>
-#include <NCollection_Array1.hxx>
-
-typedef NCollection_Array1<Graphic3d_Vector> Graphic3d_Array1OfVector;
-
-
-#endif

src/Graphic3d/Graphic3d_Array1OfVertex.hxx

@@ -1,26 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 Graphic3d_Array1OfVertex_HeaderFile
-#define Graphic3d_Array1OfVertex_HeaderFile
-
-#include <Graphic3d_Vertex.hxx>
-#include <NCollection_Array1.hxx>
-
-typedef NCollection_Array1<Graphic3d_Vertex> Graphic3d_Array1OfVertex;
-
-
-#endif

src/Graphic3d/Graphic3d_Array2OfVertex.hxx

@@ -1,26 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 Graphic3d_Array2OfVertex_HeaderFile
-#define Graphic3d_Array2OfVertex_HeaderFile
-
-#include <Graphic3d_Vertex.hxx>
-#include <NCollection_Array2.hxx>
-
-typedef NCollection_Array2<Graphic3d_Vertex> Graphic3d_Array2OfVertex;
-
-
-#endif

src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx

@@ -12,13 +12,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <Graphic3d_ArrayOfPrimitives.hxx>
 
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <Graphic3d_ArrayOfPrimitives.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Graphic3d_InitialisationError.hxx>
 #include <NCollection_AlignedAllocator.hxx>
 #include <OSD_Environment.hxx>
 #include <Quantity_Color.hxx>

src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx

@@ -30,7 +30,6 @@
 #include <Standard_ShortReal.hxx>
 #include <Standard_CString.hxx>
 class Standard_OutOfRange;
-class Graphic3d_InitialisationError;
 class Graphic3d_Group;
 class gp_Pnt;
 class Quantity_Color;

src/Graphic3d/Graphic3d_CBitFields16.hxx

@@ -1,49 +0,0 @@
-// Copyright (c) 1995-1999 Matra Datavision
-// Copyright (c) 1999-2014 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.
-
-/*============================================================================*/
-/*==== Titre: Graphic3d_CBitFields16.hxx				      */
-/*==== Role : The header file of primitive type "CBitFields16" from Graphic3d */
-/*====									      */
-/*==== Implementation:  This is a primitive type implemented with typedef     */
-/*============================================================================*/
-
-#ifndef _Graphic3d_CBitFields16_HeaderFile
-#define _Graphic3d_CBitFields16_HeaderFile
-
-typedef struct {
-
-	unsigned bool1	:1;
-	unsigned bool2	:1;
-	unsigned bool3	:1;
-	unsigned bool4	:1;
-
-	unsigned bool5	:1;
-	unsigned bool6	:1;
-	unsigned bool7	:1;
-	unsigned bool8	:1;
-
-	unsigned bool9	:1;
-	unsigned bool10	:1;
-	unsigned bool11	:1;
-	unsigned bool12	:1;
-
-	unsigned bool13	:1;
-	unsigned bool14	:1;
-	unsigned bool15	:1;
-	unsigned bool16	:1;
-
-} Graphic3d_CBitFields16;
-
-#endif /*Graphic3d_CBitFields16_HeaderFile*/

src/Graphic3d/Graphic3d_CBitFields20.hxx

@@ -1,54 +0,0 @@
-// Copyright (c) 1995-1999 Matra Datavision
-// Copyright (c) 1999-2014 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.
-
-/*============================================================================*/
-/*==== Titre: Graphic3d_CBitFields20.hxx				      */
-/*==== Role : The header file of primitive type "CBitFields20" from Graphic3d */
-/*====									      */
-/*==== Implementation:  This is a primitive type implemented with typedef     */
-/*============================================================================*/
-
-#ifndef _Graphic3d_CBitFields20_HeaderFile
-#define _Graphic3d_CBitFields20_HeaderFile
-
-typedef struct {
-
-	unsigned bool1	:1;
-	unsigned bool2	:1;
-	unsigned bool3	:1;
-	unsigned bool4	:1;
-
-	unsigned bool5	:1;
-	unsigned bool6	:1;
-	unsigned bool7	:1;
-	unsigned bool8	:1;
-
-	unsigned bool9	:1;
-	unsigned bool10	:1;
-	unsigned bool11	:1;
-	unsigned bool12	:1;
-
-	unsigned bool13	:1;
-	unsigned bool14	:1;
-	unsigned bool15	:1;
-	unsigned bool16	:1;
-
-	unsigned bool17	:1;
-	unsigned bool18	:1;
-	unsigned bool19	:1;
-	unsigned bool20	:1;
-
-} Graphic3d_CBitFields20;
-
-#endif /*Graphic3d_CBitFields20_HeaderFile*/

src/Graphic3d/Graphic3d_CBitFields4.hxx

@@ -1,34 +0,0 @@
-// Copyright (c) 1995-1999 Matra Datavision
-// Copyright (c) 1999-2014 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.
-
-/*===========================================================================*/
-/*==== Titre: Graphic3d_CBitFields4.hxx				             */
-/*==== Role : The header file of primitive type "CBitFields4" from Graphic3d */
-/*====									     */
-/*==== Implementation:  This is a primitive type implemented with typedef    */
-/*===========================================================================*/
-
-#ifndef _Graphic3d_CBitFields4_HeaderFile
-#define _Graphic3d_CBitFields4_HeaderFile
-
-typedef struct {
-
-	unsigned bool1	:1;
-	unsigned bool2	:1;
-	unsigned bool3	:1;
-	unsigned bool4	:1;
-
-} Graphic3d_CBitFields4;
-
-#endif /*Graphic3d_CBitFields4_HeaderFile*/

src/Graphic3d/Graphic3d_CBitFields8.hxx

@@ -1,39 +0,0 @@
-// Copyright (c) 1995-1999 Matra Datavision
-// Copyright (c) 1999-2014 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.
-
-/*===========================================================================*/
-/*==== Titre: Graphic3d_CBitFields8.hxx				             */
-/*==== Role : The header file of primitive type "CBitFields8" from Graphic3d */
-/*====									     */
-/*==== Implementation:  This is a primitive type implemented with typedef    */
-/*===========================================================================*/
-
-#ifndef _Graphic3d_CBitFields8_HeaderFile
-#define _Graphic3d_CBitFields8_HeaderFile
-
-typedef struct {
-
-	unsigned bool1	:1;
-	unsigned bool2	:1;
-	unsigned bool3	:1;
-	unsigned bool4	:1;
-
-	unsigned bool5	:1;
-	unsigned bool6	:1;
-	unsigned bool7	:1;
-	unsigned bool8	:1;
-
-} Graphic3d_CBitFields8;
-
-#endif /*Graphic3d_CBitFields8_HeaderFile*/

src/Graphic3d/Graphic3d_CStructurePtr.hxx

@@ -1,23 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 _Graphic3d_CStructurePtr_HeaderFile
-#define _Graphic3d_CStructurePtr_HeaderFile
-
-class Graphic3d_CStructure;
-typedef Graphic3d_CStructure* Graphic3d_CStructurePtr;
-
-#endif // _Graphic3d_CStructurePtr_HeaderFile

src/Graphic3d/Graphic3d_CView.hxx

@@ -35,7 +35,6 @@
 #include <Graphic3d_SequenceOfStructure.hxx>
 #include <Graphic3d_SortType.hxx>
 #include <Graphic3d_Structure.hxx>
-#include <Graphic3d_StructureManagerPtr.hxx>
 #include <Graphic3d_TextureEnv.hxx>
 #include <Graphic3d_TypeOfAnswer.hxx>
 #include <Graphic3d_TypeOfBackfacingModel.hxx>

src/Graphic3d/Graphic3d_CycleError.hxx

@@ -1,37 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 _Graphic3d_CycleError_HeaderFile
-#define _Graphic3d_CycleError_HeaderFile
-
-#include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
-#include <Standard_SStream.hxx>
-#include <Standard_DomainError.hxx>
-
-class Graphic3d_CycleError;
-DEFINE_STANDARD_HANDLE(Graphic3d_CycleError, Standard_DomainError)
-
-#if !defined No_Exception && !defined No_Graphic3d_CycleError
-  #define Graphic3d_CycleError_Raise_if(CONDITION, MESSAGE) \
-  if (CONDITION) Graphic3d_CycleError::Raise(MESSAGE);
-#else
-  #define Graphic3d_CycleError_Raise_if(CONDITION, MESSAGE)
-#endif
-
-DEFINE_STANDARD_EXCEPTION(Graphic3d_CycleError, Standard_DomainError)
-
-#endif // _Graphic3d_CycleError_HeaderFile

src/Graphic3d/Graphic3d_DataStructure.pxx

@@ -1,30 +0,0 @@
-// Copyright (c) 1995-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 DATASTRUCTURE_PXX_INCLUDED
-#define DATASTRUCTURE_PXX_INCLUDED
-
-#define Graphic3d_DataStructure_Move_Code	1
-#define Graphic3d_DataStructure_Draw_Code	2
-
-#define Graphic3d_DataStructure_Color_Code	3
-#define Graphic3d_DataStructure_Type_Code	4
-#define Graphic3d_DataStructure_Width_Code	5
-
-#define MyProjectionFlag	MyCBitFields.bool1
-#define IAmDisplayed		MyCBitFields.bool2
-#define IAmOpened		MyCBitFields.bool3
-#define MyContainsFacet		MyCBitFields.bool4
-
-#endif

src/Graphic3d/Graphic3d_Group.cxx

@@ -13,6 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <Graphic3d_Group.hxx>
 
 #include <gp_Ax2.hxx>
 #include <gp_Pnt.hxx>
@@ -23,7 +24,6 @@
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_AspectText3d.hxx>
 #include <Graphic3d_CStructure.hxx>
-#include <Graphic3d_Group.hxx>
 #include <Graphic3d_GroupDefinitionError.hxx>
 #include <Graphic3d_ShaderProgram.hxx>
 #include <Graphic3d_Structure.hxx>
@@ -41,29 +41,26 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Group,MMgt_TShared)
 
-#define MyContainsFacet myCBitFields.bool2
-
 // =======================================================================
 // function : Graphic3d_Group
 // purpose  :
 // =======================================================================
 Graphic3d_Group::Graphic3d_Group (const Handle(Graphic3d_Structure)& theStruct)
-: myIsClosed (Standard_False)
+: myStructure     (theStruct.operator->()),
+  myIsClosed      (false),
+  myContainsFacet (false)
 {
-  // A small commentary on the usage of This!
   //
-  // Graphic3d_Group is created in a structure. Graphic3d_Structure is a
+}
-  // manager of Graphic3d_Group. In the constructor of Graphic3d_Group
-  // a method Add of Graphic3d_Structure is called. It allows adding
-  // the instance of Graphic3d_Group in its manager. So there are 2 references
-  // to <me> and everything works well.
-  //
-  // This () is the instance of the class, the current group
-  //Handle(Graphic3d_Group) me  = Handle(Graphic3d_Group)::DownCast (This());
 
-  myStructure = theStruct.operator->();
+// =======================================================================
-
+// function : ~Graphic3d_Group
-  MyContainsFacet = Standard_False;
+// purpose  :
+// =======================================================================
+Graphic3d_Group::~Graphic3d_Group()
+{
+  // tell graphics driver to clear internal resources of the group
+  Clear (Standard_False);
 }
 
 // =======================================================================
@@ -79,10 +76,10 @@ void Graphic3d_Group::Clear (Standard_Boolean theUpdateStructureMgr)
 
   myBounds.Clear();
 
-  if (MyContainsFacet)
+  if (myContainsFacet)
   {
     myStructure->GroupsWithFacet (-1);
-    MyContainsFacet = Standard_False;
+    myContainsFacet = false;
   }
 
   // clear method could be used on Graphic3d_Structure destruction,
@@ -94,16 +91,6 @@ void Graphic3d_Group::Clear (Standard_Boolean theUpdateStructureMgr)
   }
 }
 
-// =======================================================================
-// function : Destroy
-// purpose  :
-// =======================================================================
-void Graphic3d_Group::Destroy()
-{
-  // tell graphics driver to clear internal resources of the group
-  Clear (Standard_False);
-}
-
 // =======================================================================
 // function : Remove
 // purpose  :
@@ -115,10 +102,10 @@ void Graphic3d_Group::Remove()
     return;
   }
 
-  if (MyContainsFacet)
+  if (myContainsFacet)
   {
     myStructure->GroupsWithFacet (-1);
-    MyContainsFacet = Standard_False;
+    myContainsFacet = false;
   }
   myStructure->Remove (this);
 
@@ -137,15 +124,6 @@ Standard_Boolean Graphic3d_Group::IsDeleted() const
       || myStructure->IsDeleted();
 }
 
-// =======================================================================
-// function : ContainsFacet
-// purpose  :
-// =======================================================================
-Standard_Boolean Graphic3d_Group::ContainsFacet() const
-{
-  return MyContainsFacet;
-}
-
 // =======================================================================
 // function : IsEmpty
 // purpose  :
@@ -178,17 +156,6 @@ void Graphic3d_Group::SetMinMaxValues (const Standard_Real theXMin, const Standa
                                                  1.0f));
 }
 
-// =======================================================================
-// function : MinMaxValues
-// purpose  :
-// =======================================================================
-void Graphic3d_Group::MinMaxValues (Standard_Real& theXMin, Standard_Real& theYMin, Standard_Real& theZMin,
-                                    Standard_Real& theXMax, Standard_Real& theYMax, Standard_Real& theZMax) const
-{
-  MinMaxCoord (theXMin, theYMin, theZMin,
-               theXMax, theYMax, theZMax);
-}
-
 // =======================================================================
 // function : Structure
 // purpose  :
@@ -199,11 +166,11 @@ Handle(Graphic3d_Structure) Graphic3d_Group::Structure() const
 }
 
 // =======================================================================
-// function : MinMaxCoord
+// function : MinMaxValues
 // purpose  :
 // =======================================================================
-void Graphic3d_Group::MinMaxCoord (Standard_Real& theXMin, Standard_Real& theYMin, Standard_Real& theZMin,
+void Graphic3d_Group::MinMaxValues (Standard_Real& theXMin, Standard_Real& theYMin, Standard_Real& theZMin,
-                                   Standard_Real& theXMax, Standard_Real& theYMax, Standard_Real& theZMax) const
+                                    Standard_Real& theXMax, Standard_Real& theYMax, Standard_Real& theZMax) const
 {
   if (IsEmpty())
   {
@@ -306,18 +273,6 @@ void Graphic3d_Group::GroupPrimitivesAspect (const Handle(Graphic3d_AspectLine3d
   }
 }
 
-// =======================================================================
-// function : PrimitivesAspect
-// purpose  :
-// =======================================================================
-void Graphic3d_Group::PrimitivesAspect (const Handle(Graphic3d_AspectLine3d)&     theAspLine,
-                                        const Handle(Graphic3d_AspectText3d)&     theAspText,
-                                        const Handle(Graphic3d_AspectMarker3d)&   theAspMarker,
-                                        const Handle(Graphic3d_AspectFillArea3d)& theAspFill) const
-{
-  GroupPrimitivesAspect (theAspLine, theAspText, theAspMarker, theAspFill);
-}
-
 // =======================================================================
 // function : AddPrimitiveArray
 // purpose  :
@@ -350,13 +305,13 @@ void Graphic3d_Group::AddPrimitiveArray (const Graphic3d_TypeOfPrimitiveArray th
     return;
   }
 
-  if (!MyContainsFacet
+  if (!myContainsFacet
     && theType != Graphic3d_TOPA_POLYLINES
     && theType != Graphic3d_TOPA_SEGMENTS
     && theType != Graphic3d_TOPA_POINTS)
   {
     myStructure->GroupsWithFacet (1);
-    MyContainsFacet = Standard_True;
+    myContainsFacet = true;
   }
 
   if (theToEvalMinMax)

src/Graphic3d/Graphic3d_Group.hxx

@@ -20,8 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Graphic3d_CBitFields4.hxx>
-#include <Graphic3d_StructurePtr.hxx>
 #include <Graphic3d_BndBox4f.hxx>
 #include <Standard_Boolean.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
@@ -46,14 +44,8 @@
 #include <TCollection_ExtendedString.hxx>
 
 class Graphic3d_Structure;
-class Graphic3d_GroupDefinitionError;
-class Standard_OutOfRange;
 class Graphic3d_ArrayOfPrimitives;
 
-
-class Graphic3d_Group;
-DEFINE_STANDARD_HANDLE(Graphic3d_Group, MMgt_TShared)
-
 //! This class allows the definition of groups
 //! of primitives inside of graphic objects (presentations).
 //! A group contains the primitives and attributes
@@ -86,10 +78,11 @@ DEFINE_STANDARD_HANDLE(Graphic3d_Group, MMgt_TShared)
 //! that is extended by the descendant class in OpenGl package.
 class Graphic3d_Group : public MMgt_TShared
 {
+  friend class Graphic3d_Structure;
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Group,MMgt_TShared)
 
 public:
 
-
   //! Supress all primitives and attributes of <me>.
   //! To clear group without update in Graphic3d_StructureManager
   //! pass Standard_False as <theUpdateStructureMgr>. This
@@ -100,11 +93,7 @@ public:
   Standard_EXPORT virtual void Clear (const Standard_Boolean theUpdateStructureMgr = Standard_True);
 
   //! Supress the group <me> in the structure.
-  Standard_EXPORT void Destroy();
+  Standard_EXPORT virtual ~Graphic3d_Group();
-~Graphic3d_Group()
-{
-  Destroy();
-}
 
   //! Supress the group <me> in the structure.
   //! Warning: No more graphic operations in <me> after this call.
@@ -112,6 +101,8 @@ public:
   //! Get the current modelling transform persistence (pan, zoom or rotate)
   Standard_EXPORT void Remove();
 
+public:
+
   //! Return line aspect.
   virtual Handle(Graphic3d_AspectLine3d) LineAspect() const = 0;
 
@@ -156,9 +147,25 @@ public:
   //! after this call in the group.
   virtual void SetPrimitivesAspect (const Handle(Graphic3d_AspectMarker3d)& theAspect) = 0;
 
-  //! Sets the coordinates of the boundary box of the
+  //! Returns TRUE if aspect is set for the group.
-  //! group <me>.
+  Standard_EXPORT Standard_Boolean IsGroupPrimitivesAspectSet (const Graphic3d_GroupAspect theAspect) const;
-  Standard_EXPORT void SetMinMaxValues (const Standard_Real XMin, const Standard_Real YMin, const Standard_Real ZMin, const Standard_Real XMax, const Standard_Real YMax, const Standard_Real ZMax);
+
+  //! Returns the context of all the primitives of the group.
+  Standard_EXPORT void GroupPrimitivesAspect (const Handle(Graphic3d_AspectLine3d)&     theAspLine,
+                                              const Handle(Graphic3d_AspectText3d)&     theAspText,
+                                              const Handle(Graphic3d_AspectMarker3d)&   theAspMarker,
+                                              const Handle(Graphic3d_AspectFillArea3d)& theAspFill) const;
+
+  //! Returns the last inserted context in the group for each kind of primitives.
+  void PrimitivesAspect (const Handle(Graphic3d_AspectLine3d)&     theAspLine,
+                         const Handle(Graphic3d_AspectText3d)&     theAspText,
+                         const Handle(Graphic3d_AspectMarker3d)&   theAspMarker,
+                         const Handle(Graphic3d_AspectFillArea3d)& theAspFill) const
+  {
+    GroupPrimitivesAspect (theAspLine, theAspText, theAspMarker, theAspFill);
+  }
+
+public:
 
   //! Creates the string <AText> at position <APoint>.
   //! The 3D point of attachment is projected. The text is
@@ -246,25 +253,16 @@ public:
   //! Creates a primitive array with single marker using AddPrimitiveArray().
   Standard_EXPORT void Marker (const Graphic3d_Vertex& thePoint, const Standard_Boolean theToEvalMinMax = Standard_True);
 
+public:
+
   //! sets the stencil test to theIsEnabled state;
   Standard_EXPORT virtual void SetStencilTestOptions (const Standard_Boolean theIsEnabled) = 0;
 
   //! sets the flipping to theIsEnabled state.
   Standard_EXPORT virtual void SetFlippingOptions (const Standard_Boolean theIsEnabled, const gp_Ax2& theRefPlane) = 0;
 
-  //! Returns TRUE if aspect is set for the group.
+  //! Returns true if the group contains Polygons, Triangles or Quadrangles.
-  Standard_EXPORT Standard_Boolean IsGroupPrimitivesAspectSet (const Graphic3d_GroupAspect theAspect) const;
+  bool ContainsFacet() const { return myContainsFacet; }
-
-  //! Returns the context of all the primitives of the group.
-  Standard_EXPORT void GroupPrimitivesAspect (const Handle(Graphic3d_AspectLine3d)& CTXL, const Handle(Graphic3d_AspectText3d)& CTXT, const Handle(Graphic3d_AspectMarker3d)& CTXM, const Handle(Graphic3d_AspectFillArea3d)& CTXF) const;
-
-  //! Returns the last inserted context in the group <me>
-  //! foreach kind of primitives.
-  Standard_EXPORT void PrimitivesAspect (const Handle(Graphic3d_AspectLine3d)& CTXL, const Handle(Graphic3d_AspectText3d)& CTXT, const Handle(Graphic3d_AspectMarker3d)& CTXM, const Handle(Graphic3d_AspectFillArea3d)& CTXF) const;
-
-  //! Returns Standard_True if the group <me> contains
-  //! Polygons, Triangles or Quadrangles.
-  Standard_EXPORT Standard_Boolean ContainsFacet() const;
 
   //! Returns Standard_True if the group <me> is deleted.
   //! <me> is deleted after the call Remove (me) or the
@@ -274,9 +272,13 @@ public:
   //! Returns Standard_True if the group <me> is empty.
   Standard_EXPORT Standard_Boolean IsEmpty() const;
 
-  //! Returns the coordinates of the boundary box of the
+  //! Returns the coordinates of the boundary box of the group.
-  //! group <me>.
+  Standard_EXPORT void MinMaxValues (Standard_Real& theXMin, Standard_Real& theYMin, Standard_Real& theZMin,
-  Standard_EXPORT void MinMaxValues (Standard_Real& XMin, Standard_Real& YMin, Standard_Real& ZMin, Standard_Real& XMax, Standard_Real& YMax, Standard_Real& ZMax) const;
+                                     Standard_Real& theXMax, Standard_Real& theYMax, Standard_Real& theZMax) const;
+
+  //! Sets the coordinates of the boundary box of the group.
+  Standard_EXPORT void SetMinMaxValues (const Standard_Real theXMin, const Standard_Real theYMin, const Standard_Real theZMin,
+                                        const Standard_Real theXMax, const Standard_Real theYMax, const Standard_Real theZMax);
 
   //! Returns boundary box of the group <me> without transformation applied,
   const Graphic3d_BndBox4f& BoundingBox() const { return myBounds; }
@@ -293,40 +295,24 @@ public:
   //! Return true if primitive arrays within this graphic group form closed volume (do no contain open shells).
   bool IsClosed() const { return myIsClosed; }
 
-friend class Graphic3d_Structure;
-
-
-  DEFINE_STANDARD_RTTIEXT(Graphic3d_Group,MMgt_TShared)
-
 protected:
 
-
   //! Creates a group in the structure <AStructure>.
   Standard_EXPORT Graphic3d_Group(const Handle(Graphic3d_Structure)& theStructure);
 
-  Graphic3d_CBitFields4 myCBitFields;
-  Graphic3d_StructurePtr myStructure;
-  Graphic3d_BndBox4f myBounds;
-  bool myIsClosed;
-
-protected:
-
-
-  //! Returns the extreme coordinates found in the group.
-  Standard_EXPORT void MinMaxCoord (Standard_Real& XMin, Standard_Real& YMin, Standard_Real& ZMin, Standard_Real& XMax, Standard_Real& YMax, Standard_Real& ZMax) const;
-
   //! Calls the Update method of the StructureManager which
   //! contains the associated Structure of the Group <me>.
   Standard_EXPORT void Update() const;
 
+protected:
 
+  Graphic3d_Structure* myStructure;     //!< pointer to the parent structure
+  Graphic3d_BndBox4f   myBounds;        //!< bounding box
+  bool                 myIsClosed;      //!< flag indicating closed volume
+  bool                 myContainsFacet; //!< flag indicating that this group contains face primitives
 
 };
 
-
+DEFINE_STANDARD_HANDLE(Graphic3d_Group, MMgt_TShared)
-
-
-
-
 
 #endif // _Graphic3d_Group_HeaderFile

src/Graphic3d/Graphic3d_HSequenceOfStructure.hxx

@@ -1,27 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 Graphic3d_HSequenceOfStructure_HeaderFile
-#define Graphic3d_HSequenceOfStructure_HeaderFile
-
-#include <Graphic3d_Structure.hxx>
-#include <Graphic3d_SequenceOfStructure.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Graphic3d_HSequenceOfStructure, Graphic3d_SequenceOfStructure)
-
-
-#endif

src/Graphic3d/Graphic3d_InitialisationError.hxx

@@ -1,37 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 _Graphic3d_InitialisationError_HeaderFile
-#define _Graphic3d_InitialisationError_HeaderFile
-
-#include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
-#include <Standard_SStream.hxx>
-#include <Standard_OutOfRange.hxx>
-
-class Graphic3d_InitialisationError;
-DEFINE_STANDARD_HANDLE(Graphic3d_InitialisationError, Standard_OutOfRange)
-
-#if !defined No_Exception && !defined No_Graphic3d_InitialisationError
-  #define Graphic3d_InitialisationError_Raise_if(CONDITION, MESSAGE) \
-  if (CONDITION) Graphic3d_InitialisationError::Raise(MESSAGE);
-#else
-  #define Graphic3d_InitialisationError_Raise_if(CONDITION, MESSAGE)
-#endif
-
-DEFINE_STANDARD_EXCEPTION(Graphic3d_InitialisationError, Standard_OutOfRange)
-
-#endif // _Graphic3d_InitialisationError_HeaderFile

src/Graphic3d/Graphic3d_ListIteratorOfListOfShortReal.hxx

@@ -1,20 +0,0 @@
-// Copyright (c) 2015 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 Graphic3d_ListIteratorOfListOfShortReal_HeaderFile
-#define Graphic3d_ListIteratorOfListOfShortReal_HeaderFile
-
-#include <Graphic3d_ListOfShortReal.hxx>
-
-#endif

src/Graphic3d/Graphic3d_ListOfShortReal.hxx

@@ -1,27 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 Graphic3d_ListOfShortReal_HeaderFile
-#define Graphic3d_ListOfShortReal_HeaderFile
-
-#include <Standard_ShortReal.hxx>
-#include <NCollection_List.hxx>
-
-typedef NCollection_List<Standard_ShortReal> Graphic3d_ListOfShortReal;
-typedef NCollection_List<Standard_ShortReal>::Iterator Graphic3d_ListIteratorOfListOfShortReal;
-
-
-#endif

src/Graphic3d/Graphic3d_NListOfHAsciiString.hxx

@@ -1,24 +0,0 @@
-// Created on: 2009-01-20
-// Created by: Alexander A. BORODIN
-// Copyright (c) 2009-2014 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 _Graphic3d_NListOfHAsciiString_HeaderFile
-#define _Graphic3d_NListOfHAsciiString_HeaderFile
-
-#include <NCollection_List.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-typedef NCollection_List<Handle(TCollection_HAsciiString)> Graphic3d_NListOfHAsciiString;
-
-#endif

src/Graphic3d/Graphic3d_Structure.hxx

@@ -24,7 +24,6 @@
 #include <Graphic3d_IndexedMapOfAddress.hxx>
 #include <Quantity_Color.hxx>
 #include <Aspect_TypeOfHighlightMethod.hxx>
-#include <Graphic3d_StructureManagerPtr.hxx>
 #include <Standard_Address.hxx>
 #include <Graphic3d_TypeOfStructure.hxx>
 #include <MMgt_TShared.hxx>
@@ -449,7 +448,6 @@ friend class Graphic3d_Group;
 
 protected:
 
-  
   //! Transforms boundaries with <theTrsf> transformation.
   Standard_EXPORT static void TransformBoundaries (const TColStd_Array2OfReal& theTrsf, Standard_Real& theXMin, Standard_Real& theYMin, Standard_Real& theZMin, Standard_Real& theXMax, Standard_Real& theYMax, Standard_Real& theZMax);
   
@@ -465,14 +463,8 @@ protected:
   //! Removes the given ancestor structure.
   Standard_EXPORT Standard_Boolean RemoveAncestor (const Standard_Address theAncestor);
 
-  Graphic3d_StructureManagerPtr myStructureManager;
-  Graphic3d_StructureManagerPtr myFirstStructureManager;
-  Graphic3d_TypeOfStructure myComputeVisual;
-
-
 private:
 
-  
   //! Suppress in the structure <me>, the group theGroup.
   //! It will be erased at the next screen update.
   Standard_EXPORT void Remove (const Handle(Graphic3d_Group)& theGroup);
@@ -501,6 +493,10 @@ private:
 
 protected:
 
+  Graphic3d_StructureManager* myStructureManager;
+  Graphic3d_StructureManager* myFirstStructureManager;
+  Graphic3d_TypeOfStructure   myComputeVisual;
+
   Handle(Graphic3d_CStructure) myCStructure;
   Graphic3d_IndexedMapOfAddress myAncestors;
   Graphic3d_IndexedMapOfAddress myDescendants;

src/Graphic3d/Graphic3d_StructureManager.cxx

@@ -13,70 +13,38 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-//-Version      
+#include <Graphic3d_StructureManager.hxx>
-//-Design       Declaration of variables specific to managers
-//-Warning      Manager manages a set of structures
-//-References   
-//-Language     C++ 2.0
-//-Declarations
-// for the class
 
-#include <Graphic3d_AspectFillArea3d.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
-#include <Graphic3d_AspectText3d.hxx>
 #include <Graphic3d_DataStructureManager.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
-#include <Graphic3d_InitialisationError.hxx>
 #include <Graphic3d_Structure.hxx>
-#include <Graphic3d_StructureManager.hxx>
-#include <Standard_Transient.hxx>
-#include <Standard_Type.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_StructureManager,MMgt_TShared)
 
 #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
 #include <Graphic3d_CView.hxx>
 
+// ========================================================================
+// function : Graphic3d_StructureManager
+// purpose  :
+// ========================================================================
 Graphic3d_StructureManager::Graphic3d_StructureManager (const Handle(Graphic3d_GraphicDriver)& theDriver)
-: myViewGenId (0, 31)
+: myViewGenId (0, 31),
+  myUpdateMode (Aspect_TOU_WAIT),
+  myGraphicDriver (theDriver)
 {
-  myAspectLine3d          = new Graphic3d_AspectLine3d ();
+  //
-  myAspectText3d          = new Graphic3d_AspectText3d ();
-  myAspectMarker3d        = new Graphic3d_AspectMarker3d ();
-  myAspectFillArea3d      = new Graphic3d_AspectFillArea3d ();
-
-  myUpdateMode            = Aspect_TOU_WAIT;
-  myGraphicDriver         = theDriver;
-
 }
 
-//-Destructors
+// ========================================================================
-
+// function : ~Graphic3d_StructureManager
-Graphic3d_StructureManager::~Graphic3d_StructureManager ()
+// purpose  :
+// ========================================================================
+Graphic3d_StructureManager::~Graphic3d_StructureManager()
 {
-  myDisplayedStructure.Clear ();
+  myDisplayedStructure.Clear();
-  myHighlightedStructure.Clear ();
+  myHighlightedStructure.Clear();
   myDefinedViews.Clear();
-
-}
-
-// ========================================================================
-// function : SetUpdateMode
-// purpose  :
-// ========================================================================
-void Graphic3d_StructureManager::SetUpdateMode (const Aspect_TypeOfUpdate theType)
-{
-  myUpdateMode = theType;
-}
-
-// ========================================================================
-// function : UpdateMode
-// purpose  :
-// ========================================================================
-Aspect_TypeOfUpdate Graphic3d_StructureManager::UpdateMode() const
-{
-  return myUpdateMode;
 }
 
 // ========================================================================
@@ -118,67 +86,6 @@ void Graphic3d_StructureManager::Erase()
   }
 }
 
-
-
-
-
-void Graphic3d_StructureManager::SetPrimitivesAspect (const Handle(Graphic3d_AspectLine3d)& CTX) {
-
-        myAspectLine3d          = CTX;
-
-}
-
-void Graphic3d_StructureManager::SetPrimitivesAspect (const Handle(Graphic3d_AspectFillArea3d)& CTX) {
-
-        myAspectFillArea3d      = CTX;
-
-}
-
-void Graphic3d_StructureManager::SetPrimitivesAspect (const Handle(Graphic3d_AspectText3d)& CTX) {
-
-        myAspectText3d          = CTX;
-
-}
-
-void Graphic3d_StructureManager::SetPrimitivesAspect (const Handle(Graphic3d_AspectMarker3d)& CTX) {
-
-        myAspectMarker3d        = CTX;
-
-}
-
-void Graphic3d_StructureManager::PrimitivesAspect (Handle(Graphic3d_AspectLine3d)& CTXL, Handle(Graphic3d_AspectText3d)& CTXT, Handle(Graphic3d_AspectMarker3d)& CTXM, Handle(Graphic3d_AspectFillArea3d)& CTXF) const {
-
-        CTXL    = myAspectLine3d;
-        CTXT    = myAspectText3d;
-        CTXM    = myAspectMarker3d;
-        CTXF    = myAspectFillArea3d;
-
-}
-
-Handle(Graphic3d_AspectLine3d) Graphic3d_StructureManager::Line3dAspect () const {
-
-        return (myAspectLine3d);
-
-}
-
-Handle(Graphic3d_AspectText3d) Graphic3d_StructureManager::Text3dAspect () const {
-
-        return (myAspectText3d);
-
-}
-
-Handle(Graphic3d_AspectMarker3d) Graphic3d_StructureManager::Marker3dAspect () const {
-
-        return (myAspectMarker3d);
-
-}
-
-Handle(Graphic3d_AspectFillArea3d) Graphic3d_StructureManager::FillArea3dAspect () const {
-
-        return (myAspectFillArea3d);
-
-}
-
 void Graphic3d_StructureManager::DisplayedStructures (Graphic3d_MapOfStructure& SG) const {
 
   SG.Assign(myDisplayedStructure);

src/Graphic3d/Graphic3d_StructureManager.hxx

@@ -33,16 +33,10 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array2OfReal.hxx>
-#include <TColStd_SequenceOfInteger.hxx>
 
 typedef NCollection_IndexedMap<Graphic3d_CView*> Graphic3d_IndexedMapOfView;
 
-class Graphic3d_AspectLine3d;
-class Graphic3d_AspectText3d;
-class Graphic3d_AspectMarker3d;
-class Graphic3d_AspectFillArea3d;
 class Graphic3d_GraphicDriver;
-class Graphic3d_InitialisationError;
 class Graphic3d_Structure;
 class Graphic3d_DataStructureManager;
 class Standard_Transient;
@@ -72,22 +66,6 @@ public:
   //! Deletes the manager <me>.
   Standard_EXPORT ~Graphic3d_StructureManager();
 
-  //! Modifies the default attributes for lines
-  //! in the visualiser.
-  Standard_EXPORT void SetPrimitivesAspect (const Handle(Graphic3d_AspectLine3d)& CTX);
-
-  //! Modifies the default attributes for faces
-  //! in the visualiser.
-  Standard_EXPORT void SetPrimitivesAspect (const Handle(Graphic3d_AspectFillArea3d)& CTX);
-
-  //! Modifies the default attributes for text
-  //! in the visualiser.
-  Standard_EXPORT void SetPrimitivesAspect (const Handle(Graphic3d_AspectText3d)& CTX);
-
-  //! Modifies the default attributes for markers
-  //! in the visualiser.
-  Standard_EXPORT void SetPrimitivesAspect (const Handle(Graphic3d_AspectMarker3d)& CTX);
-
   //! Modifies the screen update mode.
   //!
   //! TOU_ASAP - as soon as possible
@@ -101,13 +79,13 @@ public:
   //! Use one of the following functions to update the entire display:
   //! - Redraw all structures in all views: Graphic3d_StructureManager::Redraw()
   //! - Redraw all structures in one view:  Graphic3d_View::Redraw()
-  Standard_EXPORT void SetUpdateMode (const Aspect_TypeOfUpdate theType);
+  void SetUpdateMode (const Aspect_TypeOfUpdate theType) { myUpdateMode = theType; }
 
   //! Returns the screen update mode.
   //!
   //! TOU_ASAP	as soon as possible
   //! TOU_WAIT	on demand (Update)
-  Standard_EXPORT Aspect_TypeOfUpdate UpdateMode() const;
+  Aspect_TypeOfUpdate UpdateMode() const { return myUpdateMode; }
 
   //! Updates screen in function of modifications of the structures
   //! and invalidates bounding box of specified ZLayerId.
@@ -128,21 +106,6 @@ public:
   //! in a visualiser <me>.
   Standard_EXPORT void HighlightedStructures (Graphic3d_MapOfStructure& SG) const;
 
-  //! Returns the values of the current default attributes.
-  Standard_EXPORT Handle(Graphic3d_AspectFillArea3d) FillArea3dAspect() const;
-
-  //! Returns the values of the current default attributes.
-  Standard_EXPORT Handle(Graphic3d_AspectLine3d) Line3dAspect() const;
-
-  //! Returns the values of the current default attributes.
-  Standard_EXPORT Handle(Graphic3d_AspectMarker3d) Marker3dAspect() const;
-
-  //! Returns the values of the current default attributes.
-  Standard_EXPORT void PrimitivesAspect (Handle(Graphic3d_AspectLine3d)& CTXL, Handle(Graphic3d_AspectText3d)& CTXT, Handle(Graphic3d_AspectMarker3d)& CTXM, Handle(Graphic3d_AspectFillArea3d)& CTXF) const;
-
-  //! Returns the values of the current default attributes.
-  Standard_EXPORT Handle(Graphic3d_AspectText3d) Text3dAspect() const;
-
   //! Forces a new construction of the structure.
   //! if <theStructure> is displayed and TOS_COMPUTED.
   Standard_EXPORT virtual void ReCompute (const Handle(Graphic3d_Structure)& theStructure);
@@ -227,13 +190,10 @@ protected:
   //! Returns the structure displayed in visualizer <me>.
   Standard_EXPORT Standard_Integer NumberOfDisplayedStructures() const;
 
-  Standard_Integer myId;
+protected:
+
   Aspect_GenId myViewGenId;
   Aspect_TypeOfUpdate myUpdateMode;
-  Handle(Graphic3d_AspectLine3d) myAspectLine3d;
-  Handle(Graphic3d_AspectText3d) myAspectText3d;
-  Handle(Graphic3d_AspectMarker3d) myAspectMarker3d;
-  Handle(Graphic3d_AspectFillArea3d) myAspectFillArea3d;
   Graphic3d_MapOfStructure myDisplayedStructure;
   Graphic3d_MapOfStructure myHighlightedStructure;
   Graphic3d_MapOfObject myRegisteredObjects;

src/Graphic3d/Graphic3d_StructureManagerPtr.hxx

@@ -1,23 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 _Graphic3d_StructureManagerPtr_HeaderFile
-#define _Graphic3d_StructureManagerPtr_HeaderFile
-
-class Graphic3d_StructureManager;
-typedef Graphic3d_StructureManager* Graphic3d_StructureManagerPtr;
-
-#endif // _Graphic3d_StructureManagerPtr_HeaderFile

src/Graphic3d/Graphic3d_StructurePtr.hxx

@@ -1,23 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 _Graphic3d_StructurePtr_HeaderFile
-#define _Graphic3d_StructurePtr_HeaderFile
-
-class Graphic3d_Structure;
-typedef Graphic3d_Structure* Graphic3d_StructurePtr;
-
-#endif // _Graphic3d_StructurePtr_HeaderFile

src/Graphic3d/Graphic3d_TypeOfPolygon.hxx

@@ -1,29 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 _Graphic3d_TypeOfPolygon_HeaderFile
-#define _Graphic3d_TypeOfPolygon_HeaderFile
-
-//! The type of polygon in a group in a structure.
-enum Graphic3d_TypeOfPolygon
-{
-Graphic3d_TOP_UNKNOWN,
-Graphic3d_TOP_COMPLEX,
-Graphic3d_TOP_CONCAVE,
-Graphic3d_TOP_CONVEX
-};
-
-#endif // _Graphic3d_TypeOfPolygon_HeaderFile

src/Graphic3d/Graphic3d_TypeOfPrimitive.hxx

@@ -1,33 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 _Graphic3d_TypeOfPrimitive_HeaderFile
-#define _Graphic3d_TypeOfPrimitive_HeaderFile
-
-//! The type of primitive in a group in a structure.
-enum Graphic3d_TypeOfPrimitive
-{
-Graphic3d_TOP_UNDEFINED,
-Graphic3d_TOP_POLYLINE,
-Graphic3d_TOP_POLYGON,
-Graphic3d_TOP_TRIANGLEMESH,
-Graphic3d_TOP_QUADRANGLEMESH,
-Graphic3d_TOP_TEXT,
-Graphic3d_TOP_MARKER,
-Graphic3d_TOP_PARRAY
-};
-
-#endif // _Graphic3d_TypeOfPrimitive_HeaderFile

src/OpenGl/OpenGl_AVIWriter.hxx

@@ -17,9 +17,10 @@
 #define __OPENGL_AVIWRITER_H
 
 #ifdef _MSC_VER
-#define THIS void 
 
-#include <InterfaceGraphic.hxx>
+#define THIS void
+#include <windows.h>
+
 #include <stdlib.h>
 #include <vfw.h>
 #include <TCollection_AsciiString.hxx>

src/OpenGl/OpenGl_FrameBuffer.hxx

@@ -19,9 +19,6 @@
 #include <OpenGl_Resource.hxx>
 #include <OpenGl_Texture.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <InterfaceGraphic.hxx>
-
 class OpenGl_FrameBuffer;
 DEFINE_STANDARD_HANDLE(OpenGl_FrameBuffer, OpenGl_Resource)
 

src/OpenGl/OpenGl_GraphicDriver.hxx

@@ -37,8 +37,6 @@
 #include <Graphic3d_TypeOfComposition.hxx>
 #include <Graphic3d_ExportFormat.hxx>
 #include <Graphic3d_SortType.hxx>
-#include <Graphic3d_Array1OfVertex.hxx>
-#include <Graphic3d_Array2OfVertex.hxx>
 #include <Graphic3d_BufferType.hxx>
 #include <NCollection_DataMap.hxx>
 #include <OpenGl_Context.hxx>

src/OpenGl/OpenGl_LayerList.cxx

@@ -19,7 +19,6 @@
 #include <OpenGl_Structure.hxx>
 #include <OpenGl_Workspace.hxx>
 
-#include <InterfaceGraphic.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
 
 //=======================================================================

src/OpenGl/OpenGl_Window.cxx

@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 #include <OpenGl_GlCore12.hxx>
-#include <InterfaceGraphic.hxx>
 
 #include <OpenGl_Context.hxx>
 #include <OpenGl_GraphicDriver.hxx>

src/OpenGl/OpenGl_Window_1.mm

@@ -32,8 +32,6 @@
 
 #endif
 
-#include <InterfaceGraphic.hxx>
-
 #include <OpenGl_Window.hxx>
 #include <OpenGl_FrameBuffer.hxx>
 

src/OpenGl/OpenGl_Workspace.cxx

@@ -15,8 +15,6 @@
 
 #include <OpenGl_Workspace.hxx>
 
-#include <InterfaceGraphic.hxx>
-
 #include <OpenGl_ArbFBO.hxx>
 #include <OpenGl_AspectLine.hxx>
 #include <OpenGl_AspectFace.hxx>

src/V3d/V3d_CircularGrid.cxx

@@ -11,19 +11,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-/***********************************************************************
+#include <V3d_CircularGrid.hxx>
-     FONCTION :
-     ----------
-        Classe V3d_CircularGrid :
-     VERSION HISTORY  :
-     --------------------------------
-************************************************************************/
-/*----------------------------------------------------------------------*/
-/*
- * Includes
- */
 
-#include <Graphic3d_Array1OfVertex.hxx>
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_ArrayOfSegments.hxx>
@@ -36,7 +25,6 @@
 #include <Standard_Type.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TColStd_Array2OfReal.hxx>
-#include <V3d_CircularGrid.hxx>
 #include <V3d_Viewer.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(V3d_CircularGrid,Aspect_CircularGrid)

src/WNT/WNT_WClass.cxx

@@ -14,8 +14,6 @@
 
 #include <windows.h>
 
-
-#include <InterfaceGraphic.hxx>
 #include <Standard_PCharacter.hxx>
 #include <Standard_Type.hxx>
 #include <WNT_ClassDefinitionError.hxx>