Salome HOME
Merge from V6_main_20120808 08Aug12
[modules/geom.git] / src / GEOMGUI / GeometryGUI_Swig.cxx
index 9a10ef6df4227e056ff92abb2f6b58c3309e066b..59410211f8fc196646a317a15ac325ec2b9be2c8 100644 (file)
@@ -1,84 +1,74 @@
-//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// 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 <TopExp_Explorer.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <GeomAbs_CurveType.hxx>
-#include <GeomAbs_SurfaceType.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Iterator.hxx>
+#include <TopAbs.hxx>
+#include <TopoDS_Shape.hxx>
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
-#include <V3d_Viewer.hxx>
+#include <AIS_Drawer.hxx>
+#include <BRepTools.hxx>
 
-using namespace std;
+// IDL Headers
+#include <SALOMEconfig.h>
+#include CORBA_SERVER_HEADER(GEOM_Gen)
 
+#include <vtkRenderer.h>
 
-static GEOM_Client ShapeReader;
+static SHAPE_READER(ShapeReader);
 
 inline OCCViewer_Viewer* GetOCCViewer(SUIT_Application* theApp){
   SUIT_ViewWindow* window = theApp->desktop()->activeWindow();
@@ -87,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();
     }
   }
 
@@ -112,14 +102,16 @@ GEOM_Swig::~GEOM_Swig()
   // MESSAGE("Destructeur");
 }
 
-void GEOM_Swig::createAndDisplayGO (const char* Entry)
+void GEOM_Swig::createAndDisplayGO (const char* Entry, bool isUpdated)
 {
   class TEvent: public SALOME_Event
   {
     std::string myEntry;
+    bool        myUpdateViewer;
   public:
-    TEvent(const char* theEntry):
-      myEntry(theEntry)
+    TEvent(const char* theEntry, bool toUpdateViewer):
+      myEntry(theEntry),
+      myUpdateViewer(toUpdateViewer)
     {}
     virtual void Execute()
     {
@@ -140,12 +132,13 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry)
       if (CORBA::is_nil(Geom))
         return;
 
-      string aFatherIOR;
+      std::string aFatherIOR;
       _PTR(SComponent) father = aStudy->FindComponent("GEOM");
       if (!father)
         return;
       if (!father->ComponentIOR(aFatherIOR)) {
-        aStudyBuilder->LoadWith(father, SalomeApp_Application::orb()->object_to_string(Geom));
+        CORBA::String_var objStr = SalomeApp_Application::orb()->object_to_string(Geom);
+        aStudyBuilder->LoadWith(father, objStr.in());
         father->ComponentIOR(aFatherIOR);
       }
 
@@ -158,14 +151,14 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry)
       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();
@@ -180,181 +173,159 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry)
                                         "GEOM",
                                         const_cast<char*>( obj->GetID().c_str()));
 
-         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);
+          }
+        }
       }
     }
   };
 
   // MESSAGE("createAndDisplayGO");
-  ProcessVoidEvent(new TEvent (Entry));
+  ProcessVoidEvent(new TEvent (Entry, isUpdated));
 
   class TEventUpdateBrowser: public SALOME_Event
     {
       public:
-       TEventUpdateBrowser() {}
-       virtual void Execute() {
-          SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>(SUIT_Session::session()->activeApplication());
+        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);
+          }
         }
     };
 
-  ProcessVoidEvent(new TEventUpdateBrowser ());
+  if (isUpdated)
+    ProcessVoidEvent(new TEventUpdateBrowser ());
 }
 
+void GEOM_Swig::createAndDisplayFitAllGO (const char* Entry)
+{
+  class TEventFitAll: public SALOME_Event
+  {
+    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();
+          }
+      }
+  };
 
