Salome HOME
Merge from V6_main_20120808 08Aug12
[modules/geom.git] / src / GEOMGUI / GeometryGUI_Swig.cxx
index 57df497a60dd566b120d70590cf6c18dc6525281..59410211f8fc196646a317a15ac325ec2b9be2c8 100644 (file)
@@ -1,64 +1,58 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//
-//
-//  File   : GeometryGUI_Swig.cxx
-//  Author : Nicolas REJNERI, Paul RASCLE
-//  Module : GEOM
-//  $Header$
 
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GeometryGUI_Swig.cxx
+// Author : Nicolas REJNERI, Paul RASCLE
+//
 #include "GeometryGUI_Swig.hxx"
-#include "SALOMEGUI_Swig.hxx"
 
 #include "GeometryGUI.h"
 
+#include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "SalomeApp_Study.h"
-#include "SalomeApp_ImportOperation.h"
 
 #include "OB_Browser.h"
 
 #include "OCCViewer_ViewWindow.h"
 #include "OCCViewer_ViewManager.h"
 #include "SOCC_ViewModel.h"
+#include <SOCC_Prs.h>
 
 #include "SVTK_ViewModel.h"
 #include "SVTK_ViewWindow.h"
 #include "SVTK_View.h"
 #include "SVTK_Renderer.h"
+#include <SVTK_Prs.h>
 
 #include "GEOM_Actor.h"
 #include "GEOM_Client.hxx"
 #include "GEOM_AISShape.hxx"
-#include "GEOM_AssemblyBuilder.h"
 #include "GEOM_InteractiveObject.hxx"
 #include "GEOM_Displayer.h"
 
-#include "SALOME_Event.hxx"
-
-#include "utilities.h"
-
-#include "SALOMEDSClient.hxx"
+#include "SALOME_Event.h"
 
 // OCCT Includes
 #include <TopAbs.hxx>
 
 #include <vtkRenderer.h>
 
-using namespace std;
-
-
-static GEOM_Client ShapeReader;
+static SHAPE_READER(ShapeReader);
 
 inline OCCViewer_Viewer* GetOCCViewer(SUIT_Application* theApp){
   SUIT_ViewWindow* window = theApp->desktop()->activeWindow();
@@ -86,7 +77,7 @@ inline OCCViewer_Viewer* GetOCCViewer(SUIT_Application* theApp){
     if ( vw ) {
       OCCViewer_ViewManager* vm = dynamic_cast<OCCViewer_ViewManager*>( vw->getViewManager() );
       if ( vm )
-       return vm->getOCCViewer();
+        return vm->getOCCViewer();
     }
   }
 
@@ -141,7 +132,7 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry, bool isUpdated)
       if (CORBA::is_nil(Geom))
         return;
 
-      string aFatherIOR;
+      std::string aFatherIOR;
       _PTR(SComponent) father = aStudy->FindComponent("GEOM");
       if (!father)
         return;
@@ -160,14 +151,14 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry, bool isUpdated)
       if (!obj->FindAttribute(anAttr, "AttributeIOR"))
         return;
       _PTR(AttributeIOR) anIOR(anAttr);
