OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

0028088: Visualization, AIS_InteractiveContext - drop default value for Update Viewer parameter

Browse Source
This commit is contained in:
isk
2016-12-27 13:24:08 +03:00
committed by kgv
parent 9bcfd6f649
commit 0577ae8ca4
65 changed files with 884 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/AIS/AIS_InteractiveContext.cxx
View File

@@ -2176,7 +2176,6 @@ void AIS_InteractiveContext::UnsetTransparency (const Handle(AIS_InteractiveObje
//purpose :
//=======================================================================
void AIS_InteractiveContext::SetSelectedAspect (const Handle(Prs3d_BasicAspect)& theAspect,
const Standard_Boolean ,
const Standard_Boolean theToUpdateViewer)
{
if (HasOpenedContext())
@@ -2754,10 +2753,10 @@ void AIS_InteractiveContext::SetTrihedronSize (const Standard_Real theVal,
//=======================================================================
void AIS_InteractiveContext::SetPlaneSize(const Standard_Real theValX,
const Standard_Real theValY,
const Standard_Boolean /*updateviewer*/)
const Standard_Boolean theToUpdateViewer)
{
myDefaultDrawer->PlaneAspect()->SetPlaneLength (theValX, theValY);
Redisplay (AIS_KOI_Datum, 7);
Redisplay (AIS_KOI_Datum, 7, theToUpdateViewer);
}
//=======================================================================
@@ -2858,6 +2857,15 @@ void AIS_InteractiveContext::Disconnect (const Handle(AIS_InteractiveObject)& th
return;
}
//=======================================================================
//function : FitSelected
//purpose : Fits the view corresponding to the bounds of selected objects
//=======================================================================
void AIS_InteractiveContext::FitSelected (const Handle(V3d_View)& theView)
{
FitSelected (theView, 0.01, Standard_True);
}
//=======================================================================
//function : FitSelected
//purpose : Fits the view corresponding to the bounds of selected objects

253
src/AIS/AIS_InteractiveContext.hxx
View File

@@ -158,7 +158,8 @@ public:
//! open or closed. If you want to view the object in open
//! local context without selection, use the syntax below,
//! setting aSelectionMode to -1.
Standard_EXPORT void Display (const Handle(AIS_InteractiveObject)& anIobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void Display (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Controls the choice between the using the display
//! and selection modes of open local context which you
@@ -183,7 +184,12 @@ public:
//! - vertices: 1
//! - edges: 2
//! - wires: 3.
Standard_EXPORT void Display (const Handle(AIS_InteractiveObject)& theIObj, const Standard_Integer theDispMode, const Standard_Integer theSelectionMode, const Standard_Boolean theToUpdateViewer = Standard_True, const Standard_Boolean theToAllowDecomposition = Standard_True, const AIS_DisplayStatus theDispStatus = AIS_DS_None);
Standard_EXPORT void Display (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Integer theDispMode,
const Standard_Integer theSelectionMode,
const Standard_Boolean theToUpdateViewer,
const Standard_Boolean theToAllowDecomposition = Standard_True,
const AIS_DisplayStatus theDispStatus = AIS_DS_None);
//! Allows you to load the Interactive Object aniobj
//! with a given selection mode SelectionMode, and/or
@@ -201,21 +207,22 @@ public:
//! Hides the object. The object's presentations are simply
//! flagged as invisible and therefore excluded from redrawing.
//! To show hidden objects, use Display().
Standard_EXPORT void Erase (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void Erase (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Hides all objects. The object's presentations are simply
//! flagged as invisible and therefore excluded from redrawing.
//! To show all hidden objects, use DisplayAll().
Standard_EXPORT void EraseAll (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void EraseAll (const Standard_Boolean theToUpdateViewer);
//! Displays all hidden objects.
Standard_EXPORT void DisplayAll (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void DisplayAll (const Standard_Boolean theToUpdateViewer);
//! Hides selected objects. The object's presentations are simply
//! flagged as invisible and therefore excluded from redrawing.
//! To show hidden objects, use Display().
Standard_EXPORT void EraseSelected (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void EraseSelected (const Standard_Boolean theToUpdateViewer);
//! Displays selected objects if a local context is open.
//! Displays current objects if there is no active local context.
@@ -226,7 +233,7 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void DisplaySelected (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void DisplaySelected (const Standard_Boolean theToUpdateViewer);
//! Changes the status of a temporary object. It will be
//! kept at the neutral point, i.e. put in the list of
@@ -249,7 +256,9 @@ public:
//! Warning
//! Removes anIobj. anIobj is still active if it was
//! previously activated.
Standard_EXPORT void ClearPrs (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Integer aMode = 0, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void ClearPrs (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Integer theMode,
const Standard_Boolean theToUpdateViewer);
//! Removes aniobj from every viewer. aniobj is no
//! longer referenced in the Context.
@@ -257,11 +266,12 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void Remove (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void Remove (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Removes all the objects from all opened Local Contexts
//! and from the Neutral Point
Standard_EXPORT void RemoveAll (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void RemoveAll (const Standard_Boolean theToUpdateViewer);
//! Updates the display in the viewer to take dynamic
//! detection into account. On dynamic detection by the
@@ -273,7 +283,8 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_DEPRECATED("Deprecated method Hilight()")
void Hilight (const Handle(AIS_InteractiveObject)& theObj, const Standard_Boolean theIsToUpdateViewer = Standard_True)
void Hilight (const Handle(AIS_InteractiveObject)& theObj,
const Standard_Boolean theIsToUpdateViewer)
{
return HilightWithColor (theObj, myStyles[Prs3d_TypeOfHighlight_Dynamic], theIsToUpdateViewer);
}
@@ -286,8 +297,8 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void HilightWithColor (const Handle(AIS_InteractiveObject)& theObj,
const Handle(Prs3d_Drawer)& theStyle,
const Standard_Boolean theIsToUpdate = Standard_True);
const Handle(Prs3d_Drawer)& theStyle,
const Standard_Boolean theToUpdateViewer);
//! Removes hilighting from the entity aniobj. Updates the viewer.
@@ -295,7 +306,8 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void Unhilight (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void Unhilight (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Sets the display priority aPriority of the seen parts
//! presentation of the entity anIobj.
@@ -316,16 +328,22 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void Redisplay (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True, const Standard_Boolean allmodes = Standard_False);
Standard_EXPORT void Redisplay (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer,
const Standard_Boolean theAllModes = Standard_False);
//! Recomputes the Prs/Selection of displayed objects of
//! a given type and a given signature.
//! if signature = -1 doesnt take signature criterion.
Standard_EXPORT void Redisplay (const AIS_KindOfInteractive aTypeOfObject, const Standard_Integer Signature = -1, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void Redisplay (const AIS_KindOfInteractive theTypeOfObject,
const Standard_Integer theSignature,
const Standard_Boolean theToUpdateViewer);
//! Recomputes the displayed presentations, flags the others
//! Doesn't update presentations
Standard_EXPORT void RecomputePrsOnly (const Handle(AIS_InteractiveObject)& anIobj, const Standard_Boolean updateviewer = Standard_True, const Standard_Boolean allmodes = Standard_False);
Standard_EXPORT void RecomputePrsOnly (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer,
const Standard_Boolean theAllModes = Standard_False);
//! Recomputes the active selections, flags the others
//! Doesn't update presentations
@@ -336,7 +354,8 @@ public:
//! and selection structures. This method does not force any
//! recomputation on its own. The method recomputes selections
//! even if they are loaded without activation in particular selector.
Standard_EXPORT void Update (const Handle(AIS_InteractiveObject)& theIObj, const Standard_Boolean theUpdateViewer = Standard_True);
Standard_EXPORT void Update (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theUpdateViewer);
//! Sets the display mode of seen Interactive Objects.
@@ -349,7 +368,9 @@ public:
//! object is displayed but no viewer will be updated.
//! Note that display mode 3 is only used if you have an
//! AIS_Textured Shape.
Standard_EXPORT void SetDisplayMode (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Integer aMode, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetDisplayMode (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Integer theMode,
const Standard_Boolean theToUpdateViewer);
//! Unsets the display mode of seen Interactive Objects.
@@ -360,7 +381,8 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object returns to the default selection mode; the
//! object is displayed but no viewer will be updated.
Standard_EXPORT void UnsetDisplayMode (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void UnsetDisplayMode (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Disables the mechanism of adaptive tolerance calculation in SelectMgr_ViewerSelector and
//! sets the given tolerance for ALL sensitive entities activated. For more information, see
@@ -404,7 +426,9 @@ public:
//! applying both on the front and back face.
Standard_EXPORT void SetCurrentFacingModel (const Handle(AIS_InteractiveObject)& aniobj, const Aspect_TypeOfFacingModel aModel = Aspect_TOFM_BOTH_SIDE);
Standard_EXPORT void SetColor (const Handle(AIS_InteractiveObject)& aniobj, const Quantity_NameOfColor aColor, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetColor (const Handle(AIS_InteractiveObject)& theIObj,
const Quantity_NameOfColor theColor,
const Standard_Boolean theToUpdateViewer);
//! Sets the color of the selected entity.
@@ -412,14 +436,17 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void SetColor (const Handle(AIS_InteractiveObject)& aniobj, const Quantity_Color& aColor, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetColor (const Handle(AIS_InteractiveObject)& theIObj,
const Quantity_Color& theColor,
const Standard_Boolean theToUpdateViewer);
//! Removes the color selection for the selected entity.
//! If a local context is open and if updateviewer equals
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void UnsetColor (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void UnsetColor (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Sets the width of the entity aniobj.
@@ -427,7 +454,9 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT virtual void SetWidth (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Real aValue, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT virtual void SetWidth (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Real theValue,
const Standard_Boolean theToUpdateViewer);
//! Removes the width setting of the entity aniobj.
@@ -435,7 +464,8 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT virtual void UnsetWidth (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT virtual void UnsetWidth (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Provides the type of material setting for the view of
@@ -446,7 +476,9 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void SetMaterial (const Handle(AIS_InteractiveObject)& aniobj, const Graphic3d_NameOfMaterial aName, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetMaterial (const Handle(AIS_InteractiveObject)& theIObj,
const Graphic3d_NameOfMaterial theName,
const Standard_Boolean theToUpdateViewer);
//! Removes the type of material setting for viewing the
@@ -455,7 +487,8 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void UnsetMaterial (const Handle(AIS_InteractiveObject)& anObj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void UnsetMaterial (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Provides the transparency settings for viewing the
//! entity aniobj. The transparency value aValue may be
@@ -464,7 +497,9 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void SetTransparency (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Real aValue = 0.6, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetTransparency (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Real theValue,
const Standard_Boolean theToUpdateViewer);
//! Removes the transparency settings for viewing the
@@ -474,7 +509,8 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void UnsetTransparency (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void UnsetTransparency (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Sets the attributes of the interactive object aniobj by
@@ -486,7 +522,9 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void SetLocalAttributes (const Handle(AIS_InteractiveObject)& aniobj, const Handle(Prs3d_Drawer)& aDrawer, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetLocalAttributes (const Handle(AIS_InteractiveObject)& theIObj,
const Handle(Prs3d_Drawer)& theDrawer,
const Standard_Boolean theToUpdateViewer);
//! Removes the settings for local attributes of the entity
@@ -496,11 +534,16 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void UnsetLocalAttributes (const Handle(AIS_InteractiveObject)& anObj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void UnsetLocalAttributes (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Sets up polygon offsets for the given AIS_InteractiveObject.
//! It simply calls anObj->SetPolygonOffsets()
Standard_EXPORT void SetPolygonOffsets (const Handle(AIS_InteractiveObject)& anObj, const Standard_Integer aMode, const Standard_ShortReal aFactor = 1.0, const Standard_ShortReal aUnits = 0.0, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetPolygonOffsets (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Integer theMode,
const Standard_ShortReal theFactor,
const Standard_ShortReal theUnits,
const Standard_Boolean theToUpdateViewer);
//! simply calls anObj->HasPolygonOffsets()
Standard_EXPORT Standard_Boolean HasPolygonOffsets (const Handle(AIS_InteractiveObject)& anObj) const;
@@ -519,7 +562,8 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void SetTrihedronSize (const Standard_Real aSize, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetTrihedronSize (const Standard_Real theSize,
const Standard_Boolean theToUpdateViewer);
//! returns the current value of trihedron size.
Standard_EXPORT Standard_Real TrihedronSize() const;
@@ -531,7 +575,9 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void SetPlaneSize (const Standard_Real aSizeX, const Standard_Real aSizeY, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetPlaneSize (const Standard_Real theSizeX,
const Standard_Real theSizeY,
const Standard_Boolean theToUpdateViewer);
//! Sets the plane size aSize.
@@ -540,7 +586,8 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
//! May be used if PlaneSize returns true.
Standard_EXPORT void SetPlaneSize (const Standard_Real aSize, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetPlaneSize (const Standard_Real theSize,
const Standard_Boolean theToUpdateViewer);
//! Returns true if the length in the X direction XSize is
//! the same as that in the Y direction YSize.
@@ -691,7 +738,8 @@ public:
//! object is displayed but no viewer will be updated.
//! Note that display mode 3 is only used if you have an
//! AIS_Textured Shape.
Standard_EXPORT void SetDisplayMode (const Standard_Integer AMode, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetDisplayMode (const Standard_Integer theMode,
const Standard_Boolean theToUpdateViewer);
//! Sets the deviation coefficient aCoefficient.
@@ -712,27 +760,39 @@ public:
//! for a relative deviation. This deviation will be:
//! SizeOfObject * DeviationCoefficient.
//! default 0.001
Standard_EXPORT void SetDeviationCoefficient (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Real aCoefficient, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetDeviationCoefficient (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Real theCoefficient,
const Standard_Boolean theToUpdateViewer);
Standard_EXPORT void SetDeviationAngle (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Real anAngle, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetDeviationAngle (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Real theAngle,
const Standard_Boolean theToUpdateViewer);
//! Calls the AIS_Shape SetAngleAndDeviation to set
//! both Angle and Deviation coefficients
Standard_EXPORT void SetAngleAndDeviation (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Real anAngle, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetAngleAndDeviation (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Real theAngle,
const Standard_Boolean theToUpdateViewer);
//! Sets the deviation coefficient aCoefficient for
//! removal of hidden lines created by different
//! viewpoints in different presentations. The Default value is 0.02.
Standard_EXPORT void SetHLRDeviationCoefficient (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Real aCoefficient, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetHLRDeviationCoefficient (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Real theCoefficient,
const Standard_Boolean theToUpdateViewer);
Standard_EXPORT void SetHLRDeviationAngle (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Real anAngle, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetHLRDeviationAngle (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Real theAngle,
const Standard_Boolean theToUpdateViewer);
//! Computes a HLRAngle and a
//! HLRDeviationCoefficient by means of the angle
//! anAngle and sets the corresponding methods in the
//! default drawing tool with these values.
Standard_EXPORT void SetHLRAngleAndDeviation (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Real anAngle, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetHLRAngleAndDeviation (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Real theAngle,
const Standard_Boolean theToUpdateViewer);
//! Sets the deviation coefficient aCoefficient.
//! Drawings of curves or patches are made with respect
@@ -872,13 +932,17 @@ public:
//! ALL selected objects.
//! Flag globalChange has no effect (left to simplify porting).
//! Updates the viewer when <updateViewer> is TRUE
Standard_EXPORT void SetSelectedAspect (const Handle(Prs3d_BasicAspect)& anAspect, const Standard_Boolean globalChange = Standard_True, const Standard_Boolean updateViewer = Standard_True);
Standard_EXPORT void SetSelectedAspect (const Handle(Prs3d_BasicAspect)& theAspect,
const Standard_Boolean theToUpdateViewer);
//! Relays mouse position in pixels theXPix and theYPix to the interactive context selectors.
//! This is done by the view theView passing this position to the main viewer and updating it.
//! Functions in both Neutral Point and local contexts.
//! If theToRedrawOnUpdate is set to false, callee should call RedrawImmediate() to highlight detected object.
Standard_EXPORT AIS_StatusOfDetection MoveTo (const Standard_Integer theXPix, const Standard_Integer theYPix, const Handle(V3d_View)& theView, const Standard_Boolean theToRedrawOnUpdate = Standard_True);
Standard_EXPORT AIS_StatusOfDetection MoveTo (const Standard_Integer theXPix,
const Standard_Integer theYPix,
const Handle(V3d_View)& theView,
const Standard_Boolean theToRedrawOnUpdate);
//! returns True if other entities were detected in the
//! last mouse detection
@@ -913,28 +977,42 @@ public:
//! YPMin, XPMax, and YPMax in the view, aView
//! The objects detected are passed to the main viewer,
//! which is then updated.
Standard_EXPORT AIS_StatusOfPick Select (const Standard_Integer XPMin, const Standard_Integer YPMin, const Standard_Integer XPMax, const Standard_Integer YPMax, const Handle(V3d_View)& aView, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT AIS_StatusOfPick Select (const Standard_Integer theXPMin,
const Standard_Integer theYPMin,
const Standard_Integer theXPMax,
const Standard_Integer theYPMax,
const Handle(V3d_View)& theView,
const Standard_Boolean theToUpdateViewer);
//! polyline selection; clears the previous picked list
Standard_EXPORT AIS_StatusOfPick Select (const TColgp_Array1OfPnt2d& Polyline, const Handle(V3d_View)& aView, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT AIS_StatusOfPick Select (const TColgp_Array1OfPnt2d& thePolyline,
const Handle(V3d_View)& theView,
const Standard_Boolean theToUpdateViewer);
//! Stores and hilights the previous detected; Unhilights
//! the previous picked.
Standard_EXPORT AIS_StatusOfPick Select (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT AIS_StatusOfPick Select (const Standard_Boolean theToUpdateViewer);
//! adds the last detected to the list of previous picked.
//! if the last detected was already declared as picked,
//! removes it from the Picked List.
Standard_EXPORT AIS_StatusOfPick ShiftSelect (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT AIS_StatusOfPick ShiftSelect (const Standard_Boolean theToUpdateViewer);
//! adds the last detected to the list of previous picked.
//! if the last detected was already declared as picked,
//! removes it from the Picked List.
Standard_EXPORT AIS_StatusOfPick ShiftSelect (const TColgp_Array1OfPnt2d& Polyline, const Handle(V3d_View)& aView, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT AIS_StatusOfPick ShiftSelect (const TColgp_Array1OfPnt2d& thePolyline,
const Handle(V3d_View)& theView,
const Standard_Boolean theToUpdateViewer);
//! rectangle of selection ; adds new detected entities into the
//! picked list, removes the detected entities that were already stored...
Standard_EXPORT AIS_StatusOfPick ShiftSelect (const Standard_Integer XPMin, const Standard_Integer YPMin, const Standard_Integer XPMax, const Standard_Integer YPMax, const Handle(V3d_View)& aView, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT AIS_StatusOfPick ShiftSelect (const Standard_Integer theXPMin,
const Standard_Integer theYPMin,
const Standard_Integer theXPMax,
const Standard_Integer theYPMax,
const Handle(V3d_View)& theView,
const Standard_Boolean theToUpdateViewer);
//! Specify whether selected object must be hilighted when mouse cursor
//! is moved above it (in MoveTo method). By default this value is false and
@@ -956,7 +1034,8 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void SetCurrentObject (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetCurrentObject (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Allows to add or remove the object given to the list of current and highlight/unhighlight it
@@ -965,7 +1044,7 @@ public:
//! of the object is empty this method simply does nothing.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void AddOrRemoveCurrentObject (const Handle(AIS_InteractiveObject)& theObj,
const Standard_Boolean theIsToUpdateViewer = Standard_True);
const Standard_Boolean theIsToUpdateViewer);
//! Updates the list of current objects, i.e. hilights new
//! current objects, removes hilighting from former current objects.
@@ -1028,7 +1107,7 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void HilightCurrents (const Standard_Boolean theToUpdateViewer = Standard_True);
Standard_EXPORT void HilightCurrents (const Standard_Boolean theToUpdateViewer);
//! Removes highlighting from current objects.
//! Objects selected when there is no open local context
@@ -1039,7 +1118,7 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void UnhilightCurrents (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void UnhilightCurrents (const Standard_Boolean theToUpdateViewer);
//! Empties previous current objects in order to get the
//! current objects detected by the selector using
@@ -1052,7 +1131,7 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void ClearCurrents (const Standard_Boolean theToUpdateViewer = Standard_True);
Standard_EXPORT void ClearCurrents (const Standard_Boolean theToUpdateViewer);
//! @return current mouse-detected shape or empty (null) shape, if current interactive object
//! is not a shape (AIS_Shape) or there is no current mouse-detected interactive object at all.
@@ -1069,7 +1148,7 @@ public:
//! Marks owner given as selected and highlights it.
//! Performs selection filters check.
Standard_EXPORT void SetSelected (const Handle(SelectMgr_EntityOwner)& theOwners,
const Standard_Boolean theToUpdateViewer = Standard_True);
const Standard_Boolean theToUpdateViewer);
//! Puts the interactive object aniObj in the list of
//! selected objects.
@@ -1079,29 +1158,29 @@ public:
//! displayed but no viewer will be updated.
//! Performs selection filters check.
Standard_EXPORT void SetSelected (const Handle(AIS_InteractiveObject)& theObject,
const Standard_Boolean theToUpdateViewer = Standard_True);
const Standard_Boolean theToUpdateViewer);
//! Updates the list of selected objects:
//! i.e. highlights the newely selected ones and unhighlights previously selected objects.
Standard_EXPORT void UpdateSelected (const Standard_Boolean theToUpdateViewer = Standard_True);
Standard_EXPORT void UpdateSelected (const Standard_Boolean theToUpdateViewer);
//! Allows to highlight or unhighlight the owner given depending on its selection status
Standard_EXPORT void AddOrRemoveSelected (const Handle(AIS_InteractiveObject)& theObject,
const Standard_Boolean theToUpdateViewer = Standard_True);
const Standard_Boolean theToUpdateViewer);
//! Highlights selected objects.
//! If a local context is open and if updateviewer equals
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void HilightSelected (const Standard_Boolean theToUpdateViewer = Standard_True);
Standard_EXPORT void HilightSelected (const Standard_Boolean theToUpdateViewer);
//! Removes highlighting from selected objects.
//! If a local context is open and if updateviewer equals
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void UnhilightSelected (const Standard_Boolean theToUpdateViewer = Standard_True);
Standard_EXPORT void UnhilightSelected (const Standard_Boolean theToUpdateViewer);
//! Empties previous selected objects in order to get the
//! selected objects detected by the selector using
@@ -1110,17 +1189,18 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void ClearSelected (const Standard_Boolean theToUpdateViewer = Standard_True);
Standard_EXPORT void ClearSelected (const Standard_Boolean theToUpdateViewer);
//! No right to Add a selected Shape (Internal Management
//! of shape Selection).
//! A Previous selected shape may only be removed.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void AddOrRemoveSelected (const TopoDS_Shape& aShape, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void AddOrRemoveSelected (const TopoDS_Shape& theShape,
const Standard_Boolean theToUpdateViewer);
//! Allows to highlight or unhighlight the owner given depending on its selection status
Standard_EXPORT void AddOrRemoveSelected (const Handle(SelectMgr_EntityOwner)& theOwner,
const Standard_Boolean theToUpdateViewer = Standard_True);
const Standard_Boolean theToUpdateViewer);
//! Returns true is the owner given is selected
Standard_EXPORT Standard_Boolean IsSelected (const Handle(SelectMgr_EntityOwner)& theOwner) const;
@@ -1280,7 +1360,8 @@ public:
//! Interactive Functions can open local contexts
//! without necessarily warning the user.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void CloseLocalContext (const Standard_Integer Index = -1, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void CloseLocalContext (const Standard_Integer theIndex = -1,
const Standard_Boolean theToUpdateViewer = Standard_True);
//! returns -1 if no opened local context.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
@@ -1294,12 +1375,12 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void CloseAllContexts (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void CloseAllContexts (const Standard_Boolean theToUpdateViewer);
//! to be used only with no opened
//! local context.. displays and activates objects in their
//! original state before local contexts were opened...
Standard_EXPORT void ResetOriginalState (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void ResetOriginalState (const Standard_Boolean theToUpdateViewer);
//! clears Objects/Filters/Activated Modes list in the current opened local context.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
@@ -1387,7 +1468,9 @@ public:
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void SetTemporaryAttributes (const Handle(AIS_InteractiveObject)& anObj, const Handle(Prs3d_Drawer)& aDrawer, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SetTemporaryAttributes (const Handle(AIS_InteractiveObject)& theIObj,
const Handle(Prs3d_Drawer)& theDrawer,
const Standard_Boolean theToUpdateViewer);
//! Highlights, and removes highlights from, the displayed
@@ -1398,7 +1481,8 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void SubIntensityOn (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SubIntensityOn (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Removes the subintensity option for the entity aniobj.
@@ -1406,16 +1490,17 @@ public:
//! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is
//! displayed but no viewer will be updated.
Standard_EXPORT void SubIntensityOff (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SubIntensityOff (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! hilights/unhilights displayed objects which are displayed at
//! neutral state with subintensity color;
//! available only for active local context.
//! No effect if no local context.
Standard_EXPORT void SubIntensityOn (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SubIntensityOn (const Standard_Boolean theToUpdateViewer);
//! removes subintensity option for all objects.
Standard_EXPORT void SubIntensityOff (const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void SubIntensityOff (const Standard_Boolean theToUpdateViewer);
//! Allows you to add the filter aFilter to Neutral Point or
//! to a local context if one or more selection modes have been activated.
@@ -1562,7 +1647,13 @@ public:
//! Fits the view correspondingly to the bounds of selected objects.
//! Infinite objects are ignored if infinite state of AIS_InteractiveObject
//! is set to true.
Standard_EXPORT void FitSelected (const Handle(V3d_View)& theView, const Standard_Real theMargin = 0.01, const Standard_Boolean theToUpdate = Standard_True);
Standard_EXPORT void FitSelected (const Handle(V3d_View)& theView,
const Standard_Real theMargin,
const Standard_Boolean theToUpdate);
//! Fits the view correspondingly to the bounds of selected objects.
//! Infinite objects are ignored if infinite state of AIS_InteractiveObject is set to true.
Standard_EXPORT void FitSelected (const Handle(V3d_View)& theView);
Standard_EXPORT void DisplayActiveSensitive (const Handle(AIS_InteractiveObject)& anObject, const Handle(V3d_View)& aView);
@@ -1591,21 +1682,27 @@ protected:
Standard_EXPORT void GetDefModes (const Handle(AIS_InteractiveObject)& anIobj, Standard_Integer& Dmode, Standard_Integer& HiMod, Standard_Integer& SelMode) const;
Standard_EXPORT void EraseGlobal (const Handle(AIS_InteractiveObject)& anObj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void EraseGlobal (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
Standard_EXPORT void ClearGlobal (const Handle(AIS_InteractiveObject)& anObj, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void ClearGlobal (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
Standard_EXPORT void ClearGlobalPrs (const Handle(AIS_InteractiveObject)& anObj, const Standard_Integer aMode, const Standard_Boolean updateviewer = Standard_True);
Standard_EXPORT void ClearGlobalPrs (const Handle(AIS_InteractiveObject)& theObj,
const Standard_Integer theMode,
const Standard_Boolean theToUpdateViewer);
Standard_EXPORT void InitAttributes();
Standard_EXPORT Standard_Integer PurgeViewer (const Handle(V3d_Viewer)& Vwr);
//! UNKNOWN
Standard_EXPORT void redisplayPrsModes (const Handle(AIS_InteractiveObject)& theIObj, const Standard_Boolean theToUpdateViewer = Standard_True);
Standard_EXPORT void redisplayPrsModes (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! UNKNOWN
Standard_EXPORT void redisplayPrsRecModes (const Handle(AIS_InteractiveObject)& theIObj, const Standard_Boolean theToUpdateViewer = Standard_True);
Standard_EXPORT void redisplayPrsRecModes (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Boolean theToUpdateViewer);
//! Helper function to unhighlight all entity owners currently highlighted with seleciton color.
Standard_EXPORT void unhighlightOwners (const Handle(AIS_InteractiveObject)& theObject);

2
src/AIS/AIS_InteractiveContext_1.cxx
View File

@@ -754,7 +754,7 @@ void AIS_InteractiveContext::AddOrRemoveCurrentObject (const Handle(AIS_Interact
//=======================================================================
void AIS_InteractiveContext::UpdateCurrent()
{
UpdateSelected();
UpdateSelected (Standard_True);
}
//=======================================================================

4
src/AIS/AIS_LocalContext.cxx
View File

@@ -468,7 +468,7 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
// If subintensity used
else if (Att->IsSubIntensityOn())
{
myCTX->SubIntensityOff (aSelectable);
myCTX->SubIntensityOff (aSelectable, Standard_False);
}
// Deactivate stored selection modes
@@ -1001,7 +1001,7 @@ void AIS_LocalContext::ClearObjects()
else {
if (CurAtt->IsSubIntensityOn())
{
myCTX->SubIntensityOff(SO);
myCTX->SubIntensityOff(SO, Standard_False);
}
Standard_Integer DiMo = SO->HasDisplayMode()?
SO->DisplayMode():myCTX->DisplayMode();

1
src/AIS/AIS_Manipulator.cxx
View File

@@ -305,7 +305,6 @@ void AIS_Manipulator::Attach (const Handle(AIS_ManipulatorObjectSequence)& theOb
}
aContext->Load (this);
aContext->CurrentViewer()->RedrawImmediate();
}
if (theOptions.EnableModes)

2
src/AIS/AIS_Trihedron.cxx
View File

@@ -656,7 +656,7 @@ void AIS_Trihedron::SetContext(const Handle(AIS_InteractiveContext)& Ctx)
if (hasContext)
{
if (anAISContext->IsSelected (myShapes[anIdx]))
anAISContext->AddOrRemoveSelected (myShapes[anIdx]);
anAISContext->AddOrRemoveSelected (myShapes[anIdx], Standard_False);
anAISContext->Remove (myShapes[anIdx], Standard_False);
}

2
src/QABugs/QABugs_1.cxx
View File

@@ -371,7 +371,7 @@ static Standard_Integer OCC10bug (Draw_Interpretor& di, Standard_Integer argc, c
theAISPlaneTri->SetLength(Length);
GetMapOfAIS().Bind ( theAISPlaneTri, name);
aContext->Display(theAISPlaneTri );
aContext->Display (theAISPlaneTri, Standard_True);
}
Standard_Real getLength = theAISPlaneTri->GetLength();

28
src/QABugs/QABugs_11.cxx
View File

@@ -122,7 +122,7 @@ static Standard_Integer OCC128 (Draw_Interpretor& di, Standard_Integer /*argc*/
Graphic3d_MaterialAspect mat(Graphic3d_NOM_PLASTIC);
AS->SetMaterial(mat);
AS->SetColor(Quantity_NOC_RED);
myAISContext->Display(AS);
myAISContext->Display (AS, Standard_False);
gp_Trsf TouchTrsf;
TouchTrsf.SetTranslation(gp_Vec(20, 20, 0));
@@ -215,33 +215,35 @@ static Standard_Integer OCC136 (Draw_Interpretor& di, Standard_Integer argc, con
return 1;
}
anAISCtx->EraseAll();
anAISCtx->EraseAll (Standard_False);
//load primitives to context
Handle(AIS_InteractiveObject) aSh1 = new AIS_Shape(aBox);
anAISCtx->Display(aSh1);
anAISCtx->Display (aSh1, Standard_False);
Handle(AIS_InteractiveObject) aSh2 = new AIS_Shape(aSphere);
anAISCtx->Display(aSh2);
anAISCtx->Display (aSh2, Standard_False);
Handle(AIS_InteractiveObject) aSh3 = new AIS_Shape(aCone);
anAISCtx->Display(aSh3);
anAISCtx->Display (aSh3, Standard_False);
Handle(AIS_InteractiveObject) aSh4 = new AIS_Shape(aCyl);
anAISCtx->Display(aSh4);
anAISCtx->Display (aSh4, Standard_False);
//set selected
anAISCtx->InitSelected();
anAISCtx->AddOrRemoveSelected(aSh1);
anAISCtx->AddOrRemoveSelected(aSh2);
anAISCtx->AddOrRemoveSelected(aSh3);
anAISCtx->AddOrRemoveSelected(aSh4);
anAISCtx->AddOrRemoveSelected (aSh1, Standard_False);
anAISCtx->AddOrRemoveSelected (aSh2, Standard_False);
anAISCtx->AddOrRemoveSelected (aSh3, Standard_False);
anAISCtx->AddOrRemoveSelected (aSh4, Standard_False);
//remove all this objects from context
anAISCtx->Remove (aSh1, Standard_False);
anAISCtx->Remove (aSh2, Standard_False);
anAISCtx->Remove (aSh3, Standard_False);
anAISCtx->Remove (aSh4, Standard_False);
anAISCtx->UpdateCurrentViewer();
return 0;
}
@@ -639,7 +641,7 @@ static Standard_Integer OCC297 (Draw_Interpretor& di,Standard_Integer /*argc*/,
myAISContext->EraseAll(Standard_False);
Handle(Geom_CartesianPoint) GEOMPoint = new Geom_CartesianPoint(g_pnt);
Handle(AIS_Point) AISPoint = new AIS_Point(GEOMPoint);
myAISContext->Display(AISPoint);
myAISContext->Display (AISPoint, Standard_True);
BRepPrimAPI_MakeHalfSpace half_(sh_, g_pnt);
TopoDS_Solid sol1_ = half_.Solid();
@@ -4564,10 +4566,10 @@ static Standard_Integer OCC12584 (Draw_Interpretor& di, Standard_Integer argc, c
aCS->SetSize (aWinWidth, aWinHeight);
if ( !V.IsNull() ) {
if (mode == 0) {
aContext->Display (aCS);
aContext->Display (aCS, Standard_True);
}
if (mode == 1) {
aContext->Erase (aCS);
aContext->Erase (aCS, Standard_False);
V->UpdateLights();
V->Update();
}

3
src/QABugs/QABugs_14.cxx
View File

@@ -614,8 +614,7 @@ static Standard_Integer BUC60920(Draw_Interpretor& di, Standard_Integer /*argc*
myV3dView->Convert(Xv,Yv,Xp,Yp);
// cout<<Xp<<"\t"<<Yp<<endl;
myAISContext->MoveTo( Xp,Yp, myV3dView );
myAISContext->MoveTo( Xp,Yp, myV3dView );
myAISContext->MoveTo (Xp,Yp, myV3dView, Standard_True);
// if (myAISContext->IsHilighted(anAISShape))
// cout << "has hilighted shape : OK" << endl;

4
src/QABugs/QABugs_15.cxx
View File

@@ -46,14 +46,14 @@ static Standard_Integer BUC60720 (Draw_Interpretor& di,Standard_Integer argc,con
{
theObject1 = new QABugs_PresentableObject();
theObject1->SetDisplayMode(0);
myAISContext->Display(theObject1);
myAISContext->Display (theObject1, Standard_True);
}
} else if(Draw::Atoi(argv[1]) == 1) {
if ( theObject2.IsNull() )
{
theObject2 = new QABugs_PresentableObject();
theObject2->SetDisplayMode(1);
myAISContext->Display(theObject2);
myAISContext->Display (theObject2, Standard_True);
}
} else {
di << "Usage : " << argv[0] << " 0/1\n";

24
src/QABugs/QABugs_16.cxx
View File

@@ -145,7 +145,7 @@ static Standard_Integer BUC60814(Draw_Interpretor& di, Standard_Integer argc, c
Handle(AIS_InteractiveObject) aTrihedron;
Handle(Geom_Axis2Placement) aTrihedronAxis=new Geom_Axis2Placement(gp::XOY());
aTrihedron=new AIS_Trihedron(aTrihedronAxis);
myAISContext->Display(aTrihedron);
myAISContext->Display (aTrihedron, Standard_False);
//Circle
gp_Pnt P(10,10,10);
@@ -154,13 +154,13 @@ static Standard_Integer BUC60814(Draw_Interpretor& di, Standard_Integer argc, c
Handle(Geom_Circle) ahCircle=new Geom_Circle(aAx2,20);
Handle(AIS_InteractiveObject) aCircle=new AIS_Circle(ahCircle);
myAISContext->Display(aCircle);
myAISContext->Display (aCircle, Standard_False);
const Handle(Prs3d_Drawer)& aSelStyle = myAISContext->SelectionStyle();
aSelStyle->SetColor (Quantity_NOC_BLUE1);
myAISContext->AddOrRemoveSelected(aTrihedron);
myAISContext->AddOrRemoveSelected(aCircle);
myAISContext->AddOrRemoveSelected (aTrihedron, Standard_False);
myAISContext->AddOrRemoveSelected (aCircle, Standard_True);
return 0;
}
@@ -197,7 +197,7 @@ static Standard_Integer BUC60774 (Draw_Interpretor& theDi,
Standard_Integer aXPixMax = aWinWidth;
Standard_Integer aYPixMax = aWinHeight;
AIS_StatusOfPick aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView);
AIS_StatusOfPick aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView, Standard_False);
theDi << (aPickStatus == AIS_SOP_NothingSelected
? "status = AIS_SOP_NothingSelected : OK"
: "status = AIS_SOP_NothingSelected : bugged - Faulty ");
@@ -206,7 +206,7 @@ static Standard_Integer BUC60774 (Draw_Interpretor& theDi,
theDi.Eval ("box b 10 10 10");
theDi.Eval (" vdisplay b");
aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView);
aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView, Standard_False);
theDi << (aPickStatus == AIS_SOP_OneSelected
? "status = AIS_SOP_OneSelected : OK"
: "status = AIS_SOP_OneSelected : bugged - Faulty ");
@@ -215,7 +215,7 @@ static Standard_Integer BUC60774 (Draw_Interpretor& theDi,
theDi.Eval ("box w 20 20 20 20 20 20");
theDi.Eval (" vdisplay w");
aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView);
aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView, Standard_True);
theDi << (aPickStatus == AIS_SOP_SeveralSelected
? "status = AIS_SOP_SeveralSelected : OK"
: "status = AIS_SOP_SeveralSelected : bugged - Faulty ");
@@ -251,7 +251,7 @@ static Standard_Integer BUC60972 (Draw_Interpretor& di, Standard_Integer argc, c
di << argv[5] << " " << Draw::Atof(argv[4]) << "\n";
Handle(AIS_AngleDimension) aDim = new AIS_AngleDimension(aFirst, aSecond);
aContext->Display(aDim);
aContext->Display (aDim, Standard_True);
return 0;
}
@@ -338,7 +338,7 @@ static Standard_Integer OCC218bug (Draw_Interpretor& di, Standard_Integer argc,
theAISPlaneTri->SetYLabel(Ylabel);
GetMapOfAIS().Bind ( theAISPlaneTri, name);
aContext->Display(theAISPlaneTri );
aContext->Display (theAISPlaneTri, Standard_True);
}
return 0;
}
@@ -692,8 +692,8 @@ static Standard_Integer OCC301 (Draw_Interpretor& di, Standard_Integer argc, con
TopoDS_Edge E1 = BRepBuilderAPI_MakeEdge(p1, p2);
TopoDS_Edge E2 = BRepBuilderAPI_MakeEdge(p2, p3);
context->Display(new AIS_Shape(E1));
context->Display(new AIS_Shape(E2));
context->Display (new AIS_Shape(E1), Standard_False);
context->Display (new AIS_Shape(E2), Standard_True);
gp_Pnt plnpt(0, 0, 0);
gp_Dir plndir(0, 0, 1);
@@ -788,7 +788,7 @@ static Standard_Integer OCC70 (Draw_Interpretor& di, Standard_Integer argc, cons
Handle(V3d_View) V3dView = ViewerTest::CurrentView();
aContext->Select(Polyline,V3dView);
aContext->Select (Polyline, V3dView, Standard_False);
aContext->UpdateCurrentViewer();
return 0;

103
src/QABugs/QABugs_17.cxx
View File

@@ -94,7 +94,7 @@ static Standard_Integer BUC60842 (Draw_Interpretor& di, Standard_Integer /*argc*
if(!aContext.IsNull()) {
Handle(AIS_Shape) aisp =
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(curve2d, pln)).Edge());
aContext->Display (aisp);
aContext->Display (aisp, Standard_False);
}
Handle(Geom2d_Curve) fromcurve2d = GeomAPI::To2d (cir, pln);
@@ -103,7 +103,7 @@ static Standard_Integer BUC60842 (Draw_Interpretor& di, Standard_Integer /*argc*
if(!aContext.IsNull()) {
Handle(AIS_Shape) aisp =
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(fromcurve2d, pln)).Edge());
aContext->Display (aisp);
aContext->Display (aisp, Standard_False);
}
Geom2dAdaptor_Curve acur (curve2d), afromcur (fromcurve2d);
@@ -117,9 +117,11 @@ static Standard_Integer BUC60842 (Draw_Interpretor& di, Standard_Integer /*argc*
DrawTrSurf::Set(st,glin);
if(!aContext.IsNull()) {
Handle(AIS_Shape) aisp =
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(glin, pln)).Edge()); aContext->Display (aisp);
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(glin, pln)).Edge());
aContext->Display (aisp, Standard_False);
}
}
aContext->UpdateCurrentViewer();
di << " Is Done = \n" << (Standard_Integer) lintan.IsDone();
return 0;
}
@@ -210,7 +212,7 @@ static Standard_Integer BUC60970 (Draw_Interpretor& di, Standard_Integer argc, c
di << "total no of wires are ............. " << i << "\n";
TopoDS_Wire spineWire = bRepSpineWire.Wire();
aContext->Display(new AIS_Shape(spineWire));
aContext->Display (new AIS_Shape(spineWire), Standard_False);
DBRep::Set("slineW",spineWire);
@@ -226,7 +228,7 @@ static Standard_Integer BUC60970 (Draw_Interpretor& di, Standard_Integer argc, c
gp_Circ gpCirc(gpAx2, 2.5);
BRepBuilderAPI_MakeWire aMWire(BRepBuilderAPI_MakeEdge(new Geom_Circle(gpCirc)).Edge());
TopoDS_Wire topoWire(aMWire);
aContext->Display(new AIS_Shape(topoWire));
aContext->Display (new AIS_Shape(topoWire), Standard_False);
DBRep::Set("topoW",topoWire);
@@ -234,7 +236,7 @@ static Standard_Integer BUC60970 (Draw_Interpretor& di, Standard_Integer argc, c
bRepPipe.Add(topoWire);
bRepPipe.Build();
aContext->Display(new AIS_Shape(bRepPipe.Shape()));
aContext->Display (new AIS_Shape(bRepPipe.Shape()), Standard_True);
DBRep::Set(argv[2],bRepPipe.Shape());
@@ -260,7 +262,7 @@ static Standard_Integer BUC60818(Draw_Interpretor& di, Standard_Integer argc, c
Handle(AIS_Trihedron) aTrihedron;
Handle(Geom_Axis2Placement) aTrihedronAxis=new Geom_Axis2Placement(gp::XOY());
aTrihedron=new AIS_Trihedron(aTrihedronAxis);
myAISContext->Display(aTrihedron);
myAISContext->Display (aTrihedron, Standard_True);
Standard_DISABLE_DEPRECATION_WARNINGS
myAISContext->OpenLocalContext();
@@ -276,8 +278,8 @@ static Standard_Integer BUC60818(Draw_Interpretor& di, Standard_Integer argc, c
Standard_Integer Xp,Yp;
myV3dView->Convert(Xv,Yv,Xp,Yp);
myAISContext->MoveTo( Xp,Yp, myV3dView );
myAISContext->MoveTo( Xp,Yp, myV3dView );
myAISContext->MoveTo (Xp,Yp, myV3dView, Standard_False);
myAISContext->MoveTo (Xp,Yp, myV3dView, Standard_True);
if (myAISContext->HasDetected( ))
di << "has detected shape : OK" << "\n";
@@ -335,7 +337,7 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc,
Handle(AIS_LengthDimension) len = new AIS_LengthDimension(V2, V3, pln->Pln());
anAspect->ArrowAspect()->SetLength (30.0);
len->SetDimensionAspect (anAspect);
context->Display(len);
context->Display (len, Standard_False);
/***************************************/
//dimension "L 90"
/***************************************/
@@ -343,13 +345,13 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc,
len1->SetDimensionAspect (anAspect);
len1->SetFlyout (30.0);
anAspect->ArrowAspect()->SetLength (100.0);
context->Display(len1);
context->Display (len1, Standard_False);
/***************************************/
//dimension "L 150"
/***************************************/
Handle(AIS_LengthDimension) len2 = new AIS_LengthDimension(V1, V2, pln->Pln());
len2->SetDimensionAspect (anAspect);
context->Display(len2);
context->Display (len2, Standard_False);
/***************************************/
//dimension "R 88.58"
/***************************************/
@@ -357,7 +359,7 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc,
TopoDS_Edge E1 = BRepBuilderAPI_MakeEdge(cir,gp_Pnt(191.09,0,0.),gp_Pnt(191.09,-177.16,0.) );
Handle(AIS_RadiusDimension) dim1 = new AIS_RadiusDimension(E1);
dim1->SetDimensionAspect (anAspect);
context->Display(dim1);
context->Display (dim1, Standard_False);
/***************************************/
//dimension "R 43.80"
/***************************************/
@@ -366,7 +368,7 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc,
dim1 = new AIS_RadiusDimension(E_cir1);
anAspect->ArrowAspect()->SetLength (60.0);
dim1->SetDimensionAspect (anAspect);
context->Display(dim1);
context->Display (dim1, Standard_False);
/***************************************/
//dimension "R 17.86"
/***************************************/
@@ -375,7 +377,7 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc,
dim1 = new AIS_RadiusDimension(E_cir2);
anAspect->ArrowAspect()->SetLength (40.0);
dim1->SetDimensionAspect (anAspect);
context->Display(dim1);
context->Display (dim1, Standard_True);
return 0;
}
@@ -396,13 +398,13 @@ static Standard_Integer OCC138 (Draw_Interpretor& di, Standard_Integer /*argc*/
Handle(AIS_InteractiveObject) ais2 = new AIS_Shape(box2.Shape());
Handle(AIS_InteractiveObject) ais3 = new AIS_Shape(box3.Shape());
aContext->Display(ais1);
aContext->Display(ais2);
aContext->Display(ais3);
aContext->Display (ais1, Standard_False);
aContext->Display (ais2, Standard_False);
aContext->Display (ais3, Standard_False);
aContext->AddOrRemoveSelected(ais1);
aContext->AddOrRemoveSelected(ais2);
aContext->AddOrRemoveSelected(ais3);
aContext->AddOrRemoveSelected (ais1, Standard_False);
aContext->AddOrRemoveSelected (ais2, Standard_False);
aContext->AddOrRemoveSelected (ais3, Standard_False);
di << "\n No of currents = " << aContext->NbSelected();
@@ -413,10 +415,12 @@ static Standard_Integer OCC138 (Draw_Interpretor& di, Standard_Integer /*argc*/
{
di << "\n count is = " << count++;
Handle(AIS_InteractiveObject) ais = aContext->SelectedInteractive();
aContext->AddOrRemoveSelected(ais);
aContext->AddOrRemoveSelected (ais, Standard_False);
aContext->InitSelected();
}
aContext->UpdateCurrentViewer();
return 0;
}
@@ -576,7 +580,7 @@ static Standard_Integer OCC232 (Draw_Interpretor& di, Standard_Integer /*argc*/
builder.Add(comp, cs2);
Handle(AIS_Shape) ais = new AIS_Shape(comp);
aContext->Display(ais);
aContext->Display (ais, Standard_False);
TopExp_Explorer exp(comp, TopAbs_COMPSOLID);
while(exp.More())
@@ -589,10 +593,13 @@ static Standard_Integer OCC232 (Draw_Interpretor& di, Standard_Integer /*argc*/
Handle (StdSelect_ShapeTypeFilter) filt = new StdSelect_ShapeTypeFilter(TopAbs_COMPSOLID);
aContext->AddFilter(filt);
Standard_DISABLE_DEPRECATION_WARNINGS
aContext->CloseAllContexts();
aContext->CloseAllContexts (Standard_False);
aContext->OpenLocalContext();
aContext->ActivateStandardMode(TopAbs_SOLID);
Standard_ENABLE_DEPRECATION_WARNINGS
aContext->UpdateCurrentViewer();
return 0;
}
@@ -612,13 +619,13 @@ static Standard_Integer OCC138LC (Draw_Interpretor& di, Standard_Integer /*argc
Handle(AIS_InteractiveObject) ais2 = new AIS_Shape(box2.Shape());
Handle(AIS_InteractiveObject) ais3 = new AIS_Shape(box3.Shape());
aContext->Display(ais1);
aContext->Display(ais2);
aContext->Display(ais3);
aContext->Display (ais1, Standard_False);
aContext->Display (ais2, Standard_False);
aContext->Display (ais3, Standard_False);
aContext->AddOrRemoveSelected(ais1);
aContext->AddOrRemoveSelected(ais2);
aContext->AddOrRemoveSelected(ais3);
aContext->AddOrRemoveSelected (ais1, Standard_False);
aContext->AddOrRemoveSelected (ais2, Standard_False);
aContext->AddOrRemoveSelected (ais3, Standard_False);
di << "\n No of selected = " << aContext->NbSelected();
@@ -629,10 +636,12 @@ static Standard_Integer OCC138LC (Draw_Interpretor& di, Standard_Integer /*argc
{
di << "\n count is = %d" << count++;
Handle(AIS_InteractiveObject) ais = aContext->SelectedInteractive();
aContext->AddOrRemoveSelected(ais);
aContext->AddOrRemoveSelected (ais, Standard_False);
aContext->InitSelected();
}
aContext->UpdateCurrentViewer();
return 0;
}
@@ -934,7 +943,7 @@ static Standard_Integer OCC813 (Draw_Interpretor& di, Standard_Integer argc,cons
if(!aContext.IsNull()) {
Handle(AIS_Shape) aisp =
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(curve2d, pln)).Edge());
aContext->Display (aisp);
aContext->Display (aisp, Standard_False);
}
//This does not give any solutions.
@@ -951,10 +960,16 @@ static Standard_Integer OCC813 (Draw_Interpretor& di, Standard_Integer argc,cons
DrawTrSurf::Set(st,glin);
if(!aContext.IsNull()) {
Handle(AIS_Shape) aisp =
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(glin, pln)).Edge()); aContext->Display (aisp);
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(glin, pln)).Edge());
aContext->Display (aisp, Standard_False);
}
}
if (!aContext.IsNull())
{
aContext->UpdateCurrentViewer();
}
return 0;
}
@@ -995,12 +1010,12 @@ static Standard_Integer OCC814 (Draw_Interpretor& di, Standard_Integer argc,cons
if(!aContext.IsNull()) {
Handle(AIS_Shape) aisp =
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(curve2d, pln)).Edge());
aContext->Display (aisp);
aContext->Display (aisp, Standard_False);
}
if(!aContext.IsNull()) {
Handle(AIS_Shape) aisp =
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(fromcurve2d, pln)).Edge());
aContext->Display (aisp);
aContext->Display (aisp, Standard_False);
}
Geom2dAdaptor_Curve acur(curve2d), afromcur(fromcurve2d);
@@ -1022,10 +1037,16 @@ static Standard_Integer OCC814 (Draw_Interpretor& di, Standard_Integer argc,cons
DrawTrSurf::Set(st,glin);
if(!aContext.IsNull()) {
Handle(AIS_Shape) aisp =
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(glin, pln)).Edge()); aContext->Display (aisp);
new AIS_Shape (BRepBuilderAPI_MakeEdge(GeomAPI::To3d(glin, pln)).Edge());
aContext->Display (aisp, Standard_False);
}
}
if (!aContext.IsNull())
{
aContext->UpdateCurrentViewer();
}
return 0;
}
@@ -1254,7 +1275,7 @@ static Standard_Integer OCC1174_1 (Draw_Interpretor& di, Standard_Integer argc,
aDrawer->SetShadingAspect (aShadingAspect);
anAISContext->Display(anAisIO, 1, 0);
anAISContext->Display (anAisIO, 1, 0, Standard_True);
Standard_Real r, g, b;
aShadingAspect->Color(Aspect_TOFM_FRONT_SIDE).Values(r,g,b, Quantity_TOC_RGB);
@@ -1287,8 +1308,8 @@ static Standard_Integer OCC1174_2 (Draw_Interpretor& di, Standard_Integer argc,
TopoDS_Shape sh = DBRep::Get(argv[1]);
Handle(AIS_Shape) ais = new AIS_Shape(sh);
AISContext->Display(ais,1,0);
AISContext->SetMaterial(ais,Graphic3d_NOM_SHINY_PLASTIC);
AISContext->Display (ais, 1, 0, Standard_False);
AISContext->SetMaterial (ais, Graphic3d_NOM_SHINY_PLASTIC, Standard_False);
Quantity_Color colf(0.0, 0.4, 0.0, Quantity_TOC_RGB);
Quantity_Color colb(0.0, 0.0, 0.6, Quantity_TOC_RGB);
@@ -1310,7 +1331,7 @@ static Standard_Integer OCC1174_2 (Draw_Interpretor& di, Standard_Integer argc,
back.SetTransparency(0.2);
sa->SetMaterial(back,Aspect_TOFM_BACK_SIDE);
AISContext->Redisplay(ais,1,0);
AISContext->Redisplay (ais, 1, 0);
return 0;
}
@@ -1471,7 +1492,7 @@ static Standard_Integer OCC2569 (Draw_Interpretor& di, Standard_Integer argc, co
}
TopoDS_Edge sh = BRepBuilderAPI_MakeEdge(bez).Edge();
Handle(AIS_Shape) ais = new AIS_Shape(sh);
aContext->Display(ais);
aContext->Display (ais, Standard_True);
DrawTrSurf::Set(argv[2],bez);
return 0;
}

49
src/QABugs/QABugs_19.cxx
View File

@@ -1285,8 +1285,8 @@ static Standard_Integer OCC24012 (Draw_Interpretor& di, Standard_Integer argc, c
{
TopoDS_Shape rshape = anormpro.Projection();
Handle(AIS_InteractiveObject) myShape = new AIS_Shape (rshape);
myAISContext->SetColor(myShape, Quantity_Color(Quantity_NOC_YELLOW));
myAISContext->Display(myShape, Standard_True);
myAISContext->SetColor (myShape, Quantity_Color(Quantity_NOC_YELLOW), Standard_False);
myAISContext->Display (myShape, Standard_True);
}
return 0;
@@ -1845,7 +1845,7 @@ static Standard_Integer OCC24622 (Draw_Interpretor& /*theDi*/, Standard_Integer
Handle(AIS_TexturedShape) aTexturedShape = new AIS_TexturedShape (aBlankShape);
aTexturedShape->SetTexturePixMap (anImage);
anAISContext->Display (aTexturedShape, 3, 0);
anAISContext->Display (aTexturedShape, 3, 0, Standard_True);
return 0;
}
@@ -3304,7 +3304,7 @@ static Standard_Integer OCC26172 (Draw_Interpretor& theDI, Standard_Integer theA
BRepBuilderAPI_MakeEdge anEdgeBuilder (aStart, anEnd);
TopoDS_Edge anEdge = anEdgeBuilder.Edge();
Handle(AIS_Shape) aTestAISShape = new AIS_Shape (anEdge);
anAISContext->Display (aTestAISShape);
anAISContext->Display (aTestAISShape, Standard_True);
// 2. activate it in selection modes
TColStd_SequenceOfInteger aModes;
@@ -3398,16 +3398,17 @@ static Standard_Integer OCC26284 (Draw_Interpretor& theDI, Standard_Integer theA
BRepPrimAPI_MakeSphere aSphereBuilder (gp_Pnt (0.0, 0.0, 0.0), 1.0);
Handle(AIS_Shape) aSphere = new AIS_Shape (aSphereBuilder.Shape());
anAISContext->Display (aSphere);
anAISContext->Display (aSphere, Standard_False);
for (Standard_Integer aChildIdx = 0; aChildIdx < 5; ++aChildIdx)
{
BRepPrimAPI_MakeSphere aBuilder (gp_Pnt (1.0 + aChildIdx, 1.0 + aChildIdx, 1.0 + aChildIdx), 1.0);
Handle(AIS_Shape) aChild = new AIS_Shape (aBuilder.Shape());
aSphere->AddChild (aChild);
anAISContext->Display (aChild);
anAISContext->Display (aChild, Standard_False);
}
anAISContext->RecomputeSelectionOnly (aSphere);
anAISContext->UpdateCurrentViewer();
return 0;
}
@@ -4170,16 +4171,16 @@ static Standard_Integer OCC26462 (Draw_Interpretor& theDI, Standard_Integer /*th
Handle(AIS_InteractiveObject) aBox2 = new AIS_Shape (aBuilder2.Shape());
const Handle(AIS_InteractiveContext) aCtx = ViewerTest::GetAISContext();
aCtx->Display (aBox1, 0, 2);
aCtx->Display (aBox2, 0, 2);
aCtx->Display (aBox1, 0, 2, Standard_False);
aCtx->Display (aBox2, 0, 2, Standard_False);
ViewerTest::CurrentView()->FitAll();
aCtx->SetWidth (aBox1, 3);
aCtx->SetWidth (aBox2, 3);
aCtx->SetWidth (aBox1, 3, Standard_False);
aCtx->SetWidth (aBox2, 3, Standard_False);
aCtx->MoveTo (305, 322, ViewerTest::CurrentView());
aCtx->ShiftSelect();
aCtx->MoveTo (103, 322, ViewerTest::CurrentView());
aCtx->ShiftSelect();
aCtx->MoveTo (305, 322, ViewerTest::CurrentView(), Standard_False);
aCtx->ShiftSelect (Standard_False);
aCtx->MoveTo (103, 322, ViewerTest::CurrentView(), Standard_False);
aCtx->ShiftSelect (Standard_False);
if (aCtx->NbSelected() != 0)
{
theDI << "ERROR: no boxes must be selected!\n";
@@ -4188,15 +4189,15 @@ static Standard_Integer OCC26462 (Draw_Interpretor& theDI, Standard_Integer /*th
aCtx->SetSelectionSensitivity (aBox1, 2, 5);
aCtx->MoveTo (305, 322, ViewerTest::CurrentView());
aCtx->ShiftSelect();
aCtx->MoveTo (305, 322, ViewerTest::CurrentView(), Standard_False);
aCtx->ShiftSelect (Standard_False);
if (aCtx->NbSelected() != 1)
{
theDI << "ERROR: b1 was not selected\n";
return 1;
}
aCtx->MoveTo (103, 322, ViewerTest::CurrentView());
aCtx->ShiftSelect();
aCtx->MoveTo (103, 322, ViewerTest::CurrentView(), Standard_False);
aCtx->ShiftSelect (Standard_True);
if (aCtx->NbSelected() != 1)
{
theDI << "ERROR: b2 is selected after b1's tolerance increased\n";
@@ -4885,8 +4886,8 @@ static Standard_Integer BUC26658 (Draw_Interpretor& theDI,
Standard_Integer Xp,Yp;
myV3dView->Convert(Xv,Yv,Xp,Yp);
aContext->MoveTo(Xp,Yp, myV3dView);
aContext->Select();
aContext->MoveTo (Xp, Yp, myV3dView, Standard_False);
aContext->Select (Standard_False);
bool aHasSelected = false;
for (aContext->InitSelected(); aContext->MoreSelected() && !aHasSelected; aContext->NextSelected()) {
Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
@@ -4912,7 +4913,7 @@ static Standard_Integer BUC26658 (Draw_Interpretor& theDI,
Standard_ENABLE_DEPRECATION_WARNINGS
// check that there are no selected vertices
aContext->Select();
aContext->Select (Standard_True);
aHasSelected = false;
for (aContext->InitSelected(); aContext->MoreSelected() && !aHasSelected; aContext->NextSelected()) {
Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
@@ -5149,7 +5150,7 @@ static Standard_Integer OCC27523 (Draw_Interpretor& theDI, Standard_Integer theA
BRepBuilderAPI_MakeEdge anEdgeBuilder (aStart, anEnd);
TopoDS_Edge anEdge = anEdgeBuilder.Edge();
Handle(AIS_InteractiveObject) aTestAISShape = new AIS_Shape (anEdge);
anAISContext->Display (aTestAISShape);
anAISContext->Display (aTestAISShape, Standard_False);
// activate it in selection modes
TColStd_SequenceOfInteger aModes;
@@ -5171,7 +5172,7 @@ static Standard_Integer OCC27523 (Draw_Interpretor& theDI, Standard_Integer theA
Handle(AIS_Shape)::DownCast (aTestAISShape)->Set (aVertexShape);
aTestAISShape->Redisplay();
anAISContext->AddOrRemoveSelected (aTestAISShape);
anAISContext->AddOrRemoveSelected (aTestAISShape, Standard_True);
bool aValidShapeType = false;
for (anAISContext->InitSelected(); anAISContext->MoreSelected(); anAISContext->NextSelected())
@@ -5252,7 +5253,7 @@ static Standard_Integer OCC27700 (Draw_Interpretor& /*theDI*/, Standard_Integer
return 1;
}
Handle(OCC27700_Text) aPresentation = new OCC27700_Text();
aContext->Display (aPresentation);
aContext->Display (aPresentation, Standard_True);
return 0;
}

43
src/QABugs/QABugs_3.cxx
View File

@@ -244,7 +244,7 @@ static Standard_Integer BUC60632(Draw_Interpretor& di, Standard_Integer /*n*/, c
di << "use 'vinit' command before " << a[0] << "\n";
return -1;
}
myAIScontext->EraseAll();
myAIScontext->EraseAll (Standard_False);
TopoDS_Vertex V1 = BRepBuilderAPI_MakeVertex(gp_Pnt(0,0,0));
TopoDS_Vertex V2 = BRepBuilderAPI_MakeVertex(gp_Pnt(10,10,0));
@@ -252,8 +252,8 @@ static Standard_Integer BUC60632(Draw_Interpretor& di, Standard_Integer /*n*/, c
Handle(AIS_Shape) Ve1 = new AIS_Shape(V1);
Handle(AIS_Shape) Ve2 = new AIS_Shape(V2);
myAIScontext->Display(Ve1);
myAIScontext->Display(Ve2);
myAIScontext->Display (Ve1, Standard_False);
myAIScontext->Display (Ve2, Standard_False);
Handle(Geom_Plane) Plane1 = new Geom_Plane(gp_Pnt(0,0,0),gp_Dir(0,0,1));
TCollection_ExtendedString Ext1("Dim1");
@@ -268,8 +268,8 @@ static Standard_Integer BUC60632(Draw_Interpretor& di, Standard_Integer /*n*/, c
anAspect->ArrowAspect()->SetLength (1.0);
Dim1->SetDimensionAspect (anAspect);
myAIScontext->SetDisplayMode(Dim1, Draw::Atoi(a[1]));
myAIScontext->Display(Dim1);
myAIScontext->SetDisplayMode (Dim1, Draw::Atoi(a[1]), Standard_False);
myAIScontext->Display (Dim1, Standard_True);
return 0;
}
@@ -553,8 +553,8 @@ static Standard_Integer BUC60792(Draw_Interpretor& di, Standard_Integer /*argc*/
Handle(Geom2d_Curve) gcir1 = GeomAPI::To2d(gcir, pln->Pln());
TopoDS_Shape sh1 = BRepBuilderAPI_MakeEdge(gcir1, pln).Shape();
Handle(AIS_Shape) ais1 = new AIS_Shape(sh1);
aContext->SetColor(ais1, Quantity_NOC_INDIANRED);
aContext->Display(ais1);
aContext->SetColor (ais1, Quantity_NOC_INDIANRED, Standard_False);
aContext->Display (ais1, Standard_False);
DBRep::Set("sh0",sh1);
gp_Pnt2d thepoint;
// local_get_2Dpointfrom3Dpoint(pt3d, pln->Pln(), thepoint);
@@ -575,10 +575,10 @@ static Standard_Integer BUC60792(Draw_Interpretor& di, Standard_Integer /*argc*/
DBRep::Set(aStr,sh);
Handle(AIS_Shape) ais = new AIS_Shape(sh);
if( i ==1 )
aContext->SetColor(ais, Quantity_NOC_GREEN);
aContext->SetColor (ais, Quantity_NOC_GREEN, Standard_False);
if( i == 2)
aContext->SetColor(ais, Quantity_NOC_HOTPINK);
aContext->Display(ais);
aContext->SetColor (ais, Quantity_NOC_HOTPINK, Standard_False);
aContext->Display (ais, Standard_False);
Standard_Real ParSol1, ParSol2, ParArg1, ParArg2;
gp_Pnt2d PntSol1, PntSol2;
cirtanrad.Tangency1(i, ParSol1, ParArg1, PntSol1);
@@ -587,6 +587,7 @@ static Standard_Integer BUC60792(Draw_Interpretor& di, Standard_Integer /*argc*/
printf("%f\t%f\t\t%f\t%f\n",ParSol2, ParArg2,PntSol2.X(),PntSol2.Y());
}
}
aContext->UpdateCurrentViewer();
return 0;
}
@@ -646,7 +647,7 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co
ais1 = new AIS_Shape(F1);
DBRep::Set("F1",F1);
aContext->SetMaterial(ais1,Graphic3d_NOM_ALUMINIUM,Standard_False);
aContext->Display(ais1);
aContext->Display (ais1, Standard_False);
BRep_Builder B;
TopoDS_Shell shell;
B.MakeShell(shell);
@@ -683,7 +684,7 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co
FP = BRepBuilderAPI_MakeFace(mkw.Wire());
ais2 = new AIS_Shape( FP );
aContext->SetMaterial(ais2,Graphic3d_NOM_ALUMINIUM,Standard_False);
aContext->Display( ais2 );
aContext->Display (ais2, Standard_False);
DBRep::Set("FP",FP);
@@ -693,7 +694,7 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co
BRepBuilderAPI_MakeFace bzf2( offsurf, Precision::Confusion() );
TopoDS_Face F2= bzf2.Face();
Handle(AIS_Shape) ais22 = new AIS_Shape(F2);
aContext->Display(ais22);
aContext->Display (ais22, Standard_False);
DBRep::Set("F2",F2);
//step 3. filleting the patch.
@@ -714,7 +715,7 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co
FP1 = fillet.Shape();
ais2 = new AIS_Shape( FP1 );
aContext->SetMaterial(ais2,Graphic3d_NOM_ALUMINIUM,Standard_False);
aContext->Display( ais2 );
aContext->Display (ais2, Standard_False);
DBRep::Set("FP1",FP1);
@@ -732,7 +733,7 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co
myWire->Add((BRepBuilderAPI_MakeEdge(projCurve)).Edge());
}
Handle(AIS_Shape) ais33 = new AIS_Shape( myWire->Wire() );
aContext->Display(ais33);
aContext->Display (ais33, Standard_True);
DBRep::Set("Wire",myWire->Wire());
@@ -859,14 +860,14 @@ static Standard_Integer BUC60856(Draw_Interpretor& di, Standard_Integer /*argc*/
Handle(Geom_RectangularTrimmedSurface) S = GC_MakeTrimmedCone (P1, P2, R1, R2).Value();
TopoDS_Shape myshape = BRepBuilderAPI_MakeFace(S, Precision::Confusion()).Shape();
Handle(AIS_Shape) ais1 = new AIS_Shape(myshape);
aContext->Display(ais1);
aContext->SetColor(ais1, Quantity_NOC_BLUE1);
aContext->Display (ais1, Standard_False);
aContext->SetColor (ais1, Quantity_NOC_BLUE1, Standard_False);
Handle(Geom_RectangularTrimmedSurface) S2 = GC_MakeTrimmedCone (P1, P2,R1, 0).Value();
TopoDS_Shape myshape2 = BRepBuilderAPI_MakeFace(S2, Precision::Confusion()).Shape();
Handle(AIS_Shape) ais2 = new AIS_Shape(myshape2);
aContext->Display(ais2);
aContext->SetColor(ais2, Quantity_NOC_RED);
aContext->Display (ais2, Standard_False);
aContext->SetColor (ais2, Quantity_NOC_RED, Standard_False);
return 0;
}
@@ -956,7 +957,7 @@ static Standard_Integer BUC60876_ (Draw_Interpretor& di,
Handle(AIS_InteractiveObject) anIO = new AIS_Shape(aShape);
// Handle(AIS_InteractiveObject) anIOa = ViewerTest::GetAISShapeFromName(argv[1]);
anIO->SetHilightMode((argc == 3) ? Draw::Atoi(argv[2]) : 1);
aContext->Display(anIO);
aContext->Display (anIO, Standard_True);
return 0;
}
@@ -1705,7 +1706,7 @@ static Standard_Integer BUC60951_(Draw_Interpretor& di, Standard_Integer argc, c
}
Handle(AIS_Shape) res = new AIS_Shape(sh);
myContext->Display( res );
myContext->Display (res, Standard_True);
return 0;
}

2
src/QABugs/QABugs_4.cxx
View File

@@ -63,7 +63,7 @@ static Standard_Integer BUC60738 (Draw_Interpretor& di, Standard_Integer /*argc*
theDrawer->SetShadingAspect(theShadingAspect);
theAISShape->SetAttributes(theDrawer);
aContext->Display(theAISShape);
aContext->Display (theAISShape, Standard_True);
return 0;
}

18
src/QABugs/QABugs_8.cxx
View File

@@ -66,9 +66,9 @@ static Standard_Integer OCC172 (Draw_Interpretor& di, Standard_Integer /*argc*/
AIS_ListIteratorOfListOfInteractive It;
for (It.Initialize(aListOfIO);It.More();It.Next())
{
aContext->AddOrRemoveSelected(It.Value());
aContext->AddOrRemoveSelected (It.Value(), Standard_False);
}
aContext->UpdateCurrentViewer();
return 0;
}
@@ -99,13 +99,15 @@ static Standard_Integer OCC204 (Draw_Interpretor& di, Standard_Integer argc, co
Handle(AIS_InteractiveObject) ais2 = new AIS_Shape(box2.Shape());
Handle(AIS_InteractiveObject) ais3 = new AIS_Shape(box3.Shape());
aContext->Display(ais1);
aContext->Display(ais2);
aContext->Display(ais3);
aContext->Display (ais1, Standard_False);
aContext->Display (ais2, Standard_False);
aContext->Display (ais3, Standard_False);
aContext->AddOrRemoveSelected(ais1);
aContext->AddOrRemoveSelected(ais2);
aContext->AddOrRemoveSelected(ais3);
aContext->AddOrRemoveSelected (ais1, Standard_False);
aContext->AddOrRemoveSelected (ais2, Standard_False);
aContext->AddOrRemoveSelected (ais3, Standard_False);
aContext->UpdateCurrentViewer();
//printf("\n No of currents = %d", aContext->NbCurrents());

12
src/QABugs/QABugs_9.cxx
View File

@@ -46,22 +46,22 @@ static Standard_Integer BUC60857 (Draw_Interpretor& di, Standard_Integer /*argc*
TopoDS_Shape myshape = BRepBuilderAPI_MakeFace(S, Precision::Confusion()).Shape();
DBRep::Set("BUC60857_BLUE",myshape);
Handle(AIS_Shape) ais1 = new AIS_Shape(myshape);
aContext->Display(ais1);
aContext->SetColor(ais1, Quantity_NOC_BLUE1);
aContext->Display (ais1, Standard_False);
aContext->SetColor (ais1, Quantity_NOC_BLUE1, Standard_False);
Handle(Geom_RectangularTrimmedSurface) S2 = GC_MakeTrimmedCone (P1, P2, R1, 0).Value();
TopoDS_Shape myshape2 = BRepBuilderAPI_MakeFace(S2, Precision::Confusion()).Shape();
DBRep::Set("BUC60857_RED",myshape2);
Handle(AIS_Shape) ais2 = new AIS_Shape(myshape2);
aContext->Display(ais2);
aContext->SetColor(ais2, Quantity_NOC_RED);
aContext->Display (ais2, Standard_False);
aContext->SetColor (ais2, Quantity_NOC_RED, Standard_False);
Handle(Geom_RectangularTrimmedSurface) S3 = GC_MakeTrimmedCone (P1, P2, R2, R1).Value();
TopoDS_Shape myshape3 = BRepBuilderAPI_MakeFace(S3, Precision::Confusion()).Shape();
DBRep::Set("BUC60857_GREEN",myshape3);
Handle(AIS_Shape) ais3 = new AIS_Shape(myshape3);
aContext->Display(ais3);
aContext->SetColor(ais3, Quantity_NOC_GREEN);
aContext->Display (ais3, Standard_False);
aContext->SetColor (ais3, Quantity_NOC_GREEN, Standard_True);
return 0;
}

6
src/QADraw/QADraw.cxx
View File

@@ -107,9 +107,9 @@ static int VTrihedronOrigins(Draw_Interpretor& di,
di<<argv[1]<<"_X "<<argv[1]<<"_Y "<<argv[1]<<"_Z\n";
//try to draw them:
TheAISContext()->Display(XLine);
TheAISContext()->Display(YLine);
TheAISContext()->Display(ZLine);
TheAISContext()->Display (XLine, Standard_False);
TheAISContext()->Display (YLine, Standard_False);
TheAISContext()->Display (ZLine, Standard_True);
return 0;
}

4
src/TPrsStd/TPrsStd_AISPresentation.cxx
View File

@@ -772,7 +772,7 @@ void TPrsStd_AISPresentation::AISUpdate()
if ( !(anObj == myAIS) )
{
if ( !aContext.IsNull() )
aContext->Remove(myAIS);
aContext->Remove (myAIS, Standard_True);
// Driver has built new AIS.
myAIS = anObj;
@@ -893,7 +893,7 @@ void TPrsStd_AISPresentation::AISDisplay()
if ( !myAIS.IsNull() )
{
if ( !(myAIS->GetContext()).IsNull() && (myAIS->GetContext()) != aContext )
myAIS->GetContext()->Remove(myAIS);
myAIS->GetContext()->Remove (myAIS, Standard_False);
if ( IsDisplayed() && aContext->IsDisplayed(myAIS) )
return;

25
src/ViewerTest/ViewerTest.cxx
View File

@@ -714,7 +714,7 @@ static int visos (Draw_Interpretor& di, Standard_Integer argc, const char** argv
CurDrawer->SetVIsoAspect(CopyIsoAspect(aVIso, aNbVIsos));
TheAISContext()->SetLocalAttributes
(aShape, CurDrawer, Standard_False);
TheAISContext()->Redisplay(aShape);
TheAISContext()->Redisplay (aShape, Standard_False);
} else {
di << "Number of isos for " << argv[i] << " : "
<< aUIso->Number() << " " << aVIso->Number() << "\n";
@@ -1225,9 +1225,9 @@ static int VSubInt(Draw_Interpretor& di, Standard_Integer argc, const char** arg
IO = Handle(AIS_InteractiveObject)::DownCast(GetMapOfAIS().Find2(name));
if (!IO.IsNull()) {
if(On==1)
Ctx->SubIntensityOn(IO);
Ctx->SubIntensityOn(IO, Standard_True);
else
Ctx->SubIntensityOff(IO);
Ctx->SubIntensityOff(IO, Standard_True);
}
}
else return 1;
@@ -3373,7 +3373,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
anAISContext->SetDisplayMode (aTexturedIO, AIS_Shaded, Standard_False);
if (aPreviousMode == 3)
{
anAISContext->RecomputePrsOnly (aTexturedIO);
anAISContext->RecomputePrsOnly (aTexturedIO, Standard_False);
}
anAISContext->Display (aTexturedIO, Standard_True);
@@ -3468,7 +3468,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
if (aTexturedIO->DisplayMode() == 3 || aPreviousMode == 3)
{
anAISContext->RecomputePrsOnly (aTexturedIO);
anAISContext->RecomputePrsOnly (aTexturedIO, Standard_True);
}
else
{
@@ -3957,7 +3957,7 @@ static int VDisplay2 (Draw_Interpretor& theDI,
if (aSelMode == -1)
{
aCtx->Erase (aShape);
aCtx->Erase (aShape, Standard_False);
}
aCtx->Display (aShape, aDispMode, aSelMode,
Standard_False, aShape->AcceptShapeDecomposition(),
@@ -4054,7 +4054,7 @@ static int VShading(Draw_Interpretor& ,Standard_Integer argc, const char** argv)
else
TheAISContext()->SetDeviationCoefficient(TheAisIO,0.0008,Standard_True);
TheAISContext()->Redisplay(TheAisIO);
TheAISContext()->Redisplay (TheAisIO, Standard_True);
return 0;
}
//==============================================================================
@@ -4891,7 +4891,7 @@ static int VPickShape( Draw_Interpretor& di, Standard_Integer argc, const char**
Handle(AIS_Shape) newsh = new AIS_Shape(PickSh);
GetMapOfAIS().Bind(newsh, name);
TheAISContext()->Display(newsh);
TheAISContext()->Display (newsh, Standard_True);
di<<"Nom de la shape pickee : "<<name.ToCString()<<"\n";
}
@@ -4921,9 +4921,10 @@ static int VPickShape( Draw_Interpretor& di, Standard_Integer argc, const char**
Handle(AIS_Shape) newsh = new AIS_Shape(PickSh);
GetMapOfAIS().Bind(newsh, name);
di<<"display of picke shape #"<<i<<" - nom : "<<name.ToCString()<<"\n";
TheAISContext()->Display(newsh);
TheAISContext()->Display (newsh, Standard_False);
}
TheAISContext()->UpdateCurrentViewer();
}
}
return 0;
@@ -4971,9 +4972,11 @@ static int VPickSelected (Draw_Interpretor& , Standard_Integer theArgNb, const c
Handle(AIS_Shape) aNewShape = new AIS_Shape (aShape);
GetMapOfAIS().Bind (aNewShape, aCurrentName);
TheAISContext()->Display (aNewShape);
TheAISContext()->Display (aNewShape, Standard_False);
}
TheAISContext()->UpdateCurrentViewer();
return 0;
}
@@ -5163,7 +5166,7 @@ static Standard_Integer vr(Draw_Interpretor& , Standard_Integer , const char** a
DBRep::Set(a[1], shape);
Handle(AIS_InteractiveContext) Ctx = ViewerTest::GetAISContext();
Handle(AIS_Shape) ais = new AIS_Shape(shape);
Ctx->Display(ais);
Ctx->Display (ais, Standard_True);
return 0;
}

4
src/ViewerTest/ViewerTest_FilletCommands.cxx
View File

@@ -135,9 +135,9 @@ static Standard_Integer VBLEND(Draw_Interpretor& di, Standard_Integer narg, cons
Handle(AIS_InteractiveContext) Ctx = ViewerTest::GetAISContext();
Ctx->Erase(Start,Standard_False);
if(Ctx->IsDisplayed(AS))
Ctx->Redisplay(AS);
Ctx->Redisplay (AS, Standard_True);
else
Ctx->Display(AS);
Ctx->Display (AS, Standard_True);
return 0;
}

58
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@@ -575,7 +575,7 @@ static int VAxisBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
Handle(Geom_Line) myLine=new Geom_Line (p1 ,myVect );
Handle(AIS_Axis) TheAxis=new AIS_Axis (myLine );
GetMapOfAIS().Bind (TheAxis,name);
TheAISContext()->Display(TheAxis);
TheAISContext()->Display(TheAxis, Standard_True);
}
// Pas d'arguments
@@ -613,7 +613,7 @@ static int VAxisBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
Handle(Geom_Axis1Placement) OrigineAndVect=new Geom_Axis1Placement (A,D);
Handle(AIS_Axis) TheAxis=new AIS_Axis (OrigineAndVect);
GetMapOfAIS().Bind (TheAxis,name);
TheAISContext()->Display(TheAxis);
TheAISContext()->Display (TheAxis, Standard_True);
}
else
{
@@ -627,7 +627,7 @@ static int VAxisBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
Handle(Geom_Axis1Placement) OrigineAndVect=new Geom_Axis1Placement (A,D);
Handle(AIS_Axis) TheAxis=new AIS_Axis (OrigineAndVect);
GetMapOfAIS().Bind (TheAxis,name);
TheAISContext()->Display(TheAxis);
TheAISContext()->Display (TheAxis, Standard_True);
}
}
@@ -662,7 +662,7 @@ static int VAxisBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
Handle(Geom_Axis1Placement) OrigineAndVect=new Geom_Axis1Placement (B,D);
Handle(AIS_Axis) TheAxis=new AIS_Axis (OrigineAndVect);
GetMapOfAIS().Bind (TheAxis,name);
TheAISContext()->Display(TheAxis);
TheAISContext()->Display (TheAxis, Standard_True);
}
@@ -697,7 +697,7 @@ static int VAxisBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
Handle(Geom_Axis1Placement) OrigineAndVect=new Geom_Axis1Placement (B,D);
Handle(AIS_Axis) TheAxis=new AIS_Axis (OrigineAndVect);
GetMapOfAIS().Bind (TheAxis,name);
TheAISContext()->Display(TheAxis);
TheAISContext()->Display (TheAxis, Standard_True);
}
@@ -745,7 +745,7 @@ static int VPointBuilder(Draw_Interpretor& di, Standard_Integer argc, const char
Handle(Geom_CartesianPoint ) myGeomPoint= new Geom_CartesianPoint (thecoord[0],thecoord[1],thecoord[2]);
Handle(AIS_Point) myAISPoint=new AIS_Point(myGeomPoint );
GetMapOfAIS().Bind (myAISPoint,name);
TheAISContext()->Display(myAISPoint);
TheAISContext()->Display (myAISPoint, Standard_True);
}
// Il n'a pas d'arguments
@@ -769,7 +769,7 @@ static int VPointBuilder(Draw_Interpretor& di, Standard_Integer argc, const char
Handle(Geom_CartesianPoint) myGeomPoint= new Geom_CartesianPoint (A );
Handle(AIS_Point) myAISPoint = new AIS_Point (myGeomPoint );
GetMapOfAIS().Bind(myAISPoint,name);
TheAISContext()->Display(myAISPoint);
TheAISContext()->Display (myAISPoint, Standard_True);
}
else
{
@@ -782,7 +782,7 @@ static int VPointBuilder(Draw_Interpretor& di, Standard_Integer argc, const char
Handle(Geom_CartesianPoint) myGeomPointM= new Geom_CartesianPoint ( (A.X()+B.X())/2 , (A.Y()+B.Y())/2 , (A.Z()+B.Z())/2 );
Handle(AIS_Point) myAISPointM = new AIS_Point (myGeomPointM );
GetMapOfAIS().Bind(myAISPointM,name);
TheAISContext()->Display(myAISPointM);
TheAISContext()->Display (myAISPointM, Standard_True);
}
}
@@ -945,7 +945,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
anAISPlane->SetTypeOfSensitivity (Select3D_TypeOfSensitivity (aType));
}
}
TheAISContext()->Display(anAISPlane);
TheAISContext()->Display (anAISPlane, Standard_True);
}
// The first argument is an AIS_Axis
@@ -1003,7 +1003,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
anAISPlane->SetTypeOfSensitivity (Select3D_TypeOfSensitivity (aType));
}
}
TheAISContext()->Display(anAISPlane);
TheAISContext()->Display (anAISPlane, Standard_True);
}
// The first argumnet is an AIS_Plane
@@ -1058,7 +1058,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
anAISPlane->SetTypeOfSensitivity (Select3D_TypeOfSensitivity (aType));
}
}
TheAISContext()->Display(anAISPlane);
TheAISContext()->Display (anAISPlane, Standard_True);
}
// Error
else
@@ -1118,7 +1118,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
Handle(Geom_Plane) aGeomPlane = MkPlane.Value();
Handle(AIS_Plane) anAISPlane = new AIS_Plane (aGeomPlane);
GetMapOfAIS().Bind (anAISPlane, aName);
TheAISContext()->Display(anAISPlane);
TheAISContext()->Display (anAISPlane, Standard_True);
}
}
else if (aShapes.Extent() == 3)
@@ -1145,7 +1145,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
Handle(Geom_Plane) aGeomPlane = MkPlane.Value();
Handle(AIS_Plane) anAISPlane = new AIS_Plane (aGeomPlane);
GetMapOfAIS().Bind (anAISPlane, aName);
TheAISContext()->Display(anAISPlane);
TheAISContext()->Display (anAISPlane, Standard_True);
}
else
{
@@ -1189,7 +1189,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
Handle(Geom_Plane) aGeomPlane = MkPlane.Value();
Handle(AIS_Plane) anAISPlane = new AIS_Plane (aGeomPlane);
GetMapOfAIS().Bind (anAISPlane ,aName);
TheAISContext()->Display(anAISPlane);
TheAISContext()->Display (anAISPlane, Standard_True);
}
else if (aShapeA.ShapeType() == TopAbs_FACE)
{
@@ -1201,7 +1201,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
Handle(Geom_Plane) aGeomPlane = new Geom_Plane(aPlane);
Handle(AIS_Plane) anAISPlane = new AIS_Plane(aGeomPlane);
GetMapOfAIS().Bind (anAISPlane, aName);
TheAISContext()->Display(anAISPlane);
TheAISContext()->Display (anAISPlane, Standard_True);
}
else
{
@@ -1253,7 +1253,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
Handle(Geom_Plane) aGeomPlane = new Geom_Plane (aPlane);
Handle(AIS_Plane) aAISPlane = new AIS_Plane (aGeomPlane, A);
GetMapOfAIS().Bind (aAISPlane ,aName);
TheAISContext()->Display(aAISPlane);
TheAISContext()->Display (aAISPlane, Standard_True);
}
else
{
@@ -1325,7 +1325,7 @@ static Standard_Integer VPlaneBuilder (Draw_Interpretor& /*di*/,
gp_Pnt aMiddle ((Aa.X()+Ab.X() )/2 ,(Aa.Y()+Ab.Y() )/2 ,(Aa.Z()+Ab.Z() )/2 );
Handle(AIS_Plane) anAISPlane = new AIS_Plane (aGeomPlane, aMiddle);
GetMapOfAIS().Bind (anAISPlane, aName);
TheAISContext()->Display(anAISPlane);
TheAISContext()->Display (anAISPlane, Standard_True);
}
else
{
@@ -1506,7 +1506,7 @@ static int VLineBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
// Les deux points sont OK...Construction de l'AIS_Line (en faite, le segment AB)
Handle(AIS_Line) theAISLine= new AIS_Line(myCartPointA,myCartPointB );
GetMapOfAIS().Bind(theAISLine,argv[1] );
TheAISContext()->Display(theAISLine );
TheAISContext()->Display (theAISLine, Standard_True);
}
@@ -1527,7 +1527,7 @@ static int VLineBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
Handle(AIS_Line) theAISLine= new AIS_Line(myCartPointA,myCartPointB );
GetMapOfAIS().Bind(theAISLine,argv[1] );
TheAISContext()->Display(theAISLine );
TheAISContext()->Display (theAISLine, Standard_True);
}
@@ -1563,7 +1563,7 @@ static int VLineBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
Handle(AIS_Line) theAISLine= new AIS_Line(myCartPointA,myCartPointB );
GetMapOfAIS().Bind(theAISLine,argv[1] );
TheAISContext()->Display(theAISLine );
TheAISContext()->Display (theAISLine, Standard_True);
}
return 0;
@@ -1709,7 +1709,7 @@ void DisplayCircle (Handle (Geom_Circle) theGeomCircle,
GetMapOfAIS().Bind(aCircle, theName);
// Display the circle
TheAISContext()->Display(aCircle);
TheAISContext()->Display (aCircle, Standard_True);
}
@@ -2874,7 +2874,7 @@ static int VComputeHLR (Draw_Interpretor& di,
// create an AIS shape and display it
Handle(AIS_Shape) anObject = new AIS_Shape (aHlrShape);
GetMapOfAIS().Bind (anObject, aHlrName);
aContextAIS->Display (anObject);
aContextAIS->Display (anObject, Standard_False);
aContextAIS->UpdateCurrentViewer ();
@@ -3718,7 +3718,7 @@ static Standard_Integer VConnect (Draw_Interpretor& /*di*/,
GetMapOfAIS().Bind (anOriginObject, aName);
// Display connected object
TheAISContext()->Display (anOriginObject);
TheAISContext()->Display (anOriginObject, Standard_True);
return 0;
}
@@ -3964,7 +3964,7 @@ static Standard_Integer VAddConnected (Draw_Interpretor& di,
aTrsf.SetTranslation (gp_Vec (aX, aY, aZ));
anAssembly->Connect (anIObj, aTrsf);
TheAISContext()->Display (anAssembly);
TheAISContext()->Display (anAssembly, Standard_False);
TheAISContext()->RecomputeSelectionOnly (anAssembly);
aContext->UpdateCurrentViewer();
@@ -4413,7 +4413,7 @@ static Standard_Integer VTriangle (Draw_Interpretor& /*di*/,
GetMapOfAIS().Bind(aTriangle, aName);
// Display triangle
TheAISContext()->Display(aTriangle);
TheAISContext()->Display (aTriangle, Standard_True);
return 0;
}
@@ -4528,7 +4528,7 @@ static Standard_Integer VSegment (Draw_Interpretor& /*di*/,
GetMapOfAIS().Bind(aSegment, aName);
// Display segment
TheAISContext()->Display(aSegment);
TheAISContext()->Display (aSegment, Standard_True);
return 0;
}
@@ -4788,7 +4788,7 @@ static Standard_Integer VShowFaceBoundary (Draw_Interpretor& /*di*/,
aDrawer->SetFaceBoundaryAspect (aBoundaryAspect);
TheAISContext()->Redisplay (anInterObj);
TheAISContext()->Redisplay (anInterObj, Standard_True);
return 0;
}
@@ -5464,7 +5464,7 @@ static int VSetEdgeType (Draw_Interpretor& theDI,
// Update shape presentation as aspect parameters were changed
if (isForceRedisplay)
{
ViewerTest::GetAISContext()->Redisplay (anObject);
ViewerTest::GetAISContext()->Redisplay (anObject, Standard_False);
}
else
{
@@ -5528,7 +5528,7 @@ static int VUnsetEdgeType (Draw_Interpretor& theDI,
// Update shape presentation as aspect parameters were changed
if (isForceRedisplay)
{
ViewerTest::GetAISContext()->Redisplay (anObject);
ViewerTest::GetAISContext()->Redisplay (anObject, Standard_False);
}
else
{

8
src/ViewerTest/ViewerTest_RelationCommands.cxx
View File

@@ -1758,7 +1758,7 @@ static int VMoveDim (Draw_Interpretor& theDi, Standard_Integer theArgNum, const
Handle(AIS_Relation) aRelation = Handle(AIS_Relation)::DownCast (aPickedObj);
aPoint = Get3DPointAtMousePosition();
aRelation->SetPosition (aPoint);
TheAISContext()->Redisplay (aRelation);
TheAISContext()->Redisplay (aRelation, Standard_True);
}
else
{
@@ -1795,7 +1795,7 @@ static int VMoveDim (Draw_Interpretor& theDi, Standard_Integer theArgNum, const
}
aDim->SetTextPosition (aPoint);
TheAISContext()->Redisplay (aDim);
TheAISContext()->Redisplay (aDim, Standard_True);
}
}
@@ -1805,13 +1805,13 @@ static int VMoveDim (Draw_Interpretor& theDi, Standard_Integer theArgNum, const
{
Handle(AIS_Relation) aRelation = Handle(AIS_Relation)::DownCast (aPickedObj);
aRelation->SetPosition (aPoint);
TheAISContext()->Redisplay (aRelation);
TheAISContext()->Redisplay (aRelation, Standard_True);
}
else
{
Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast (aPickedObj);
aDim->SetTextPosition (aPoint);
TheAISContext()->Redisplay (aDim);
TheAISContext()->Redisplay (aDim, Standard_True);
}
return 0;

34
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@@ -1437,7 +1437,7 @@ void VT_ProcessKeyPress (const char* buf_ret)
Handle(AIS_InteractiveContext) Ctx = ViewerTest::GetAISContext();
if(Ctx->NbSelected()==0)
Ctx->SetDisplayMode(AIS_Shaded);
Ctx->SetDisplayMode (AIS_Shaded, Standard_True);
else{
for(Ctx->InitSelected();Ctx->MoreSelected();Ctx->NextSelected())
Ctx->SetDisplayMode(Ctx->SelectedInteractive(),1,Standard_False);
@@ -1451,7 +1451,7 @@ void VT_ProcessKeyPress (const char* buf_ret)
Handle(AIS_InteractiveContext) Ctx = ViewerTest::GetAISContext();
if(Ctx->NbSelected()==0)
Ctx->SetDisplayMode(AIS_WireFrame);
Ctx->SetDisplayMode (AIS_WireFrame, Standard_True);
else{
for(Ctx->InitSelected();Ctx->MoreSelected();Ctx->NextSelected())
Ctx->UnsetDisplayMode(Ctx->SelectedInteractive(),Standard_False);
@@ -1484,7 +1484,7 @@ void VT_ProcessKeyPress (const char* buf_ret)
std::cout << "setup WireFrame display mode" << std::endl;
Handle(AIS_InteractiveContext) Ctx = ViewerTest::GetAISContext();
if(Ctx->NbSelected()==0)
Ctx->SetDisplayMode(AIS_WireFrame);
Ctx->SetDisplayMode (AIS_WireFrame, Standard_True);
else{
for(Ctx->InitSelected();Ctx->MoreSelected();Ctx->NextSelected())
Ctx->SetDisplayMode(Ctx->SelectedInteractive(),0,Standard_False);
@@ -1899,7 +1899,7 @@ static LRESULT WINAPI AdvViewerWindowProc( HWND hwnd,
if (!GetActiveAISManipulator().IsNull())
{
GetActiveAISManipulator()->StopTransform();
ViewerTest::GetAISContext()->ClearSelected();
ViewerTest::GetAISContext()->ClearSelected (Standard_True);
}
if (ViewerTest::GetAISContext()->IsDisplayed (GetRubberBand()))
@@ -1919,7 +1919,7 @@ static LRESULT WINAPI AdvViewerWindowProc( HWND hwnd,
if (!GetActiveAISManipulator().IsNull())
{
GetActiveAISManipulator()->StopTransform (Standard_False);
ViewerTest::GetAISContext()->ClearSelected();
ViewerTest::GetAISContext()->ClearSelected (Standard_True);
}
IsDragged = Standard_False;
}
@@ -2340,24 +2340,24 @@ int ViewerMainLoop(Standard_Integer argc, const char** argv)
if( DragFirst )
if( ShiftPressed )
{
aContext->ShiftSelect();
aContext->ShiftSelect (Standard_True);
}
else
{
aContext->Select();
aContext->Select (Standard_True);
}
else
if( ShiftPressed )
{
aContext->ShiftSelect( min( X_ButtonPress, X_Motion ), min( Y_ButtonPress, Y_Motion ),
max( X_ButtonPress, X_Motion ), max( Y_ButtonPress, Y_Motion ),
ViewerTest::CurrentView());
aContext->ShiftSelect(Min(X_ButtonPress, X_Motion), Min(Y_ButtonPress, Y_Motion),
Max(X_ButtonPress, X_Motion), Max(Y_ButtonPress, Y_Motion),
ViewerTest::CurrentView(), Standard_True);
}
else
{
aContext->Select( min( X_ButtonPress, X_Motion ), min( Y_ButtonPress, Y_Motion ),
max( X_ButtonPress, X_Motion ), max( Y_ButtonPress, Y_Motion ),
ViewerTest::CurrentView() );
aContext->Select(Min(X_ButtonPress, X_Motion), Min(Y_ButtonPress, Y_Motion),
Max(X_ButtonPress, X_Motion), Max(Y_ButtonPress, Y_Motion),
ViewerTest::CurrentView(), Standard_True);
}
else
VT_ProcessButton3Release();
@@ -4916,7 +4916,7 @@ static int VLayerLine(Draw_Interpretor& di, Standard_Integer argc, const char**
static Handle (V3d_LineItem) aLine;
if (!aLine.IsNull())
{
aContext->Erase (aLine);
aContext->Erase (aLine, Standard_False);
}
aLine = new V3d_LineItem (X1, Y1, X2, Y2,
aLineType, aWidth,
@@ -6940,7 +6940,7 @@ static Standard_Integer VChangeSelected (Draw_Interpretor& di,
return 1;
}
aContext->AddOrRemoveSelected(anAISObject);
aContext->AddOrRemoveSelected(anAISObject, Standard_True);
}
return 0;
}
@@ -9781,7 +9781,7 @@ static int VManipulator (Draw_Interpretor& theDi,
aManipulator->Detach();
aMapAIS.UnBind2 (aName);
ViewerTest::GetAISContext()->Remove (aManipulator);
ViewerTest::GetAISContext()->Remove (aManipulator, Standard_True);
return 0;
}
@@ -9950,7 +9950,7 @@ static int VManipulator (Draw_Interpretor& theDi,
aManipulator->Transform (aT);
}
ViewerTest::GetAISContext()->Redisplay (aManipulator);
ViewerTest::GetAISContext()->Redisplay (aManipulator, Standard_True);
return 0;
}

2
src/XDEDRAW/XDEDRAW.cxx
View File

@@ -992,7 +992,7 @@ static Standard_Integer XShowFaceBoundary (Draw_Interpretor& di,
aDrawer->SetFaceBoundaryAspect (aBoundaryAspect);
aContext->Redisplay (anInteractive);
aContext->Redisplay (anInteractive, Standard_True);
return 0;
}

28
src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
View File

@@ -389,7 +389,7 @@ static Standard_Integer setcolor
if( aContext.IsNull() )
di << "The context is null\n";
else
aContext->Redisplay( aMesh );
aContext->Redisplay (aMesh, Standard_True);
}
}
return 0;
@@ -435,7 +435,7 @@ static Standard_Integer meshmat
if( aContext.IsNull() )
di << "The context is null\n";
else
aContext->Redisplay( aMesh );
aContext->Redisplay (aMesh, Standard_True);
}
}
return 0;
@@ -459,7 +459,7 @@ static Standard_Integer shrink
if( aContext.IsNull() )
di << "The context is null\n";
else
aContext->Redisplay( aMesh );
aContext->Redisplay (aMesh, Standard_True);
}
}
return 0;
@@ -487,7 +487,7 @@ static Standard_Integer closed (Draw_Interpretor& theDI, Standard_Integer theArg
}
else
{
aContext->Redisplay (aMesh);
aContext->Redisplay (aMesh, Standard_True);
}
}
}
@@ -519,7 +519,7 @@ static Standard_Integer mdisplay
}
Standard_ENABLE_DEPRECATION_WARNINGS
aContext->Display( aMesh );
aContext->Display (aMesh, Standard_True);
}
}
}
@@ -549,7 +549,7 @@ static Standard_Integer merase
}
Standard_ENABLE_DEPRECATION_WARNINGS
aContext->Erase( aMesh );
aContext->Erase (aMesh, Standard_True);
}
}
else
@@ -606,10 +606,10 @@ static Standard_Integer hidesel
}
}
}
aContext->ClearSelected();
aContext->ClearSelected (Standard_False);
aMesh->SetHiddenNodes( aHiddenNodes );
aMesh->SetHiddenElems( aHiddenElements );
aContext->Redisplay( aMesh );
aContext->Redisplay (aMesh, Standard_True);
}
return 0;
@@ -660,7 +660,7 @@ static Standard_Integer showonly
}
aMesh->SetHiddenNodes( aHiddenNodes );
aMesh->SetHiddenElems( aHiddenElements );
aContext->Redisplay( aMesh );
aContext->Redisplay (aMesh, Standard_True);
}
return 0;
@@ -690,7 +690,7 @@ static Standard_Integer showall
{
aMesh->SetHiddenNodes( new TColStd_HPackedMapOfInteger() );
aMesh->SetHiddenElems( new TColStd_HPackedMapOfInteger() );
aContext->Redisplay( aMesh );
aContext->Redisplay (aMesh, Standard_True);
}
return 0;
@@ -851,7 +851,7 @@ static Standard_Integer meshcolors( Draw_Interpretor& di,
aMesh->GetDrawer()->SetBoolean (MeshVS_DA_ColorReflection, aReflection != 0);
anIC->Redisplay( aMesh );
anIC->Redisplay (aMesh, Standard_True);
}
else
{
@@ -1000,7 +1000,7 @@ static Standard_Integer meshvectors( Draw_Interpretor& di,
aMesh->GetDrawer()->SetDouble ( MeshVS_DA_VectorArrowPart, anArrowPart );
}
anIC->Redisplay( aMesh );
anIC->Redisplay (aMesh, Standard_True);
return 0;
}
@@ -1123,7 +1123,7 @@ static Standard_Integer meshdeform( Draw_Interpretor& di,
aMesh->SetDataSource(aDefDS);
anIC->Redisplay( aMesh );
anIC->Redisplay (aMesh, Standard_False);
Handle( V3d_View ) aView = ViewerTest::CurrentView();
if ( !aView.IsNull() )
@@ -1177,7 +1177,7 @@ static Standard_Integer mesh_edge_width( Draw_Interpretor& di,
}
aDrawer->SetDouble( MeshVS_DA_EdgeWidth, aWidth );
anIC->Redisplay( aMesh );
anIC->Redisplay (aMesh, Standard_True);
}
catch ( Standard_Failure )
{