0023710: Simplification of presentation managment classes

Merge PrsMgr_Presentation3d into PrsMgr_Presentation
Cosmetics

src/AIS/AIS_ConnectedInteractive.cxx

@@ -22,7 +22,7 @@
 #include <Geom_Transformation.hxx>
 
 #include <PrsMgr_ModedPresentation.hxx>
-#include <PrsMgr_Presentation3d.hxx>
+#include <PrsMgr_Presentation.hxx>
 #include <OSD_Timer.hxx>
 
 
@@ -84,18 +84,19 @@ Connect(const Handle(AIS_InteractiveObject)& anotherIobj,
 
 //=======================================================================
 //function : Disconnect
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 void AIS_ConnectedInteractive::Disconnect()
 {
-  for(Standard_Integer i =1;i<=myPresentations.Length();i++)
+  for(Standard_Integer aPrsIter = 1; aPrsIter <= myPresentations.Length(); ++aPrsIter)
+  {
+    const Handle(PrsMgr_Presentation)& aPrs = myPresentations (aPrsIter).Presentation();
+    if (!aPrs.IsNull())
     {
-      Handle(PrsMgr_Presentation3d) P = Handle(PrsMgr_Presentation3d)::DownCast(myPresentations(i).Presentation());
-      if(!P.IsNull()) {
-	P->Presentation()->DisconnectAll(Graphic3d_TOC_DESCENDANT);
-      }
+      aPrs->Presentation()->DisconnectAll (Graphic3d_TOC_DESCENDANT);
     }
+  }
 }
 //=======================================================================
 //function : Compute

src/AIS/AIS_InteractiveObject.cxx

@@ -23,16 +23,9 @@
 //			instead a restricted object NameOfColor. 
 //			Add SetCurrentFacingModel() method
 
-#define IMP020200	//GG Add SetTransformation() method
-
-#define IMP140200	//GG Add HasPresentation() and Presentation() methods
-//			     Add SetAspect() method.
-
 #define BUC60632	//GG 15/03/00 Add protection on SetDisplayMode()
 //			method, compute only authorized presentation.
 
-#define IMP220501	//GG CADPAK_V2 Update selection properly
-
 #define OCC708          //SAV unsetting transformation correctly
 
 #include <AIS_InteractiveObject.ixx>
@@ -550,33 +543,31 @@ void AIS_InteractiveObject::SetInfiniteState(const Standard_Boolean aFlag)
       P->SetInfiniteState(myInfiniteState);}
 }
 
-#ifdef IMP020200
 //=======================================================================
 //function : SetTransformation
-//purpose  : 
+//purpose  :
 //=======================================================================