-      string anIORValue = anIOR->Value();
+      std::string anIORValue = anIOR->Value();
 
       GEOM::GEOM_Object_var aShape = Geom->GetIORFromString(anIORValue.c_str());
       TopoDS_Shape Shape = ShapeReader.GetShape(Geom,aShape);
       if (!Shape.IsNull()) {
         if (obj->FindAttribute(anAttr, "AttributeName")) {
           _PTR(AttributeName) aName (anAttr);
-          string aNameValue = aName->Value();
+          std::string aNameValue = aName->Value();
           // open transaction
           /*SUIT_Operation* op = new SalomeApp_ImportOperation (app);
           op->start();
@@ -182,39 +173,39 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry, bool isUpdated)
                                         "GEOM",
                                         const_cast<char*>( obj->GetID().c_str()));
 
-         GEOM_Displayer(ActiveStudy).Display(anIO, myUpdateViewer);
-         /*if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app)) {
-           SVTK_View* aView = aViewWindow->getView();
-           int aMode = aView->GetDisplayMode();
+          GEOM_Displayer(ActiveStudy).Display(anIO, myUpdateViewer);
+          /*if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app)) {
+            SVTK_View* aView = aViewWindow->getView();
+            int aMode = aView->GetDisplayMode();
 
-           vtkActorCollection* theActors =
+            vtkActorCollection* theActors =
               GEOM_AssemblyBuilder::BuildActors(Shape,0,aMode,true);
-           theActors->InitTraversal();
-           while (vtkActor* anActor = theActors->GetNextActor()) {
-             GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor);
-             GActor->setName(const_cast<char*>(aNameValue.c_str()));
-             GActor->setIO(anIO);
-             aView->Display(GActor);
-           }
-           aView->Repaint();
-         } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app)) {
-           Handle(AIS_InteractiveContext) ic = occViewer->getAISContext();
-           Handle(GEOM_AISShape) aSh =
+            theActors->InitTraversal();
+            while (vtkActor* anActor = theActors->GetNextActor()) {
+              GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor);
+              GActor->setName(const_cast<char*>(aNameValue.c_str()));
+              GActor->setIO(anIO);
+              aView->Display(GActor);
+            }
+            aView->Repaint();
+          } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app)) {
+            Handle(AIS_InteractiveContext) ic = occViewer->getAISContext();
+            Handle(GEOM_AISShape) aSh =
               new GEOM_AISShape (Shape,const_cast<char*>(aNameValue.c_str()));
-           aSh->setName(const_cast<char*>(aNameValue.c_str()));
-           aSh->setIO(anIO);
-           ic->Display(aSh);
-           ic->AddOrRemoveCurrentObject(aSh,true);
-           }*/
-         // update object browser
-         SalomeApp_Application* app = NULL; //dynamic_cast<SalomeApp_Application*>(app);
-         if (app) {
-           CAM_Module* module = app->module("Geometry");
-           SalomeApp_Module* appMod = dynamic_cast<SalomeApp_Module*>(module);
-           if (appMod)
-             appMod->updateObjBrowser(true);
-         }
-       }
+            aSh->setName(const_cast<char*>(aNameValue.c_str()));
+            aSh->setIO(anIO);
+            ic->Display(aSh);
+            ic->AddOrRemoveCurrentObject(aSh,true);
+            }*/
+          // update object browser
+          SalomeApp_Application* app = NULL; //dynamic_cast<SalomeApp_Application*>(app);
+          if (app) {
+            CAM_Module* module = app->module("Geometry");
+            SalomeApp_Module* appMod = dynamic_cast<SalomeApp_Module*>(module);
+            if (appMod)
+              appMod->updateObjBrowser(true);
+          }
+        }
       }
     }
   };
@@ -225,15 +216,15 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry, bool isUpdated)
   class TEventUpdateBrowser: public SALOME_Event
     {
       public:
-       TEventUpdateBrowser() {}
-       virtual void Execute() {
+        TEventUpdateBrowser() {}
+        virtual void Execute() {
           SalomeApp_Application* app =
             dynamic_cast<SalomeApp_Application*>(SUIT_Session::session()->activeApplication());
           if (app) {
-           CAM_Module* module = app->module("Geometry");
-           SalomeApp_Module* appMod = dynamic_cast<SalomeApp_Module*>(module);
-           if (appMod) appMod->updateObjBrowser(true);
-         }
+            CAM_Module* module = app->module("Geometry");
+            SalomeApp_Module* appMod = dynamic_cast<SalomeApp_Module*>(module);
+            if (appMod) appMod->updateObjBrowser(true);
+          }
         }
     };
 