-int  GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
+  createAndDisplayGO(Entry);
+  ProcessVoidEvent(new TEventFitAll());
+}
+
+void GEOM_Swig::UpdateViewer()
 {
-  GEOM::GEOM_Gen_var Geom   = GeometryGUI::GetGeomGen();
-  if ( CORBA::is_nil( Geom ) )
+  class TEventUpdateViewer: public SALOME_Event
+  {
+    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();
+      }
+  };
+  
+  ProcessVoidEvent(new TEventUpdateViewer());
+}
+
+int GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
+{
+  GEOM::GEOM_Gen_var aGeomGen = GeometryGUI::GetGeomGen();
+  if (CORBA::is_nil(aGeomGen))
     return -1;
 
-  GEOM::GEOM_Object_var aMainShape = Geom->GetIORFromString(IOR);
-  TopoDS_Shape shape = ShapeReader.GetShape(Geom, aMainShape);
-
-  GEOM::GEOM_Object_var aSubShape = Geom->GetIORFromString(SubIOR);
-  TopoDS_Shape subshape = ShapeReader.GetShape(Geom, aSubShape);
-
-  int index = 1;
-  if(subshape.ShapeType() == TopAbs_COMPOUND) {
-    TopoDS_Iterator it;
-    TopTools_ListOfShape CL;
-    CL.Append(shape);
-    TopTools_ListIteratorOfListOfShape itC;
-    for(itC.Initialize(CL); itC.More(); itC.Next()) {
-      for(it.Initialize(itC.Value()); it.More(); it.Next()) {
-       if (it.Value().ShapeType() == TopAbs_COMPOUND) {
-         if (it.Value().IsSame(subshape))
-           return index;
-         else
-           index++;
-         CL.Append(it.Value());
-       }
-      }
-    }
-  }
-  else {
-    TopExp_Explorer Exp(shape, subshape.ShapeType());
-    TopTools_MapOfShape M;
-    while(Exp.More()) {
-      if(M.Add(Exp.Current())) {
-       if(Exp.Current().IsSame(subshape))
-         return index;
-       index++;
-      }
-      Exp.Next();
-    }
-  }
+  GEOM::GEOM_Object_var aMainShape = aGeomGen->GetIORFromString(IOR);
+  GEOM::GEOM_Object_var aSubShape  = aGeomGen->GetIORFromString(SubIOR);
+  if (CORBA::is_nil(aMainShape) || CORBA::is_nil(aSubShape))
+    return -1;
 
-  return -1;
+  GEOM::GEOM_IShapesOperations_var anIShapesOperations =
+    aGeomGen->GetIShapesOperations(aMainShape->GetStudyID());
+  if (CORBA::is_nil(anIShapesOperations))
+    return -1;
+
+  return anIShapesOperations->GetTopologyIndex(aMainShape, aSubShape);
 }
 
 const char* GEOM_Swig::getShapeTypeString(const char* IOR)
 {
-  GEOM::GEOM_Gen_var Geom   = GeometryGUI::GetGeomGen();
-  if ( CORBA::is_nil( Geom ) )
-    return 0;
-
-  GEOM::GEOM_Object_var aShape = Geom->GetIORFromString(IOR);
-  TopoDS_Shape shape    = ShapeReader.GetShape(Geom, aShape);
-
-  if( shape.IsNull() ) {
-    return "Null Shape" ;
-  }
+  TCollection_AsciiString aTypeName ("Shape of unknown type");
 
-  switch (shape.ShapeType() )
+  GEOM::GEOM_Gen_var aGeomGen = GeometryGUI::GetGeomGen();
+  if (!CORBA::is_nil(aGeomGen))
   {
-  case TopAbs_COMPOUND:
-    { return "Compound" ;}
-  case  TopAbs_COMPSOLID:
-    { return "Compound Solid" ;}
-  case TopAbs_SOLID:
-    { return "Solid" ;}
-  case TopAbs_SHELL:
-    { return "Shell" ;}
-  case TopAbs_FACE:
+    GEOM::GEOM_Object_var aShape = aGeomGen->GetIORFromString(IOR);
+    if (!CORBA::is_nil(aShape))
     {
-      BRepAdaptor_Surface surf(TopoDS::Face(shape));
-      if ( surf.GetType() == GeomAbs_Plane ) {
-       return "Plane" ;
-      } else if ( surf.GetType() == GeomAbs_Cylinder ) {
-       return "Cylindrical Face" ;
-      } else if ( surf.GetType() == GeomAbs_Sphere ) {
-       return "Spherical Face" ;
-      } else if ( surf.GetType() == GeomAbs_Torus ) {
-       return "Toroidal Face" ;
-      } else if ( surf.GetType() == GeomAbs_Cone ) {
-       return "Conical Face" ;
-      } else {
-       return "GEOM::FACE" ;
-      }
-    }
-  case TopAbs_WIRE:
-    { return "Wire" ;}
-  case TopAbs_EDGE:
-    {
-      BRepAdaptor_Curve curv(TopoDS::Edge(shape));
-      if ( curv.GetType() == GeomAbs_Line ) {
-       if ( (Abs(curv.FirstParameter()) >= 1E6 ) ||
-            (Abs(curv.LastParameter()) >= 1E6 )) {
-         return "Line" ;
-       } else
-         return "Edge" ;
-      } else if ( curv.GetType() == GeomAbs_Circle ) {
-       if ( curv.IsClosed() )
-         return "Circle" ;
-       else
-         return "Arc" ;
-      } else {
-       return "Edge" ;
+      GEOM::GEOM_IShapesOperations_var anIShapesOperations =
+        aGeomGen->GetIShapesOperations(aShape->GetStudyID());
+      if (!CORBA::is_nil(anIShapesOperations))
+      {
+        aTypeName = anIShapesOperations->GetShapeTypeString(aShape);
       }
     }
-  case TopAbs_VERTEX:
-    { return "Vertex" ;}
-  case TopAbs_SHAPE:
-    { return "Shape" ;}
   }
-  return 0;
+
+  return CORBA::string_dup(aTypeName.ToCString());
 }
 
 
 const char* GEOM_Swig::getShapeTypeIcon(const char* IOR)
 {
-  GEOM::GEOM_Gen_var Geom   = GeometryGUI::GetGeomGen();
+  GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen();
   if ( CORBA::is_nil( Geom ) )
     return "None";
 
@@ -388,120 +359,324 @@ const char* GEOM_Swig::getShapeTypeIcon(const char* IOR)
   return "None";
 }
 
-void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode)
+void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode, bool isUpdated)
 {
-  SUIT_Application* app = SUIT_Session::session()->activeApplication();
-  if ( !app ) return;
-
-  Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", "");
-
-  class TEvent: public SALOME_Event{
-    SUIT_Application* myApp;
-    Handle(SALOME_InteractiveObject) myIO;
-    int myParam;
+  class TEvent: public SALOME_Event {
+    std::string myEntry;
+    int myMode;
+    bool myUpdateViewer;
   public:
-    TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, int theParam):
-      myApp(theApp), myIO(theIO), myParam(theParam)
+    TEvent(const char* theEntryArg, int theModeArg, bool theUpdated):
+      myEntry(theEntryArg), myMode(theModeArg), myUpdateViewer(theUpdated)
     {}
-    virtual void Execute(){
-      if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){
-       SVTK_View* aView = aViewWindow->getView();
-       aView->SetDisplayMode(myIO,myParam);
-       aView->Repaint();
+    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();
+        aView->SetDisplayMode(anIO, myMode);
+        if (myUpdateViewer)
+          aView->Repaint();
       }
-      else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) {
-       SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>( occViewer );
-       if (soccViewer)
-         soccViewer->switchRepresentation(myIO,myParam);
+      else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) {
+        SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>(occViewer);
+        if (soccViewer)
+          soccViewer->switchRepresentation(anIO, myMode, myUpdateViewer);
       }
     }
   };
 