-void AIS_InteractiveObject::SetTransformation(const Handle(Geom_Transformation)& aTrsf, const Standard_Boolean postConcatenate, const Standard_Boolean updateSelection) {
+void AIS_InteractiveObject::SetTransformation (const Handle(Geom_Transformation)& theTrsf,
+                                               const Standard_Boolean             theToPostConcatenate,
+                                               const Standard_Boolean             theToUpdateSelection)
+{
+  if (GetContext().IsNull())
+  {
+    return;
+  }
 
-  if(!GetContext().IsNull()){
-    const PrsMgr_Presentations& prs = Presentations(); 
-    Handle(Prs3d_Presentation) P;
-    Standard_Integer mode;
-    myHasTransformation = Standard_True;
-    for( Standard_Integer i=1 ; i<=prs.Length() ; i++ ) {
-      mode = prs(i).Mode();
-      P = GetContext()->MainPrsMgr()->CastPresentation(this,mode)->Presentation();
-      if( postConcatenate ) P->Multiply(aTrsf);
-      else     	            P->Transform(aTrsf);
-      if( updateSelection ) {
-#ifdef IMP220501
-        myCTXPtr->ClearSelected(Standard_True);
-	myCTXPtr->RecomputeSelectionOnly(this);
-#else
-        if( HasSelection(mode) ) {
-          UpdateSelection(mode);      
-        }
-#endif
-      }
+  const PrsMgr_Presentations& aPrsList = Presentations();
+  myHasTransformation = Standard_True;
+  for (Standard_Integer aPrsIter = 1; aPrsIter <= aPrsList.Length(); ++aPrsIter)
+  {
+    const Standard_Integer aMode = aPrsList (aPrsIter).Mode();
+    Handle(Prs3d_Presentation) aPrs = GetContext()->MainPrsMgr()->Presentation (this, aMode)->Presentation();
+    theToPostConcatenate ? aPrs->Multiply  (theTrsf)
+                         : aPrs->Transform (theTrsf);
+    if (theToUpdateSelection)
+    {
+      myCTXPtr->ClearSelected (Standard_True);
+      myCTXPtr->RecomputeSelectionOnly (this);
     }
   }
 }
@@ -598,21 +589,22 @@ Handle(Geom_Transformation) trsf;
 
 //=======================================================================
 //function : Transformation
-//purpose  : 
+//purpose  :
 //=======================================================================
-Handle(Geom_Transformation) AIS_InteractiveObject::Transformation() {
-Handle(Geom_Transformation) trsf; 
-
-  if(!GetContext().IsNull() ) {
-    const PrsMgr_Presentations& prs = Presentations(); 
-    if( prs.Length() > 0 ) {
-      Handle(Prs3d_Presentation) P = 
-	  GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation();
-      trsf = P->Transformation();
-    }
+Handle(Geom_Transformation) AIS_InteractiveObject::Transformation()
+{
+  if (GetContext().IsNull())
+  {
+    return Handle(Geom_Transformation)();
   }
 
-  return trsf;
+  const PrsMgr_Presentations& aPrsList = Presentations();
+  if (aPrsList.Length() > 0)
+  {
+    Handle(Prs3d_Presentation) aPrs = GetContext()->MainPrsMgr()->Presentation (this, 1)->Presentation();
+    return aPrs->Transformation();
+  }
+  return Handle(Geom_Transformation)();
 }
 
 //=======================================================================
@@ -623,36 +615,26 @@ Standard_Boolean AIS_InteractiveObject::HasTransformation() const {
 
   return myHasTransformation;
 }
-#endif
 
-#ifdef IMP140200
 //=======================================================================
 //function : HasPresentation
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Boolean AIS_InteractiveObject::HasPresentation() const {
-
-  if( !GetContext().IsNull() && 
-	GetContext()->MainPrsMgr()->HasPresentation(this,myDisplayMode) ) {
-    return Standard_True;
-  }
-
-  return Standard_False;
+Standard_Boolean AIS_InteractiveObject::HasPresentation() const
+{
+  return !GetContext().IsNull()
+       && GetContext()->MainPrsMgr()->HasPresentation (this, myDisplayMode);
 }
 
 //=======================================================================
 //function : Presentation
-//purpose  : 
+//purpose  :
 //=======================================================================
-Handle(Prs3d_Presentation) AIS_InteractiveObject::Presentation() const {
-Handle(Prs3d_Presentation) prs;
-
-  if( HasPresentation() ) {
-    prs = GetContext()->MainPrsMgr()->
-		CastPresentation(this,myDisplayMode)->Presentation();
-  }
-
-  return prs;
+Handle(Prs3d_Presentation) AIS_InteractiveObject::Presentation() const
+{
+  return HasPresentation()
+       ? GetContext()->MainPrsMgr()->Presentation (this, myDisplayMode)->Presentation()
+       : Handle(Prs3d_Presentation)();
 }
 
 //=======================================================================
@@ -698,9 +680,6 @@ void AIS_InteractiveObject::SetAspect(const Handle(Prs3d_BasicAspect)& anAspect,
     }
   }
 }
-#endif
-
-// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
 
 //=======================================================================
 //function : SetPolygonOffsets 
@@ -716,12 +695,11 @@ void AIS_InteractiveObject::SetPolygonOffsets(const Standard_Integer    aMode,
   myDrawer->ShadingAspect()->Aspect()->SetPolygonOffsets( aMode, aFactor, aUnits );
 
   // Modify existing presentations 
-  Handle(Graphic3d_Structure) aStruct;
-  for( Standard_Integer i = 1, n = myPresentations.Length(); i <= n; i++ ) {
-    Handle(PrsMgr_Presentation3d) aPrs3d =
-      Handle(PrsMgr_Presentation3d)::DownCast( myPresentations(i).Presentation() );
+  for (Standard_Integer aPrsIter = 1, n = myPresentations.Length(); aPrsIter <= n; ++aPrsIter)
+  {
+    const Handle(PrsMgr_Presentation)& aPrs3d = myPresentations (aPrsIter).Presentation();
     if ( !aPrs3d.IsNull() ) {
-      aStruct = Handle(Graphic3d_Structure)::DownCast( aPrs3d->Presentation() );
+      const Handle(Graphic3d_Structure)& aStruct = aPrs3d->Presentation();
       if( !aStruct.IsNull() ) {
         aStruct->SetPrimitivesAspect( myDrawer->ShadingAspect()->Aspect() );
         // Workaround for issue 23115: Need to update also groups, because their
@@ -750,7 +728,6 @@ void AIS_InteractiveObject::SetPolygonOffsets(const Standard_Integer    aMode,
   }
 }
 
-
 //=======================================================================
 //function : HasPolygonOffsets 
 //purpose  : 
@@ -773,4 +750,3 @@ void AIS_InteractiveObject::PolygonOffsets(Standard_Integer&    aMode,
   if( HasPolygonOffsets() )
     myDrawer->ShadingAspect()->Aspect()->PolygonOffsets( aMode, aFactor, aUnits );
 }
-// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 

src/AIS/AIS_LocalContext.cxx

@@ -1195,7 +1195,7 @@ Standard_Boolean AIS_LocalContext::ImmediateAdd (const Handle(AIS_InteractiveObj
     return Standard_False;
   }
 
-  myMainPM->AddToImmediateList (myMainPM->CastPresentation (theObj, theMode)->Presentation());
+  myMainPM->AddToImmediateList (myMainPM->Presentation (theObj, theMode)->Presentation());
   return Standard_True;
 }
 

src/AIS/AIS_MultipleConnectedInteractive.cxx

@@ -22,7 +22,7 @@
 #include <AIS_MultipleConnectedInteractive.ixx>
 
 #include <PrsMgr_ModedPresentation.hxx>
-#include <PrsMgr_Presentation3d.hxx>
+#include <PrsMgr_Presentation.hxx>
 
 static Standard_Boolean IsInSeq (const AIS_SequenceOfInteractive&      theSeq,
 				 const Handle(AIS_InteractiveObject)&  theItem) 
@@ -113,11 +113,12 @@ void AIS_MultipleConnectedInteractive::Disconnect(const Handle(AIS_InteractiveOb
 
 void AIS_MultipleConnectedInteractive::DisconnectAll ()
 {
-/*  for(Standard_Integer i =1;i<=myPresentations.Length();i++)
+/*  for (Standard_Integer aPrsIter = 1; aPrsIter <= myPresentations.Length(); ++aPrsIter)
     {
-      Handle(PrsMgr_Presentation3d) P = Handle(PrsMgr_Presentation3d)::DownCast(myPresentations(i).Presentation());
-      if(!P.IsNull()) {
-	P->Presentation()->DisconnectAll(Graphic3d_TOC_DESCENDANT);
+      const Handle(PrsMgr_Presentation)& aPrs = myPresentations (aPrsIter).Presentation();
+      if (!aPrs.IsNull())
+      {
+        aPrs->Presentation()->DisconnectAll (Graphic3d_TOC_DESCENDANT);
       }
     }*/
   myPreviousReferences = myReferences; // pour garder les poignees au chaud!!!!

src/AIS/AIS_Shape.cxx

@@ -523,8 +523,7 @@ void AIS_Shape::SetColor(const Quantity_Color &aCol)
   // fast shading modification...
   if(!GetContext().IsNull()){
     if( GetContext()->MainPrsMgr()->HasPresentation(this,1)){
-      Handle(Prs3d_Presentation) aPresentation = 
-        GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation();
+      Handle(Prs3d_Presentation) aPresentation = GetContext()->MainPrsMgr()->Presentation (this, 1)->Presentation();
       Handle(Graphic3d_Group) aCurGroup = Prs3d_Root::CurrentGroup(aPresentation);
       Handle(Graphic3d_AspectFillArea3d) anAreaAspect = myDrawer->ShadingAspect()->Aspect();
       Handle(Graphic3d_AspectLine3d) aLineAspect = myDrawer->LineAspect()->Aspect();
@@ -602,8 +601,7 @@ void AIS_Shape::UnsetColor()
 
   if(!GetContext().IsNull()){
     if(GetContext()->MainPrsMgr()->HasPresentation(this,1)){
-      Handle(Prs3d_Presentation) aPresentation = 
-        GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation();
+      Handle(Prs3d_Presentation) aPresentation = GetContext()->MainPrsMgr()->Presentation (this, 1)->Presentation();
       Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(aPresentation);
 
       Handle(Graphic3d_AspectFillArea3d) anAreaAsp = myDrawer->Link()->ShadingAspect()->Aspect();
@@ -717,9 +715,9 @@ void AIS_Shape::SetMaterial(const Graphic3d_MaterialAspect& aMat)
   myDrawer->ShadingAspect()->SetTransparency(myTransparency,myCurrentFacingModel);
 
   if(!GetContext().IsNull()){
-    if(GetContext()->MainPrsMgr()->HasPresentation(this,1)){
-      Handle(Prs3d_Presentation) aPresentation = 
-        GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation();
+    if(GetContext()->MainPrsMgr()->HasPresentation(this,1))
+    {
+      Handle(Prs3d_Presentation) aPresentation = GetContext()->MainPrsMgr()->Presentation (this, 1)->Presentation();
       Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(aPresentation);
     
       Handle(Graphic3d_AspectFillArea3d) anAreaAsp = myDrawer->ShadingAspect()->Aspect();
@@ -761,8 +759,7 @@ void AIS_Shape::UnsetMaterial()
   hasOwnMaterial = Standard_False;
   if(!GetContext().IsNull()){
     if(GetContext()->MainPrsMgr()->HasPresentation(this,1)){
-      Handle(Prs3d_Presentation) aPresentation = 
-        GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation();
+      Handle(Prs3d_Presentation) aPresentation = GetContext()->MainPrsMgr()->Presentation (this, 1)->Presentation();
       Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(aPresentation);
       Handle(Graphic3d_AspectFillArea3d) anAreaAsp = myDrawer->ShadingAspect()->Aspect();
       aPresentation->SetPrimitivesAspect(anAreaAsp);
@@ -792,8 +789,7 @@ void AIS_Shape::SetTransparency(const Standard_Real AValue)
 
   if(!GetContext().IsNull()){
     if(GetContext()->MainPrsMgr()->HasPresentation(this,1)){
-      Handle(Prs3d_Presentation) aPresentation = 
-        GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation();
+      Handle(Prs3d_Presentation) aPresentation = GetContext()->MainPrsMgr()->Presentation (this, 1)->Presentation();
       Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(aPresentation);
       Handle(Graphic3d_AspectFillArea3d) anAreaAsp = myDrawer->ShadingAspect()->Aspect();
       aPresentation->SetPrimitivesAspect(anAreaAsp);
@@ -828,8 +824,7 @@ void AIS_Shape::UnsetTransparency()
 
   if(!GetContext().IsNull()){
     if(GetContext()->MainPrsMgr()->HasPresentation(this,1)){
-      Handle(Prs3d_Presentation) aPresentation = 
-        GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation();
+      Handle(Prs3d_Presentation) aPresentation = GetContext()->MainPrsMgr()->Presentation (this, 1)->Presentation();
       Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(aPresentation);
       Handle(Graphic3d_AspectFillArea3d) anAreaAsp = myDrawer->ShadingAspect()->Aspect();
       aPresentation->SetPrimitivesAspect(anAreaAsp);