@@ -248,22 +239,22 @@ void GEOM_Swig::createAndDisplayFitAllGO (const char* Entry)
     public:
       TEventFitAll() {}
       virtual void Execute() {
-       SUIT_Application* app = SUIT_Session::session()->activeApplication();
-       if (!app) return;
-       
-       if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app))
-         {
-           SVTK_View* aView = aViewWindow->getView();
-           aView->GetRenderer()->OnFitAll();
-         }
-       else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app))
-         {  
-           Handle(V3d_Viewer) aViewer3d = occViewer->getViewer3d();
-           aViewer3d->InitActiveViews();
-           
-           if (aViewer3d->MoreActiveViews())
-             aViewer3d->ActiveView()->FitAll();
-         }
+        SUIT_Application* app = SUIT_Session::session()->activeApplication();
+        if (!app) return;
+        
+        if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app))
+          {
+            SVTK_View* aView = aViewWindow->getView();
+            aView->GetRenderer()->OnFitAll();
+          }
+        else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app))
+          {  
+            Handle(V3d_Viewer) aViewer3d = occViewer->getViewer3d();
+            aViewer3d->InitActiveViews();
+            
+            if (aViewer3d->MoreActiveViews())
+              aViewer3d->ActiveView()->FitAll();
+          }
       }
   };
 
@@ -278,12 +269,12 @@ void GEOM_Swig::UpdateViewer()
     public:
       TEventUpdateViewer() {}
       virtual void Execute() {
-       SUIT_Application* app = SUIT_Session::session()->activeApplication();
-       if (!app) return;
-       SalomeApp_Study* ActiveStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
-       if (!ActiveStudy) return;
-       
-       GEOM_Displayer(ActiveStudy).UpdateViewer();
+        SUIT_Application* app = SUIT_Session::session()->activeApplication();
+        if (!app) return;
+        SalomeApp_Study* ActiveStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
+        if (!ActiveStudy) return;
+        
+        GEOM_Displayer(ActiveStudy).UpdateViewer();
       }
   };
   
@@ -386,15 +377,15 @@ void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode, bool isUpdated
         new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", "");
 
       if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)) {
-       SVTK_View* aView = aViewWindow->getView();
-       aView->SetDisplayMode(anIO, myMode);
-       if (myUpdateViewer)
-         aView->Repaint();
+        SVTK_View* aView = aViewWindow->getView();
+        aView->SetDisplayMode(anIO, myMode);
+        if (myUpdateViewer)
+          aView->Repaint();
       }
       else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) {
-       SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>(occViewer);
-       if (soccViewer)
-         soccViewer->switchRepresentation(anIO, myMode, myUpdateViewer);
+        SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>(occViewer);
+        if (soccViewer)
+          soccViewer->switchRepresentation(anIO, myMode, myUpdateViewer);
       }
     }
   };
@@ -402,6 +393,58 @@ void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode, bool isUpdated
   ProcessVoidEvent(new TEvent (theEntry, theMode, isUpdated));
 }
 