-  ProcessVoidEvent(new TEvent(app,anIO,theMode));
+  ProcessVoidEvent(new TEvent (theEntry, theMode, isUpdated));
 }
 
-void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue)
+void GEOM_Swig::setVectorsMode(const char* theEntry, bool isOn, bool isUpdated)
 {
-  SUIT_Application* app = SUIT_Session::session()->activeApplication();
-  if ( !app ) return;
-
-  Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", "");
+  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());
+            }
+          }
+        }
+      }
+    }
+  };
 
-  QColor aColor(red,green,blue);
+  ProcessVoidEvent(new TEvent (theEntry, isOn, isUpdated));
+}
 
-  class TEvent: public SALOME_Event{
-    SUIT_Application* myApp;
-    Handle(SALOME_InteractiveObject) myIO;
-    QColor myParam;
+void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue, bool isUpdated)
+{
+  class TEvent: public SALOME_Event {
+    std::string myEntry;
+    int myRed;
+    int myGreen;
+    int myBlue;
+    bool myUpdateViewer;
   public:
-    TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, const QColor& theParam):
-      myApp(theApp), myIO(theIO), myParam(theParam)
+    TEvent(const char* theEntryArg, int theR, int theG, int theB, bool theUpdated):
+      myEntry(theEntryArg), myRed(theR), myGreen(theG), myBlue(theB), myUpdateViewer(theUpdated)
     {}
-    virtual void Execute(){
-      if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){
-       SVTK_View* aView = aViewWindow->getView();
-       aView->SetColor(myIO,myParam);
-       aView->Repaint();
-      }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)){
-       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( myIO ) ) {
-           Quantity_Color CSFColor = Quantity_Color ( myParam.red()   / 255.,
-                                                      myParam.green() / 255.,
-                                                      myParam.blue()  / 255.,
-                                                      Quantity_TOC_RGB );
-           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 );
-           occViewer->update();
-           break;
-         }
-       }
+    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();
+        QColor aColor (myRed, myGreen, myBlue);
+        aView->SetColor(anIO, aColor);
+        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)
+          {
+            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();
+          }
       }
     }
   };
