From: inv <inv@opencascade.com>
Date: Mon, 7 Oct 2013 13:36:49 +0000 (+0000)
Subject: RNV: Porting SALOME GEOM module to the new version of the OCCT.
X-Git-Tag: BR_hydro_v_0_3_1~104
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fa17d8fb3a9c783e27e03f043e01cd9fe9322872;p=modules%2Fgeom.git

RNV: Porting SALOME GEOM module to the new version of the OCCT.
---

diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx
index d31b09d58..8962ed0d6 100644
--- a/src/EntityGUI/EntityGUI.cxx
+++ b/src/EntityGUI/EntityGUI.cxx
@@ -375,7 +375,11 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
   try {
     if ( !S1.IsNull() ) {
       /* erase any previous */
+#if OCC_VERSION_LARGE <= 0x06060000
       ic->Erase( mySimulationShape1, Standard_True, Standard_False );
+#else
+      ic->Erase( mySimulationShape1, Standard_True );
+#endif
       ic->ClearPrs( mySimulationShape1 );
 
       mySimulationShape1 = new AIS_Shape( TopoDS_Shape() );
@@ -387,7 +391,11 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
       mySimulationShape1->UnsetColor();
     }
     if ( !S2.IsNull() ) {
+#if OCC_VERSION_LARGE <= 0x06060000
       ic->Erase( mySimulationShape2, Standard_True, Standard_False );
+#else
+      ic->Erase( mySimulationShape2, Standard_True );
+#endif
       ic->ClearPrs( mySimulationShape2 );
 
       mySimulationShape2 = new AIS_Shape( TopoDS_Shape() );
@@ -431,9 +439,14 @@ void EntityGUI::EraseSimulationShape()
     if ( vw->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
       OCCViewer_Viewer* v3d = ( (OCCViewer_ViewManager*)( vw->getViewManager() ) )->getOCCViewer();
       Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
+#if OCC_VERSION_LARGE <= 0x06060000
       ic->Erase( mySimulationShape1, Standard_True, Standard_False );
-      ic->ClearPrs( mySimulationShape1 );
       ic->Erase( mySimulationShape2, Standard_True, Standard_False );
+#else 
+      ic->Erase( mySimulationShape1, Standard_True );
+      ic->Erase( mySimulationShape2, Standard_True );
+#endif
+      ic->ClearPrs( mySimulationShape1 );
       ic->ClearPrs( mySimulationShape2 );
       ic->UpdateCurrentViewer();
     } 
diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx
index 26b11e36e..6b1d06ea5 100644
--- a/src/GEOMBase/GEOMBase.cxx
+++ b/src/GEOMBase/GEOMBase.cxx
@@ -303,8 +303,9 @@ Handle(GEOM_AISShape) GEOMBase::ConvertIORinGEOMAISShape(const QString& IOR, boo
 
           AIS_ListOfInteractive displayed;
           ic->DisplayedObjects( displayed );
+#if OCC_VERSION_LARGE <= 0x06060000
           ic->ObjectsInCollector( displayed );
-
+#endif
           AIS_ListIteratorOfListOfInteractive it( displayed );
           while ( it.More() && shape.IsNull() ) {
             if ( it.Value()->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) ) {