+void GEOM_Swig::setVectorsMode(const char* theEntry, bool isOn, bool isUpdated)
+{
+  class TEvent: public SALOME_Event {
+    std::string myEntry;
+    bool myOn;
+    bool myUpdateViewer;
+  public:
+    TEvent(const char* theEntryArg, bool theOn, bool theUpdated):
+      myEntry(theEntryArg), myOn(theOn), myUpdateViewer(theUpdated)
+    {}
+    virtual void Execute() {
+      SUIT_Application* anApp = SUIT_Session::session()->activeApplication();
+      if (!anApp) return;
+
+      Handle(SALOME_InteractiveObject) anIO =
+        new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", "");
+
+      if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)) {
+        SVTK_View* aView = aViewWindow->getView();
+        SVTK_Viewer* stvkViewer = dynamic_cast<SVTK_Viewer*>(aViewWindow->getViewManager()->getViewModel());
+        SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( stvkViewer->CreatePrs( myEntry.c_str()  ) );
+        vtkActorCollection* anActors = vtkPrs->GetObjects();
+        anActors->InitTraversal();
+        while (vtkActor* anAct = anActors->GetNextActor()) {
+          GEOM_Actor* aGeomActor = GEOM_Actor::SafeDownCast(anAct);
+          aGeomActor->SetVectorMode(!aGeomActor->GetVectorMode());
+        }
+        if (myUpdateViewer)
+          aView->Repaint();
+      }
+      else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) {
+        Handle(AIS_InteractiveContext) ic = occViewer->getAISContext();
+        SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>(occViewer);
+        if (soccViewer) {
+          SOCC_Prs* occPrs = dynamic_cast<SOCC_Prs*>( soccViewer->CreatePrs( myEntry.c_str() ) );
+          if ( occPrs && !occPrs->IsNull() ) {
+            AIS_ListOfInteractive shapes; occPrs->GetObjects( shapes );
+            AIS_ListIteratorOfListOfInteractive interIter( shapes );
+            for ( ; interIter.More(); interIter.Next() ) {
+              Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast( interIter.Value() );
+              aSh->SetDisplayVectors(myOn);
+              ic->RecomputePrsOnly(interIter.Value());
+            }
+          }
+        }
+      }
+    }
+  };
+
+  ProcessVoidEvent(new TEvent (theEntry, isOn, isUpdated));
+}
+
 void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue, bool isUpdated)
 {
   class TEvent: public SALOME_Event {
@@ -422,31 +465,35 @@ void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue, boo
         new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", "");
 
       if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)){
-       SVTK_View* aView = aViewWindow->getView();
+        SVTK_View* aView = aViewWindow->getView();
         QColor aColor (myRed, myGreen, myBlue);
         aView->SetColor(anIO, aColor);
-       if (myUpdateViewer)
-         aView->Repaint();
+        if (myUpdateViewer)
+          aView->Repaint();
       } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) {
-       Handle(AIS_InteractiveContext) ic = occViewer->getAISContext();
-       AIS_ListOfInteractive List;
-       ic->DisplayedObjects(List);
-       AIS_ListIteratorOfListOfInteractive ite (List);
-       for (; ite.More(); ite.Next()) {
-         Handle(SALOME_InteractiveObject) anObj =
-           Handle(SALOME_InteractiveObject)::DownCast(ite.Value()->GetOwner());
-         if (!anObj.IsNull() && anObj->hasEntry() && anObj->isSame(anIO)) {
-           Quantity_Color CSFColor =
-              Quantity_Color(myRed/255., myGreen/255., myBlue/255., Quantity_TOC_RGB);
-           ite.Value()->SetColor(CSFColor);
-           if (ite.Value()->IsKind(STANDARD_TYPE(GEOM_AISShape)))
-             Handle(GEOM_AISShape)::DownCast(ite.Value())->SetShadingColor(CSFColor);
-           ic->Redisplay(ite.Value(), true, true);
-           if (myUpdateViewer)
-             occViewer->update();
-           break;
-         }
-       }
+        Handle(AIS_InteractiveContext) ic = occViewer->getAISContext();
+        SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>(occViewer);
+        if (soccViewer)
+          {
+            SALOME_Prs*   prs=      soccViewer->CreatePrs( myEntry.c_str() );
+            const SOCC_Prs* anOCCPrs = dynamic_cast<const SOCC_Prs*>( prs );
+            if ( !anOCCPrs || anOCCPrs->IsNull() )
+              return;
+
+            // get objects to be displayed
+            AIS_ListOfInteractive anAISObjects;
+            anOCCPrs->GetObjects( anAISObjects );
+            AIS_ListIteratorOfListOfInteractive ite( anAISObjects );
+            Quantity_Color CSFColor = Quantity_Color(myRed/255., myGreen/255., myBlue/255., Quantity_TOC_RGB);
+            for ( ; ite.More(); ite.Next() )
+              {
+                if(!ic->IsDisplayed(ite.Value()))continue;  //only displayed ais 
+                ite.Value()->SetColor(CSFColor);
+                if (ite.Value()->IsKind(STANDARD_TYPE(GEOM_AISShape))) Handle(GEOM_AISShape)::DownCast(ite.Value())->SetShadingColor(CSFColor);
+                ite.Value()->Redisplay(Standard_True); // as in OnColor
+              }
+            if (myUpdateViewer) occViewer->update();
+          }
       }
     }
   };