-  ProcessVoidEvent(new TEvent(app,anIO,aColor));
+  ProcessVoidEvent(new TEvent(theEntry, red, green, blue, isUpdated));
 }
 
-void GEOM_Swig::setTransparency(const char* theEntry, float transp)
+void GEOM_Swig::setTransparency(const char* theEntry, float transp, bool isUpdated)
 {
-  SUIT_Application* app = SUIT_Session::session()->activeApplication();
-  if ( !app ) return;
-
-  Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", "");
-
-  class TEvent: public SALOME_Event{
-    SUIT_Application* myApp;
-    Handle(SALOME_InteractiveObject) myIO;
+  class TEvent: public SALOME_Event {
+    std::string myEntry;
     float myParam;
+    bool myUpdateViewer;
   public:
-    TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, float theParam):
-      myApp(theApp), myIO(theIO), myParam(theParam)
+    TEvent(const char* theEntryArg, float theParam, bool theUpdated):
+      myEntry(theEntryArg), myParam(theParam), myUpdateViewer(theUpdated)
     {}
-    virtual void Execute(){
-      if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){
-       SVTK_View* aView = aViewWindow->getView();
-       aView->SetTransparency(myIO,myParam);
-       aView->Repaint();
-      }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) {
-       SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>( occViewer );
-       if (soccViewer)
-         soccViewer->setTransparency(myIO,myParam);
+    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();
+        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);
       }
     }
   };
 
-  ProcessVoidEvent(new TEvent(app,anIO,transp));
+  ProcessVoidEvent(new TEvent (theEntry, transp, isUpdated));
 }
 
 
+class TInitGeomGenEvent: public SALOME_Event {
+public:
+  typedef bool TResult;
+  TResult myResult;
+  TInitGeomGenEvent() : myResult(false) {}
+  virtual void Execute() {
+    myResult = GeometryGUI::InitGeomGen();
+  }
+};
 bool GEOM_Swig::initGeomGen()
 {
-  return GeometryGUI::InitGeomGen();
+  return ProcessEvent(new TInitGeomGenEvent());
 }
+
+
+
+void GEOM_Swig::eraseGO (const char* Entry, bool allWindows)
+{
+  class TEvent: public SALOME_Event
+  {
+    std::string myEntry;
+    bool myFromAllWindows;
+  public:
+    TEvent(const char* theEntry, bool fromAllWindows):
+      myEntry(theEntry), myFromAllWindows(fromAllWindows)
+    {}
+    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;
+
+      Handle (SALOME_InteractiveObject) aIO = new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", "");
+
+      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);
+        }
+      } else {
+        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();
+                }
+              }
+            }
+          }
+        }
+      } else if (theWin->getViewManager()->getType() == SVTK_Viewer::Type()){
+        SVTK_ViewWindow* aViewWindow = dynamic_cast<SVTK_ViewWindow*>( theWin );
+        if (aViewWindow) {
+          aViewWindow->Erase(theIO);
+        }
+      }
+      }*/
+
+  };
+  ProcessVoidEvent(new TEvent(Entry, allWindows));
+}
+
+
+
+void GEOM_Swig::setDeflection(const char* theEntry, float theDeflect)
+{
+  class TEvent: public SALOME_Event {
+    std::string myEntry;
+    float myParam;
+  public:
+    TEvent(const char* theEntryArg, float theParam):
+      myEntry(theEntryArg), myParam(theParam)
+    {}
+    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)) {
+        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;
+            }
+          }
+        }
+      }
+    }
+  };
+
+  ProcessVoidEvent(new TEvent (theEntry, theDeflect));
+}
+