mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +03:00
0032230: Coding Rules - remove class headers Graphic3d_HighlightStyle.hxx deprecated since OCCT 7.2.0
Removed unused Graphic3d_HighlightStyle, Graphic3d_CTexture, Graphic3d_MapOfZLayerSettings, Graphic3d_TypeOfComposition, Graphic3d_TypeOfComposition, V3d_Parameter, V3d_ViewPointer, SelectMgr_SequenceOfFilter. Added missing deprecation statements to SelectBasics_SensitiveEntity, SelectMgr_EntityOwner and PrsMgr_Presentation3d.
This commit is contained in:
kgv
bugmaster
parent
ef188756a0
commit
bbd9292784
@ -48,7 +48,6 @@ Graphic3d_ClipPlane.cxx
|
||||
Graphic3d_ClipPlane.hxx
|
||||
Graphic3d_CStructure.cxx
|
||||
Graphic3d_CStructure.hxx
|
||||
Graphic3d_CTexture.hxx
|
||||
Graphic3d_CubeMap.cxx
|
||||
Graphic3d_CubeMap.hxx
|
||||
Graphic3d_CubeMapOrder.cxx
|
||||
@ -82,7 +81,6 @@ Graphic3d_GroupAspect.hxx
|
||||
Graphic3d_GroupDefinitionError.hxx
|
||||
Graphic3d_HatchStyle.hxx
|
||||
Graphic3d_HatchStyle.cxx
|
||||
Graphic3d_HighlightStyle.hxx
|
||||
Graphic3d_PresentationAttributes.hxx
|
||||
Graphic3d_PresentationAttributes.cxx
|
||||
Graphic3d_HorizontalTextAlignment.hxx
|
||||
@ -95,7 +93,6 @@ Graphic3d_MapOfAspectsToAspects.hxx
|
||||
Graphic3d_MapIteratorOfMapOfStructure.hxx
|
||||
Graphic3d_MapOfObject.hxx
|
||||
Graphic3d_MapOfStructure.hxx
|
||||
Graphic3d_MapOfZLayerSettings.hxx
|
||||
Graphic3d_MarkerImage.cxx
|
||||
Graphic3d_MarkerImage.hxx
|
||||
Graphic3d_MarkerImage.pxx
|
||||
@ -174,7 +171,6 @@ Graphic3d_TextureSet.cxx
|
||||
Graphic3d_TextureSet.hxx
|
||||
Graphic3d_TextureSetBits.hxx
|
||||
Graphic3d_ToneMappingMethod.hxx
|
||||
Graphic3d_TransformError.hxx
|
||||
Graphic3d_TransformPers.hxx
|
||||
Graphic3d_TransformPers.cxx
|
||||
Graphic3d_TransformUtils.hxx
|
||||
@ -182,7 +178,6 @@ Graphic3d_TransModeFlags.hxx
|
||||
Graphic3d_TypeOfAnswer.hxx
|
||||
Graphic3d_TypeOfBackfacingModel.hxx
|
||||
Graphic3d_TypeOfBackground.hxx
|
||||
Graphic3d_TypeOfComposition.hxx
|
||||
Graphic3d_TypeOfConnection.hxx
|
||||
Graphic3d_TypeOfLightSource.hxx
|
||||
Graphic3d_TypeOfLimit.hxx
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
#include <Graphic3d_PresentationAttributes.hxx>
|
||||
#include <Graphic3d_SequenceOfGroup.hxx>
|
||||
#include <Graphic3d_SequenceOfHClipPlane.hxx>
|
||||
#include <Graphic3d_TypeOfComposition.hxx>
|
||||
#include <Graphic3d_ViewAffinity.hxx>
|
||||
#include <Graphic3d_TransformPers.hxx>
|
||||
#include <Graphic3d_Vec3.hxx>
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
// 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_CTexture_HeaderFile
|
||||
#define _Graphic3d_CTexture_HeaderFile
|
||||
|
||||
#include <Graphic3d_TextureMap.hxx>
|
||||
|
||||
class Graphic3d_CTexture
|
||||
{
|
||||
|
||||
public:
|
||||
|
||||
Graphic3d_CTexture()
|
||||
: doTextureMap (0)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
public:
|
||||
|
||||
Handle(Graphic3d_TextureMap) TextureMap; //!< handle to texture
|
||||
int doTextureMap; //!< flag indicates to use texture or not
|
||||
|
||||
};
|
||||
|
||||
#endif // Graphic3d_CTexture_HeaderFile
|
||||
@ -17,47 +17,21 @@
|
||||
#ifndef _Graphic3d_GraphicDriver_HeaderFile
|
||||
#define _Graphic3d_GraphicDriver_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
|
||||
#include <Standard_Integer.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Standard_Transient.hxx>
|
||||
#include <Graphic3d_CView.hxx>
|
||||
#include <Graphic3d_CStructure.hxx>
|
||||
#include <Aspect_GradientFillMethod.hxx>
|
||||
#include <Standard_CString.hxx>
|
||||
#include <Aspect_FillMethod.hxx>
|
||||
#include <Standard_Size.hxx>
|
||||
#include <Quantity_NameOfColor.hxx>
|
||||
#include <Standard_Real.hxx>
|
||||
#include <Aspect_TypeOfTriedronPosition.hxx>
|
||||
#include <Graphic3d_GraduatedTrihedron.hxx>
|
||||
#include <Graphic3d_Vec3.hxx>
|
||||
#include <Standard_ShortReal.hxx>
|
||||
#include <Standard_Address.hxx>
|
||||
#include <Image_PixMap.hxx>
|
||||
#include <Graphic3d_BufferType.hxx>
|
||||
#include <Aspect_GenId.hxx>
|
||||
#include <Aspect_Handle.hxx>
|
||||
#include <Graphic3d_Vec3.hxx>
|
||||
#include <Graphic3d_CStructure.hxx>
|
||||
#include <Graphic3d_ZLayerId.hxx>
|
||||
#include <Graphic3d_ZLayerSettings.hxx>
|
||||
#include <Graphic3d_MapOfZLayerSettings.hxx>
|
||||
#include <Graphic3d_CLight.hxx>
|
||||
#include <Graphic3d_TypeOfLimit.hxx>
|
||||
#include <TColStd_Array2OfReal.hxx>
|
||||
#include <TColStd_MapOfInteger.hxx>
|
||||
#include <Standard_CString.hxx>
|
||||
#include <Standard_Size.hxx>
|
||||
#include <TColStd_SequenceOfInteger.hxx>
|
||||
|
||||
class Aspect_DisplayConnection;
|
||||
class Aspect_Window;
|
||||
class Graphic3d_CView;
|
||||
class Graphic3d_GraphicDriver;
|
||||
class Graphic3d_Layer;
|
||||
class Graphic3d_TransformError;
|
||||
class Graphic3d_Structure;
|
||||
class Graphic3d_StructureManager;
|
||||
class Graphic3d_ViewManager;
|
||||
class Quantity_Color;
|
||||
class TCollection_AsciiString;
|
||||
|
||||
DEFINE_STANDARD_HANDLE(Graphic3d_GraphicDriver, Standard_Transient)
|
||||
|
||||
@ -125,9 +125,6 @@ public:
|
||||
//! Adds an array of primitives for display
|
||||
Standard_EXPORT void AddPrimitiveArray (const Handle(Graphic3d_ArrayOfPrimitives)& thePrim, const Standard_Boolean theToEvalMinMax = Standard_True);
|
||||
|
||||
//! 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;
|
||||
@ -173,6 +170,9 @@ public:
|
||||
//! @name obsolete methods
|
||||
public:
|
||||
|
||||
Standard_DEPRECATED("Deprecated method Marker(), pass Graphic3d_ArrayOfPoints to AddPrimitiveArray() instead")
|
||||
Standard_EXPORT void Marker (const Graphic3d_Vertex& thePoint, const Standard_Boolean theToEvalMinMax = Standard_True);
|
||||
|
||||
//! Creates the string <AText> at position <APoint>.
|
||||
//! The 3D point of attachment is projected. The text is
|
||||
//! written in the plane of projection.
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
// Created on: 2016-08-24
|
||||
// Created by: Varvara POSKONINA
|
||||
// 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 _Graphic3d_HighlightStyle_HeaderFile
|
||||
#define _Graphic3d_HighlightStyle_HeaderFile
|
||||
|
||||
// header file for deprecated type Graphic3d_HighlightStyle
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
|
||||
#endif // _Graphic3d_HighlightStyle_HeaderFile
|
||||
@ -1,24 +0,0 @@
|
||||
// Copyright (c) 2019 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 _Vulkan_MapOfZLayerSettings_HeaderFile
|
||||
#define _Vulkan_MapOfZLayerSettings_HeaderFile
|
||||
|
||||
#include <Standard_TypeDef.hxx>
|
||||
#include <NCollection_Map.hxx>
|
||||
#include <Graphic3d_ZLayerId.hxx>
|
||||
#include <Graphic3d_ZLayerSettings.hxx>
|
||||
|
||||
typedef NCollection_DataMap<Graphic3d_ZLayerId, Graphic3d_ZLayerSettings> Graphic3d_MapOfZLayerSettings;
|
||||
|
||||
#endif // _Vulkan_MapOfZLayerSettings_HeaderFile
|
||||
@ -25,7 +25,6 @@
|
||||
#include <Graphic3d_PriorityDefinitionError.hxx>
|
||||
#include <Graphic3d_StructureDefinitionError.hxx>
|
||||
#include <Graphic3d_StructureManager.hxx>
|
||||
#include <Graphic3d_TransformError.hxx>
|
||||
#include <Quantity_Color.hxx>
|
||||
|
||||
#include "Graphic3d_Structure.pxx"
|
||||
|
||||
@ -23,12 +23,10 @@
|
||||
#include <Graphic3d_MapOfStructure.hxx>
|
||||
#include <Graphic3d_SequenceOfGroup.hxx>
|
||||
#include <Graphic3d_SequenceOfHClipPlane.hxx>
|
||||
#include <Graphic3d_TypeOfComposition.hxx>
|
||||
#include <Graphic3d_TypeOfConnection.hxx>
|
||||
#include <Graphic3d_TypeOfStructure.hxx>
|
||||
#include <Graphic3d_TransformPers.hxx>
|
||||
#include <Graphic3d_TransModeFlags.hxx>
|
||||
#include <Graphic3d_Vertex.hxx>
|
||||
#include <Graphic3d_ZLayerId.hxx>
|
||||
#include <NCollection_IndexedMap.hxx>
|
||||
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
|
||||
#include <gp_Ax2.hxx>
|
||||
|
||||
#include <Graphic3d_Vertex.hxx>
|
||||
#include <Font_TextFormatter.hxx>
|
||||
#include <Graphic3d_HorizontalTextAlignment.hxx>
|
||||
#include <Graphic3d_VerticalTextAlignment.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_TransformError_HeaderFile
|
||||
#define _Graphic3d_TransformError_HeaderFile
|
||||
|
||||
#include <Standard_Type.hxx>
|
||||
#include <Standard_DefineException.hxx>
|
||||
#include <Standard_SStream.hxx>
|
||||
#include <Standard_OutOfRange.hxx>
|
||||
|
||||
class Graphic3d_TransformError;
|
||||
DEFINE_STANDARD_HANDLE(Graphic3d_TransformError, Standard_OutOfRange)
|
||||
|
||||
#if !defined No_Exception && !defined No_Graphic3d_TransformError
|
||||
#define Graphic3d_TransformError_Raise_if(CONDITION, MESSAGE) \
|
||||
if (CONDITION) throw Graphic3d_TransformError(MESSAGE);
|
||||
#else
|
||||
#define Graphic3d_TransformError_Raise_if(CONDITION, MESSAGE)
|
||||
#endif
|
||||
|
||||
DEFINE_STANDARD_EXCEPTION(Graphic3d_TransformError, Standard_OutOfRange)
|
||||
|
||||
#endif // _Graphic3d_TransformError_HeaderFile
|
||||
@ -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_TypeOfComposition_HeaderFile
|
||||
#define _Graphic3d_TypeOfComposition_HeaderFile
|
||||
|
||||
//! To manage the transformation matrices of structures.
|
||||
enum Graphic3d_TypeOfComposition
|
||||
{
|
||||
Graphic3d_TOC_REPLACE,
|
||||
Graphic3d_TOC_POSTCONCATENATE
|
||||
};
|
||||
|
||||
#endif // _Graphic3d_TypeOfComposition_HeaderFile
|
||||
@ -20,7 +20,6 @@
|
||||
#include <Graphic3d_AspectText3d.hxx>
|
||||
#include <Graphic3d_Text.hxx>
|
||||
#include <Graphic3d_Group.hxx>
|
||||
#include <Graphic3d_Vertex.hxx>
|
||||
#include <MeshVS_Buffer.hxx>
|
||||
#include <MeshVS_DataSource.hxx>
|
||||
#include <MeshVS_DisplayModeFlags.hxx>
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
#include <OpenGl_TextBuilder.hxx>
|
||||
|
||||
#include <TCollection_ExtendedString.hxx>
|
||||
#include <Graphic3d_Vertex.hxx>
|
||||
#include <Graphic3d_HorizontalTextAlignment.hxx>
|
||||
#include <Graphic3d_RenderingParams.hxx>
|
||||
#include <Graphic3d_Text.hxx>
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
#define _Prs3d_Point_H__
|
||||
|
||||
#include <Graphic3d_ArrayOfPoints.hxx>
|
||||
#include <Graphic3d_Vertex.hxx>
|
||||
#include <Graphic3d_Group.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
#include <Prs3d_PointAspect.hxx>
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <Graphic3d_Group.hxx>
|
||||
#include <Graphic3d_Text.hxx>
|
||||
#include <Graphic3d_Vertex.hxx>
|
||||
#include <Prs3d_Presentation.hxx>
|
||||
#include <Prs3d_TextAspect.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
|
||||
#include <PrsMgr_Presentation.hxx>
|
||||
|
||||
Standard_DEPRECATED("Deprecated alias to PrsMgr_Presentation3d")
|
||||
typedef PrsMgr_Presentation PrsMgr_Presentation3d;
|
||||
typedef Handle_PrsMgr_Presentation Handle_PrsMgr_Presentation3d;
|
||||
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
#include <Select3D_BndBox3d.hxx>
|
||||
#include <SelectBasics_SelectingVolumeManager.hxx>
|
||||
#include <SelectBasics_PickResult.hxx>
|
||||
#include <SelectBasics_SensitiveEntity.hxx>
|
||||
#include <SelectMgr_SelectingVolumeManager.hxx>
|
||||
#include <TopLoc_Location.hxx>
|
||||
|
||||
@ -110,7 +109,7 @@ protected:
|
||||
|
||||
DEFINE_STANDARD_HANDLE(Select3D_SensitiveEntity, Standard_Transient)
|
||||
|
||||
// for porting old code
|
||||
Standard_DEPRECATED("Deprecated alias - Select3D_SensitiveEntity should be used instead")
|
||||
typedef Select3D_SensitiveEntity SelectBasics_SensitiveEntity;
|
||||
|
||||
#endif // _Select3D_SensitiveEntity_HeaderFile
|
||||
|
||||
@ -118,7 +118,7 @@ Standard_Boolean Select3D_SensitiveWire::overlapsElement (SelectBasics_PickResul
|
||||
Standard_Boolean )
|
||||
{
|
||||
const Standard_Integer aSensitiveIdx = myEntityIndexes.Value (theElemIdx);
|
||||
const Handle(SelectBasics_SensitiveEntity)& aSeg = myEntities.Value (aSensitiveIdx);
|
||||
const Handle(Select3D_SensitiveEntity)& aSeg = myEntities.Value (aSensitiveIdx);
|
||||
return aSeg->Matches (theMgr, thePickResult);
|
||||
}
|
||||
|
||||
|
||||
@ -10,7 +10,6 @@ SelectMgr_BVHThreadPool.cxx
|
||||
SelectMgr_BVHThreadPool.hxx
|
||||
SelectMgr_CompositionFilter.cxx
|
||||
SelectMgr_CompositionFilter.hxx
|
||||
SelectMgr_CompositionFilter.lxx
|
||||
SelectMgr_EntityOwner.cxx
|
||||
SelectMgr_EntityOwner.hxx
|
||||
SelectMgr_Filter.cxx
|
||||
@ -45,7 +44,6 @@ SelectMgr_SensitiveEntity.cxx
|
||||
SelectMgr_SensitiveEntity.hxx
|
||||
SelectMgr_SensitiveEntitySet.cxx
|
||||
SelectMgr_SensitiveEntitySet.hxx
|
||||
SelectMgr_SequenceOfFilter.hxx
|
||||
SelectMgr_SequenceOfOwner.hxx
|
||||
SelectMgr_SequenceOfSelection.hxx
|
||||
SelectMgr_SortCriterion.hxx
|
||||
|
||||
@ -17,17 +17,10 @@
|
||||
#ifndef _SelectMgr_CompositionFilter_HeaderFile
|
||||
#define _SelectMgr_CompositionFilter_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
|
||||
#include <SelectMgr_ListOfFilter.hxx>
|
||||
#include <SelectMgr_Filter.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <TopAbs_ShapeEnum.hxx>
|
||||
class SelectMgr_Filter;
|
||||
|
||||
|
||||
class SelectMgr_CompositionFilter;
|
||||
DEFINE_STANDARD_HANDLE(SelectMgr_CompositionFilter, SelectMgr_Filter)
|
||||
|
||||
//! A framework to define a compound filter composed of
|
||||
@ -37,51 +30,33 @@ class SelectMgr_CompositionFilter : public SelectMgr_Filter
|
||||
|
||||
public:
|
||||
|
||||
|
||||
//! Adds the filter afilter to a filter object created by a
|
||||
//! filter class inheriting this framework.
|
||||
Standard_EXPORT void Add (const Handle(SelectMgr_Filter)& afilter);
|
||||
|
||||
|
||||
//! Removes the filter aFilter from this framework.
|
||||
Standard_EXPORT void Remove (const Handle(SelectMgr_Filter)& aFilter);
|
||||
|
||||
|
||||
//! Returns true if this framework is empty.
|
||||
Standard_EXPORT Standard_Boolean IsEmpty() const;
|
||||
|
||||
|
||||
//! Returns true if the filter aFilter is in this framework.
|
||||
Standard_EXPORT Standard_Boolean IsIn (const Handle(SelectMgr_Filter)& aFilter) const;
|
||||
|
||||
|
||||
//! Returns the list of stored filters from this framework.
|
||||
const SelectMgr_ListOfFilter& StoredFilters() const;
|
||||
|
||||
const SelectMgr_ListOfFilter& StoredFilters() const { return myFilters; }
|
||||
|
||||
//! Clears the filters used in this framework.
|
||||
Standard_EXPORT void Clear();
|
||||
|
||||
|
||||
Standard_EXPORT virtual Standard_Boolean ActsOn (const TopAbs_ShapeEnum aStandardMode) const Standard_OVERRIDE;
|
||||
|
||||
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_CompositionFilter,SelectMgr_Filter)
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
SelectMgr_ListOfFilter myFilters;
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
#include <SelectMgr_CompositionFilter.lxx>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif // _SelectMgr_CompositionFilter_HeaderFile
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
// Created on: 1997-01-21
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1997-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.
|
||||
|
||||
inline const SelectMgr_ListOfFilter& SelectMgr_CompositionFilter::
|
||||
StoredFilters() const
|
||||
{return myFilters;}
|
||||
@ -211,7 +211,7 @@ protected:
|
||||
|
||||
DEFINE_STANDARD_HANDLE(SelectMgr_EntityOwner, Standard_Transient)
|
||||
|
||||
// for porting old code
|
||||
Standard_DEPRECATED("Deprecated alias - SelectMgr_EntityOwner should be used instead")
|
||||
typedef SelectMgr_EntityOwner SelectBasics_EntityOwner;
|
||||
|
||||
#endif // _SelectMgr_EntityOwner_HeaderFile
|
||||
|
||||
@ -192,8 +192,8 @@ namespace
|
||||
const Handle(SelectMgr_Selection)& aSel = aSelIter.Value();
|
||||
for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (aSel->Entities()); aSelEntIter.More(); aSelEntIter.Next())
|
||||
{
|
||||
const Handle(SelectMgr_SensitiveEntity)& aSens = aSelEntIter.Value();
|
||||
const Handle(SelectBasics_EntityOwner)& anOwner = aSens->BaseSensitive()->OwnerId();
|
||||
const Handle(SelectMgr_SensitiveEntity)& aSens = aSelEntIter.Value();
|
||||
const Handle(SelectMgr_EntityOwner)& anOwner = aSens->BaseSensitive()->OwnerId();
|
||||
if (!myMapOwnerColors.IsBound (anOwner))
|
||||
{
|
||||
Quantity_Color aColor;
|
||||
@ -223,7 +223,7 @@ namespace
|
||||
}
|
||||
|
||||
protected:
|
||||
NCollection_DataMap<Handle(SelectBasics_EntityOwner), Quantity_Color> myMapOwnerColors;
|
||||
NCollection_DataMap<Handle(SelectMgr_EntityOwner), Quantity_Color> myMapOwnerColors;
|
||||
};
|
||||
|
||||
//! Help class for filling pixel with random color for each selection mode.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#ifndef _SelectMgr_SensitiveEntity_HeaderFile
|
||||
#define _SelectMgr_SensitiveEntity_HeaderFile
|
||||
|
||||
#include <SelectBasics_SensitiveEntity.hxx>
|
||||
#include <Select3D_SensitiveEntity.hxx>
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
// Created on: 1995-02-06
|
||||
// Created by: Mister rmi
|
||||
// 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 SelectMgr_SequenceOfFilter_HeaderFile
|
||||
#define SelectMgr_SequenceOfFilter_HeaderFile
|
||||
|
||||
#include <SelectMgr_Filter.hxx>
|
||||
#include <NCollection_Sequence.hxx>
|
||||
|
||||
typedef NCollection_Sequence<Handle(SelectMgr_Filter)> SelectMgr_SequenceOfFilter;
|
||||
|
||||
|
||||
#endif
|
||||
@ -11,7 +11,6 @@ V3d_ImageDumpOptions.hxx
|
||||
V3d_Light.hxx
|
||||
V3d_ListOfLight.hxx
|
||||
V3d_ListOfView.hxx
|
||||
V3d_Parameter.hxx
|
||||
V3d_Plane.cxx
|
||||
V3d_Plane.hxx
|
||||
V3d_PositionalLight.cxx
|
||||
@ -38,4 +37,3 @@ V3d_View.hxx
|
||||
V3d_Viewer.cxx
|
||||
V3d_Viewer.hxx
|
||||
V3d_ViewerPointer.hxx
|
||||
V3d_ViewPointer.hxx
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
// Created on: 1992-11-13
|
||||
// Created by: GG
|
||||
// Copyright (c) 1992-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 _V3d_Parameter_HeaderFile
|
||||
#define _V3d_Parameter_HeaderFile
|
||||
|
||||
#include <Standard_Real.hxx>
|
||||
|
||||
typedef Standard_Real V3d_Parameter;
|
||||
|
||||
|
||||
#endif // _V3d_Parameter_HeaderFile
|
||||
@ -17,7 +17,6 @@
|
||||
#ifndef _V3d_PositionLight_HeaderFile
|
||||
#define _V3d_PositionLight_HeaderFile
|
||||
|
||||
#include <Graphic3d_Vertex.hxx>
|
||||
#include <V3d_Light.hxx>
|
||||
|
||||
//! Base class for Positional, Spot and Directional Light classes.
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
// Created on: 1992-11-13
|
||||
// Created by: GG
|
||||
// Copyright (c) 1992-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 _V3d_ViewPointer_HeaderFile
|
||||
#define _V3d_ViewPointer_HeaderFile
|
||||
|
||||
class V3d_View;
|
||||
typedef V3d_View* V3d_ViewPointer;
|
||||
|
||||
#endif // _V3d_ViewPointer_HeaderFile
|
||||
@ -30,7 +30,7 @@
|
||||
#include <NCollection_List.hxx>
|
||||
#include <Prs3d.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
#include <SelectBasics_EntityOwner.hxx>
|
||||
#include <SelectMgr_EntityOwner.hxx>
|
||||
#include <StdSelect_BRepOwner.hxx>
|
||||
|
||||
#include <Standard_WarningsDisable.hxx>
|
||||
|
||||
@ -100,7 +100,7 @@ int VInspector_Tools::SelectedOwners (const Handle(AIS_InteractiveContext)& theC
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
bool VInspector_Tools::IsOwnerSelected (const Handle(AIS_InteractiveContext)& theContext,
|
||||
const Handle(SelectBasics_EntityOwner)& theOwner)
|
||||
const Handle(SelectMgr_EntityOwner)& theOwner)
|
||||
{
|
||||
bool anIsSelected = false;
|
||||
for (theContext->InitSelected(); theContext->MoreSelected() && !anIsSelected; theContext->NextSelected())
|
||||
@ -112,10 +112,10 @@ bool VInspector_Tools::IsOwnerSelected (const Handle(AIS_InteractiveContext)& th
|
||||
// function : ContextOwners
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ContextOwners (
|
||||
NCollection_List<Handle(SelectMgr_EntityOwner)> VInspector_Tools::ContextOwners (
|
||||
const Handle(AIS_InteractiveContext)& theContext)
|
||||
{
|
||||
NCollection_List<Handle(SelectBasics_EntityOwner)> aResultOwners;
|
||||
NCollection_List<Handle(SelectMgr_EntityOwner)> aResultOwners;
|
||||
if (theContext.IsNull())
|
||||
return aResultOwners;
|
||||
|
||||
@ -137,8 +137,8 @@ NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ContextOwne
|
||||
Handle(SelectMgr_SensitiveEntity) anEntity = aSelEntIter.Value();
|
||||
if (anEntity.IsNull())
|
||||
continue;
|
||||
const Handle(SelectBasics_SensitiveEntity)& aBase = anEntity->BaseSensitive();
|
||||
Handle(SelectBasics_EntityOwner) anOwner = aBase->OwnerId();
|
||||
const Handle(Select3D_SensitiveEntity)& aBase = anEntity->BaseSensitive();
|
||||
Handle(SelectMgr_EntityOwner) anOwner = aBase->OwnerId();
|
||||
Standard_Transient* anOwnerPtr = anOwner.get();
|
||||
if (aSelectedIds.contains ((size_t)anOwnerPtr))
|
||||
continue;
|
||||
@ -154,22 +154,22 @@ NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ContextOwne
|
||||
// function : ActiveOwners
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ActiveOwners (
|
||||
NCollection_List<Handle(SelectMgr_EntityOwner)> VInspector_Tools::ActiveOwners (
|
||||
const Handle(AIS_InteractiveContext)& theContext,
|
||||
NCollection_List<Handle(SelectBasics_EntityOwner)>& theEmptySelectableOwners)
|
||||
NCollection_List<Handle(SelectMgr_EntityOwner)>& theEmptySelectableOwners)
|
||||
{
|
||||
NCollection_List<Handle(SelectBasics_EntityOwner)> aResultOwners;
|
||||
NCollection_List<Handle(SelectMgr_EntityOwner)> aResultOwners;
|
||||
|
||||
// only local context is processed: TODO for global context
|
||||
Handle(AIS_InteractiveContext) aContext = theContext;
|
||||
if (aContext.IsNull())
|
||||
return aResultOwners;
|
||||
NCollection_List<Handle(SelectBasics_EntityOwner)> anActiveOwners;
|
||||
NCollection_List<Handle(SelectMgr_EntityOwner)> anActiveOwners;
|
||||
// OCCT BUG:1 - equal pointer owners are appears in the list
|
||||
aContext->MainSelector()->ActiveOwners (anActiveOwners);
|
||||
QList<size_t> aSelectedIds; // Remember of selected address in order to avoid duplicates
|
||||
Handle(SelectMgr_EntityOwner) anOwner;
|
||||
for (NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt (anActiveOwners);
|
||||
for (NCollection_List<Handle(SelectMgr_EntityOwner)>::Iterator anOwnersIt (anActiveOwners);
|
||||
anOwnersIt.More(); anOwnersIt.Next())
|
||||
{
|
||||
anOwner = anOwnersIt.Value();
|
||||
@ -195,7 +195,7 @@ NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ActiveOwner
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void VInspector_Tools::AddOrRemoveSelectedShapes (const Handle(AIS_InteractiveContext)& theContext,
|
||||
const NCollection_List<Handle(SelectBasics_EntityOwner)>& theOwners)
|
||||
const NCollection_List<Handle(SelectMgr_EntityOwner)>& theOwners)
|
||||
{
|
||||
// TODO: the next two rows are to be removed later
|
||||
theContext->UnhilightSelected(false);
|
||||
@ -203,7 +203,7 @@ void VInspector_Tools::AddOrRemoveSelectedShapes (const Handle(AIS_InteractiveCo
|
||||
|
||||
theContext->UnhilightSelected(Standard_False);
|
||||
|
||||
for (NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt(theOwners);
|
||||
for (NCollection_List<Handle(SelectMgr_EntityOwner)>::Iterator anOwnersIt(theOwners);
|
||||
anOwnersIt.More(); anOwnersIt.Next())
|
||||
{
|
||||
Handle(SelectMgr_EntityOwner) anOwner = anOwnersIt.Value();
|
||||
|
||||
@ -72,27 +72,27 @@ public:
|
||||
//! \param theOwner a selectable owner
|
||||
//! \return boolean value
|
||||
Standard_EXPORT static bool IsOwnerSelected (const Handle(AIS_InteractiveContext)& theContext,
|
||||
const Handle(SelectBasics_EntityOwner)& theOwner);
|
||||
const Handle(SelectMgr_EntityOwner)& theOwner);
|
||||
|
||||
//! Returns all owners present in the context
|
||||
//! \param theContext an interactive context
|
||||
//! \return container of owners
|
||||
Standard_EXPORT static NCollection_List<Handle(SelectBasics_EntityOwner)> ContextOwners (
|
||||
Standard_EXPORT static NCollection_List<Handle(SelectMgr_EntityOwner)> ContextOwners (
|
||||
const Handle(AIS_InteractiveContext)& theContext);
|
||||
|
||||
//! Returns active owners in main selector of context
|
||||
//! \param theContext an interactive context
|
||||
//! \param theEmptySelectableOwners container of owners with NULL presentation or not displayed presentation
|
||||
//! \return container of owners
|
||||
Standard_EXPORT static NCollection_List<Handle(SelectBasics_EntityOwner)> ActiveOwners (
|
||||
Standard_EXPORT static NCollection_List<Handle(SelectMgr_EntityOwner)> ActiveOwners (
|
||||
const Handle(AIS_InteractiveContext)& theContext,
|
||||
NCollection_List<Handle(SelectBasics_EntityOwner)>& theEmptySelectableOwners);
|
||||
NCollection_List<Handle(SelectMgr_EntityOwner)>& theEmptySelectableOwners);
|
||||
|
||||
//! Unhighlight selected, set selected the owners
|
||||
//! \param theContext an interactive context
|
||||
//! \param theOwners a container of owners
|
||||
Standard_EXPORT static void AddOrRemoveSelectedShapes (const Handle(AIS_InteractiveContext)& theContext,
|
||||
const NCollection_List<Handle(SelectBasics_EntityOwner)>& theOwners);
|
||||
const NCollection_List<Handle(SelectMgr_EntityOwner)>& theOwners);
|
||||
|
||||
//! Unhighlight selected, set selected presentations
|
||||
//! \param theContext an interactive context
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
|
||||
#include <AIS_InteractiveContext.hxx>
|
||||
#include <NCollection_List.hxx>
|
||||
#include <SelectBasics_EntityOwner.hxx>
|
||||
#include <Standard.hxx>
|
||||
#include <SelectMgr_EntityOwner.hxx>
|
||||
|
||||
#include <inspector/TreeModel_ModelBase.hxx>
|
||||
#include <inspector/VInspector_ItemBase.hxx>
|
||||
|
||||
|
||||
@ -18,8 +18,7 @@
|
||||
|
||||
#include <AIS_InteractiveContext.hxx>
|
||||
#include <NCollection_List.hxx>
|
||||
#include <SelectBasics_EntityOwner.hxx>
|
||||
#include <Standard.hxx>
|
||||
#include <SelectMgr_EntityOwner.hxx>
|
||||
|
||||
#include <inspector/TInspectorAPI_PluginParameters.hxx>
|
||||
#include <inspector/VInspector_CallBack.hxx>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user