@@ -471,14 +518,14 @@ void GEOM_Swig::setTransparency(const char* theEntry, float transp, bool isUpdat
         new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", "");
 
       if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)) {
-       SVTK_View* aView = aViewWindow->getView();
-       aView->SetTransparency(anIO, myParam);
-       if (myUpdateViewer)
-         aView->Repaint();
+        SVTK_View* aView = aViewWindow->getView();
+        aView->SetTransparency(anIO, myParam);
+        if (myUpdateViewer)
+          aView->Repaint();
       } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) {
-       SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>(occViewer);
-       if (soccViewer)
-         soccViewer->setTransparency(anIO, myParam, myUpdateViewer);
+        SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>(occViewer);
+        if (soccViewer)
+          soccViewer->setTransparency(anIO, myParam, myUpdateViewer);
       }
     }
   };
@@ -524,44 +571,44 @@ void GEOM_Swig::eraseGO (const char* Entry, bool allWindows)
 
       GEOM_Displayer(ActiveStudy).Erase(aIO, true);
       /*      if (myFromAllWindows) {
-       QPtrList<SUIT_ViewWindow> aWindows = app->desktop()->windows();
-       SUIT_ViewWindow* aWin = 0;
-       for (aWin = aWindows.first(); aWin; aWin = aWindows.next()) {
-         EraseObject(aWin, aIO);
-       }
+        QPtrList<SUIT_ViewWindow> aWindows = app->desktop()->windows();
+        SUIT_ViewWindow* aWin = 0;
+        for (aWin = aWindows.first(); aWin; aWin = aWindows.next()) {
+          EraseObject(aWin, aIO);
+        }
       } else {
-       SUIT_ViewWindow* aWin = app->desktop()->activeWindow();
-       if (aWin)
-         EraseObject(aWin, aIO);
-         }*/
+        SUIT_ViewWindow* aWin = app->desktop()->activeWindow();
+        if (aWin)
+          EraseObject(aWin, aIO);
+          }*/
     }
 
     /*  private:
     void EraseObject(SUIT_ViewWindow* theWin, Handle (SALOME_InteractiveObject) theIO)
     {
       if (theWin->getViewManager()->getType() == OCCViewer_Viewer::Type()){
-       OCCViewer_ViewWindow* vw = dynamic_cast<OCCViewer_ViewWindow*>( theWin );
-       if ( vw ) {
-         OCCViewer_ViewManager* vm = dynamic_cast<OCCViewer_ViewManager*>( vw->getViewManager() );
-         if ( vm ) {
-           SOCC_Viewer* aViewer = dynamic_cast<SOCC_Viewer*>(vm->getOCCViewer());
-           if (aViewer) {
-             SALOME_Prs* aPrs = aViewer->CreatePrs(myEntry.c_str());
-             if (aPrs) {
-               SALOME_OCCPrs* aOccPrs =  dynamic_cast<SALOME_OCCPrs*>(aPrs);
-               if (aOccPrs) {
-                 aViewer->Erase(aOccPrs);
-                 aViewer->Repaint();
-               }
-             }
-           }
-         }
-       }
+        OCCViewer_ViewWindow* vw = dynamic_cast<OCCViewer_ViewWindow*>( theWin );
+        if ( vw ) {
+          OCCViewer_ViewManager* vm = dynamic_cast<OCCViewer_ViewManager*>( vw->getViewManager() );
+          if ( vm ) {
+            SOCC_Viewer* aViewer = dynamic_cast<SOCC_Viewer*>(vm->getOCCViewer());
+            if (aViewer) {
+              SALOME_Prs* aPrs = aViewer->CreatePrs(myEntry.c_str());
+              if (aPrs) {
+                SALOME_OCCPrs* aOccPrs =  dynamic_cast<SALOME_OCCPrs*>(aPrs);
+                if (aOccPrs) {
+                  aViewer->Erase(aOccPrs);
+                  aViewer->Repaint();
+                }
+              }
+            }
+          }
+        }
       } else if (theWin->getViewManager()->getType() == SVTK_Viewer::Type()){
-       SVTK_ViewWindow* aViewWindow = dynamic_cast<SVTK_ViewWindow*>( theWin );
-       if (aViewWindow) {
-         aViewWindow->Erase(theIO);
-       }
+        SVTK_ViewWindow* aViewWindow = dynamic_cast<SVTK_ViewWindow*>( theWin );
+        if (aViewWindow) {
+          aViewWindow->Erase(theIO);
+        }
       }
       }*/
 
