From ed8cad74ad3fc30338732cd12480cefa86a9ef2a Mon Sep 17 00:00:00 2001 From: dbv Date: Mon, 11 Nov 2013 14:59:45 +0400 Subject: [PATCH] 0024343: AIS_DisplayStatus - outdated description Documentation fix --- src/AIS/AIS.cdl | 4 +--- src/AIS/AIS_GlobalStatus.cdl | 9 ++------- src/AIS/AIS_InteractiveContext.cxx | 4 ---- src/AIS/AIS_InteractiveContext_1.cxx | 1 - src/AIS/AIS_LocalContext_1.cxx | 1 - 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/AIS/AIS.cdl b/src/AIS/AIS.cdl index 318badff80..087521e6f6 100755 --- a/src/AIS/AIS.cdl +++ b/src/AIS/AIS.cdl @@ -196,9 +196,7 @@ is -- This will be one of the following: -- - DS_Displayed: the Interactive Object is -- displayed in the main viewer; - -- - DS_Erased: the Interactive Object is erased in the collector; - -- - DS_FullErased: the Interactive Object is erased - -- but not in the collector; + -- - DS_Erased: the Interactive Object is hidden in main viewer; -- - DS_Temporary: the Interactive Object is temporarily displayed; -- - DS_None: the Interactive Object is nowhere displayed. diff --git a/src/AIS/AIS_GlobalStatus.cdl b/src/AIS/AIS_GlobalStatus.cdl index 959ca19a72..6d9778be76 100755 --- a/src/AIS/AIS_GlobalStatus.cdl +++ b/src/AIS/AIS_GlobalStatus.cdl @@ -24,8 +24,7 @@ private class GlobalStatus from AIS inherits TShared from MMgt ---Purpose: Stores information about objects in graphic context: -- - Status Of Display : in the main viewer - -- in the collector - -- fully Erased + -- hidden in the main viewer -- - Displayed Modes -- - Active Selection Modes -- - is the Interactive Object Current ? @@ -90,16 +89,12 @@ is ---C++: inline ---Purpose: keeps the information of displayed modes in the -- main viewer. - -- (The convention is that the object is displayed - -- with the mode 0 in the collector...) - + SelectionModes(me) returns ListOfInteger from TColStd; ---C++: return const & ---C++: inline ---Purpose: keeps the active selection modes of the object -- in the main viewer. - -- (The convention is that the active selection mode - -- for an object in the collector is the mode 0). IsHilighted(me) returns Boolean from Standard; ---C++: inline diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index bc7c438cc8..556cd4f367 100755 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -83,10 +83,6 @@ // in spite of the selection mode of the interactive object in Natural Point. #define OCC166 -// An interactive Object being erased in the main viewer and put into collector should have the same selection mode. -// It impacts the performance! -#define OCC328 - static Standard_Boolean AISDebugModeOn() { // static OSD_Environment aisdb("AISDEBUGMODE"); diff --git a/src/AIS/AIS_InteractiveContext_1.cxx b/src/AIS/AIS_InteractiveContext_1.cxx index c11509a9c3..4b0b4a63ae 100755 --- a/src/AIS/AIS_InteractiveContext_1.cxx +++ b/src/AIS/AIS_InteractiveContext_1.cxx @@ -425,7 +425,6 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Boolean updatevie if(myWasLastMain) return myLocalContexts(myCurLocalIndex)->Select(updateviewer); else - // picking was done in the collector, special processing is required... { myLocalContexts(myCurLocalIndex)->SetSelected(myLastPicked,updateviewer); return AIS_SOP_OneSelected; diff --git a/src/AIS/AIS_LocalContext_1.cxx b/src/AIS/AIS_LocalContext_1.cxx index fef2707d94..ab352c4acc 100755 --- a/src/AIS/AIS_LocalContext_1.cxx +++ b/src/AIS/AIS_LocalContext_1.cxx @@ -1523,7 +1523,6 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const #ifdef OCC9026 if (!found) { - //now iterate over all shapes loaded into the context (but inside the collector) SelectMgr_DataMapIteratorOfDataMapOfIntegerSensitive aSensitiveIt (myMainVS->Primitives()); for (; aSensitiveIt.More(); aSensitiveIt.Next()) { EO = Handle(SelectMgr_EntityOwner)::DownCast (aSensitiveIt.Value()->OwnerId());