mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-19 13:40:49 +03:00
0032056: Coding Rules - remove package MMgt and other types deprecated since OCCT 7.2.0
Removed functionality deprecated since OCCT 7.1.0: - 0027834 built-in iterator in class SelectMgr_ViewerSelector; - 0027900 obsolete constructor of V3d_Viewer class; - 0027816 obsolete clipping plane setters V3d_View/PrsMgr_PresentableObject:SetClipPlanes(); - 0027860 obsolete transformation persistence methods from class PrsMgr_PresentableObject; - 0027756 obsolete methods Prs3d_Text::Draw(); - 0024393 obsolete enum Graphic3d_ZLayerSetting; - 0025180 obsolete method Graphic3d_Structure::Transform(). Removed functionality deprecated since OCCT 7.2.0: - 0028832 obsolete class MMgt_TShared; - 0026937 obsolete property Standard_Failure::Caught(); - 0028799 obsolete types defined within Quantity package; - 0028441 obsolete nested enum Image_PixMap::ImgFormat; - 0025695 obsolete method PrsMgr_PresentationManager::Unhighlight(); - 0028205 obsolete class MeshVS_ColorHasher; - 0027958 obsolete methods from Prs3d_DatumAspect class; - 0025695 obsolete class Graphic3d_HighlightStyle; - 0027954 obsolete BRepOffsetAPI_MakeOffsetShape,BRepOffsetAPI_MakeThickSolid constructors.
This commit is contained in:
@@ -165,7 +165,6 @@ SelectMgr_ViewerSelector::SelectMgr_ViewerSelector()
|
||||
myToUpdateTolerance (Standard_True),
|
||||
myCameraScale (1.0),
|
||||
myToPrebuildBVH (Standard_False),
|
||||
myCurRank (0),
|
||||
myIsLeftChildQueuedFirst (Standard_False)
|
||||
{
|
||||
myEntitySetBuilder = new BVH_BinnedBuilder<Standard_Real, 3, 4> (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth, Standard_True);
|
||||
@@ -745,17 +744,6 @@ void SelectMgr_ViewerSelector::ClearPicked()
|
||||
mystored.Clear();
|
||||
}
|
||||
|
||||
//==================================================
|
||||
// Function: Picked
|
||||
// Purpose :
|
||||
//==================================================
|
||||
Handle(SelectMgr_EntityOwner) SelectMgr_ViewerSelector::Picked() const
|
||||
{
|
||||
const Standard_Integer aRankInMap = myIndexes->Value (myCurRank);
|
||||
const Handle(SelectMgr_EntityOwner)& anOwner = mystored.FindKey (aRankInMap);
|
||||
return anOwner;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : Picked
|
||||
//purpose :
|
||||
@@ -1057,17 +1045,6 @@ void SelectMgr_ViewerSelector::ResetSelectionActivationStatus()
|
||||
}
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
// function : DetectedEntity
|
||||
// purpose : Returns sensitive entity that was detected during the
|
||||
// previous run of selection algorithm
|
||||
//=======================================================================
|
||||
const Handle(Select3D_SensitiveEntity)& SelectMgr_ViewerSelector::DetectedEntity() const
|
||||
{
|
||||
const Standard_Integer aRankInMap = myIndexes->Value(myCurRank);
|
||||
return mystored.FindFromIndex (aRankInMap).Entity;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
// function : ActiveOwners
|
||||
// purpose : Returns the list of active entity owners
|
||||
@@ -1135,7 +1112,6 @@ void SelectMgr_ViewerSelector::DumpJson (Standard_OStream& theOStream, Standard_
|
||||
if (!myIndexes.IsNull())
|
||||
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIndexes->Size())
|
||||
|
||||
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurRank)
|
||||
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsLeftChildQueuedFirst)
|
||||
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMapOfObjectSensitives.Extent())
|
||||
}
|
||||
|
||||
@@ -244,42 +244,6 @@ public:
|
||||
//! Dumps the content of me into the stream
|
||||
Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
|
||||
|
||||
public:
|
||||
|
||||
//! Begins an iteration scanning for the owners detected at a position in the view.
|
||||
Standard_DEPRECATED("Deprecated method Init()")
|
||||
void Init() { initPicked(); }
|
||||
|
||||
//! Continues the interation scanning for the owners detected at a position in the view,
|
||||
//! or continues the iteration scanning for the owner closest to the position in the view.
|
||||
Standard_DEPRECATED("Deprecated method More()")
|
||||
Standard_Boolean More() { return morePicked(); }
|
||||
|
||||
//! Returns the next owner found in the iteration. This is
|
||||
//! a scan for the owners detected at a position in the view.
|
||||
Standard_DEPRECATED("Deprecated method Next()")
|
||||
void Next() { nextPicked(); }
|
||||
|
||||
//! Returns the current selected entity detected by the selector;
|
||||
Standard_DEPRECATED("Deprecated method Picked()")
|
||||
Standard_EXPORT Handle(SelectMgr_EntityOwner) Picked() const;
|
||||
|
||||
//! Initializes internal iterator for stored detected sensitive entities
|
||||
Standard_DEPRECATED("Deprecated method InitDetected()")
|
||||
void InitDetected() { initPicked(); }
|
||||
|
||||
//! Makes a step along the map of detected sensitive entities and their owners
|
||||
Standard_DEPRECATED("Deprecated method NextDetected()")
|
||||
void NextDetected() { nextPicked(); }
|
||||
|
||||
//! Returns true if iterator of map of detected sensitive entities has reached its end
|
||||
Standard_DEPRECATED("Deprecated method MoreDetected()")
|
||||
Standard_Boolean MoreDetected() { return morePicked(); }
|
||||
|
||||
//! Returns sensitive entity that was detected during the previous run of selection algorithm
|
||||
Standard_DEPRECATED("Deprecated method DetectedEntity() should be replaced by DetectedEntity(int)")
|
||||
Standard_EXPORT const Handle(Select3D_SensitiveEntity)& DetectedEntity() const;
|
||||
|
||||
public:
|
||||
|
||||
//! Enables/disables building BVH for sensitives in separate threads
|
||||
@@ -351,21 +315,7 @@ private:
|
||||
SelectMgr_SelectingVolumeManager& theResMgr);
|
||||
|
||||
|
||||
private: // implementation of deprecated methods
|
||||
|
||||
//! Initializes internal iterator for stored detected sensitive entities
|
||||
void initPicked() { myCurRank = 1; }
|
||||
|
||||
//! Makes a step along the map of detected sensitive entities and their owners
|
||||
void nextPicked() { ++myCurRank; }
|
||||
|
||||
//! Returns true if iterator of map of detected sensitive entities has reached its end
|
||||
Standard_Boolean morePicked() const
|
||||
{
|
||||
if (mystored.Extent() == 0) return Standard_False;
|
||||
if (myCurRank == 0) return Standard_False;
|
||||
return myCurRank <= myIndexes->Length();
|
||||
}
|
||||
private:
|
||||
|
||||
//! Compute 3d position for detected entity.
|
||||
void updatePoint3d (SelectMgr_SortCriterion& theCriterion,
|
||||
@@ -394,7 +344,6 @@ protected:
|
||||
Handle(SelectMgr_BVHThreadPool) myBVHThreadPool;
|
||||
|
||||
Handle(TColStd_HArray1OfInteger) myIndexes;
|
||||
Standard_Integer myCurRank;
|
||||
Standard_Boolean myIsLeftChildQueuedFirst;
|
||||
SelectMgr_MapOfObjectSensitives myMapOfObjectSensitives;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user