@@ -588,44 +635,44 @@ void GEOM_Swig::setDeflection(const char* theEntry, float theDeflect)
         new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", "");
 
       if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)) {
-       vtkActorCollection* aActors = aViewWindow->getRenderer()->GetActors();
-       aActors->InitTraversal();
-       while (vtkActor* aAct = aActors->GetNextActor()) {
-         if (GEOM_Actor* aGeomActor = dynamic_cast<GEOM_Actor*>(aAct)) {
-           if (aGeomActor->hasIO()) {
-             Handle(SALOME_InteractiveObject) aNextIO = aGeomActor->getIO();
-             if (aNextIO->isSame(anIO)) {
-               aGeomActor->setDeflection(myParam);
-               aViewWindow->Repaint();
-               return;
-             }
-           }
-         }
-       }
-       //      aView->SetTransparency(anIO, myParam);
-       //aView->Repaint();
+        vtkActorCollection* aActors = aViewWindow->getRenderer()->GetActors();
+        aActors->InitTraversal();
+        while (vtkActor* aAct = aActors->GetNextActor()) {
+          if (GEOM_Actor* aGeomActor = dynamic_cast<GEOM_Actor*>(aAct)) {
+            if (aGeomActor->hasIO()) {
+              Handle(SALOME_InteractiveObject) aNextIO = aGeomActor->getIO();
+              if (aNextIO->isSame(anIO)) {
+                aGeomActor->setDeflection(myParam);
+                aViewWindow->Repaint();
+                return;
+              }
+            }
+          }
+        }
+        //      aView->SetTransparency(anIO, myParam);
+        //aView->Repaint();
       } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) {
-       Handle(AIS_InteractiveContext) aContext = occViewer->getAISContext();
-       AIS_ListOfInteractive aAISList;
-       aContext->DisplayedObjects(aAISList);
-       AIS_ListIteratorOfListOfInteractive it(aAISList);
-       for (; it.More(); it.Next()) {
-         Handle(SALOME_InteractiveObject) aObj = 
-           Handle(SALOME_InteractiveObject)::DownCast(it.Value()->GetOwner());
-         if ((!aObj.IsNull()) && aObj->hasEntry() && aObj->isSame(anIO)) {
-           Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast(it.Value());
-           if (!aShape.IsNull()) {
-             TopoDS_Shape aSh = aShape->Shape();
-             if (!aSh.IsNull())
-               BRepTools::Clean(aSh);
-
-             aShape->SetOwnDeviationCoefficient( myParam );
-             aShape->SetOwnHLRDeviationAngle( 1.57 );
-             aContext->Redisplay(aShape);
-             return;
-           }
-         }
-       }
+        Handle(AIS_InteractiveContext) aContext = occViewer->getAISContext();
+        AIS_ListOfInteractive aAISList;
+        aContext->DisplayedObjects(aAISList);
+        AIS_ListIteratorOfListOfInteractive it(aAISList);
+        for (; it.More(); it.Next()) {
+          Handle(SALOME_InteractiveObject) aObj = 
+            Handle(SALOME_InteractiveObject)::DownCast(it.Value()->GetOwner());
+          if ((!aObj.IsNull()) && aObj->hasEntry() && aObj->isSame(anIO)) {
+            Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast(it.Value());
+            if (!aShape.IsNull()) {
+              TopoDS_Shape aSh = aShape->Shape();
+              if (!aSh.IsNull())
+                BRepTools::Clean(aSh);
+
+              aShape->SetOwnDeviationCoefficient( myParam );
+              aShape->SetOwnHLRDeviationAngle( 1.57 );
+              aContext->Redisplay(aShape);
+              return;
+            }
+          }
+        }
       }
     }
   };