Salome HOME
NPAL18111: Bad shape build by partition.
[modules/geom.git] / src / GEOMGUI / GeometryGUI_Swig.cxx
index ead4659da66163d94227f55a8dbc7681517b8797..22159ad46a71486fdb881ee153f4fd139c7059fb 100644 (file)
@@ -1,23 +1,23 @@
 //  GEOM GEOMGUI : GUI for Geometry component
 //
 //  Copyright (C) 2003  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 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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  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 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
 #include "GeometryGUI_Swig.hxx"
 #include "SALOMEGUI_Swig.hxx"
 
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "QAD_Study.h"
-#include "QAD_StudyFrame.h"
-#include "QAD_RightFrame.h"
-#include "SALOMEGUI_ImportOperation.h"
-
-#include "OCCViewer_Viewer3d.h"
-#include "OCCViewer_ViewFrame.h"
-#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 "GeometryGUI.h"
 
-#include "SALOME_Event.hxx"
+#include "SUIT_Session.h"
+#include "SalomeApp_Application.h"
+#include "SalomeApp_Study.h"
+#include "SalomeApp_ImportOperation.h"
 
-#include "VTKViewer_RenderWindowInteractor.h"
-#include "VTKViewer_ViewFrame.h"
+#include "OB_Browser.h"
+
+#include "OCCViewer_ViewWindow.h"
+#include "OCCViewer_ViewManager.h"
+#include "SOCC_ViewModel.h"
+
+#include "SVTK_ViewModel.h"
+#include "SVTK_ViewWindow.h"
+#include "SVTK_View.h"
+#include "SVTK_Renderer.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"
+
+// OCCT Includes
+#include <TopAbs.hxx>
+#include <TopoDS_Shape.hxx>
+#include <AIS_ListOfInteractive.hxx>
+#include <AIS_ListIteratorOfListOfInteractive.hxx>
+#include <AIS_Drawer.hxx>
+#include <BRepTools.hxx>
+
+// IDL Headers
+#include <SALOMEconfig.h>
+#include CORBA_SERVER_HEADER(GEOM_Gen)
+
+#include <vtkRenderer.h>
+
 using namespace std;
 
+
 static GEOM_Client ShapeReader;
 
+inline OCCViewer_Viewer* GetOCCViewer(SUIT_Application* theApp){
+  SUIT_ViewWindow* window = theApp->desktop()->activeWindow();
+  if(window && window->getViewManager()->getType() == OCCViewer_Viewer::Type()){
+    OCCViewer_ViewWindow* vw = dynamic_cast<OCCViewer_ViewWindow*>( window );
+    if ( vw ) {
+      OCCViewer_ViewManager* vm = dynamic_cast<OCCViewer_ViewManager*>( vw->getViewManager() );
+      if ( vm )
+       return vm->getOCCViewer();
+    }
+  }
 
-template<class TViewFrame> inline TViewFrame* GetFrame(QAD_Study* theStudy){
-  return dynamic_cast<TViewFrame*>(SALOME::GetViewFrame(theStudy));
+  return 0;
 }
 
+inline SVTK_ViewWindow* GetSVTKViewWindow(SUIT_Application* theApp){
+  SUIT_ViewWindow* window = theApp->desktop()->activeWindow();
+  if(window && window->getViewManager()->getType() == SVTK_Viewer::Type())
+    return dynamic_cast<SVTK_ViewWindow*>( window );
+
+  return 0;
+}
 
 GEOM_Swig::GEOM_Swig()
 {
@@ -84,221 +111,239 @@ GEOM_Swig::~GEOM_Swig()
   // MESSAGE("Destructeur");
 }
 
-void GEOM_Swig::createAndDisplayGO(const char* Entry)
+void GEOM_Swig::createAndDisplayGO (const char* Entry, bool isUpdated)
 {
-  // MESSAGE("createAndDisplayGO");
-  QAD_Study* ActiveStudy = QAD_Application::getDesktop()->getActiveStudy();
-  SALOMEDS::Study_var aStudy = ActiveStudy->getStudyDocument();
-  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
-  GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp);
-
-  CORBA::String_var aFatherIOR;
-  SALOMEDS::SComponent_var father = aStudy->FindComponent("GEOM");
-  aStudyBuilder->DefineComponentInstance( father, Geom );
-  father->ComponentIOR(aFatherIOR);
-
-  SALOMEDS::SObject_var fatherSF = aStudy->FindObjectID(ActiveStudy->getActiveStudyFrame()->entry());
-
-  SALOMEDS::SObject_var obj = aStudy->FindObjectID(Entry);
-  SALOMEDS::GenericAttribute_var anAttr;
-  SALOMEDS::AttributeIOR_var     anIOR;
-  // Create new actor
-  if ( !obj->FindAttribute(anAttr, "AttributeIOR")) 
-    return;
-  anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-  CORBA::String_var anIORValue = anIOR->Value();
-  
-  GEOM::GEOM_Object_var aShape = Geom->GetIORFromString(anIORValue);
-  TopoDS_Shape Shape = ShapeReader.GetShape(Geom,aShape);
-  
-  if ( !obj->_is_nil() ) {
-    if (obj->FindAttribute(anAttr, "AttributeName")) {
-      SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
-      CORBA::String_var aNameValue = aName->Value();
-      // open transaction
-      QAD_Operation* op = new SALOMEGUI_ImportOperation( ActiveStudy );
-      op->start();
-      
-      SALOMEDS::SObject_var newObj1 = aStudyBuilder->NewObject(fatherSF);
-      aStudyBuilder->Addreference(newObj1, obj);
-      // commit transaction
-      op->finish();
-                 
-      Handle(GEOM_InteractiveObject) anIO = new GEOM_InteractiveObject(const_cast<char*>(anIORValue.in()),
-                                                                      const_cast<char*>(aFatherIOR.in()),
-                                                                      "GEOM",
-                                                                      const_cast<char*>(obj->GetID()));
-      
-      class TEvent: public SALOME_Event{
-        QAD_Study* myStudy;
-        TopoDS_Shape myShape;
-        Handle(SALOME_InteractiveObject) myIO;
-        const char* myName;
-      public:
-        TEvent(QAD_Study* theStudy, TopoDS_Shape theShape,
-              const Handle(SALOME_InteractiveObject)& theIO, 
-              const char* theName):
-         myStudy(theStudy), myShape(theShape),
-                                  myIO(theIO), myName(theName)
-        {}
-        virtual void Execute(){
-         if(VTKViewer_ViewFrame* aViewFrame = GetFrame<VTKViewer_ViewFrame>(myStudy)){
-           VTKViewer_RenderWindowInteractor* myRenderInter= aViewFrame->getRWInteractor();
-           int aMode = myRenderInter->GetDisplayMode();
-           
-           vtkActorCollection* theActors = GEOM_AssemblyBuilder::BuildActors(myShape,0,aMode,true);
+  class TEvent: public SALOME_Event
+  {
+    std::string myEntry;
+    bool        myUpdateViewer;
+  public:
+    TEvent(const char* theEntry, bool toUpdateViewer):
+      myEntry(theEntry),
+      myUpdateViewer(toUpdateViewer)
+    {}
+    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;
+
+      _PTR(Study) aStudy(ActiveStudy->studyDS());
+      _PTR(StudyBuilder) aStudyBuilder = aStudy->NewBuilder();
+
+      GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen();
+      if (CORBA::is_nil(Geom)) {
+        GeometryGUI::InitGeomGen();
+        Geom = GeometryGUI::GetGeomGen();
+      }
+      if (CORBA::is_nil(Geom))
+        return;
+
+      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));
+        father->ComponentIOR(aFatherIOR);
+      }
+
+      _PTR(SObject) obj = aStudy->FindObjectID(myEntry);
+      if (!obj)
+        return;
+
+      // Create new actor
+      _PTR(GenericAttribute) anAttr;
+      if (!obj->FindAttribute(anAttr, "AttributeIOR"))
+        return;
+      _PTR(AttributeIOR) anIOR(anAttr);
+      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();
+          // open transaction
+          /*SUIT_Operation* op = new SalomeApp_ImportOperation (app);
+          op->start();
+
+          _PTR(SObject) newObj1 = aStudyBuilder->NewObject(father);
+          aStudyBuilder->Addreference(newObj1, obj);
+          // commit transaction
+          op->commit();*/
+          Handle(GEOM_InteractiveObject) anIO =
+            new GEOM_InteractiveObject (const_cast<char*>(anIORValue.c_str()),
+                                        const_cast<char*>(aFatherIOR.c_str()),
+                                        "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();
+
+           vtkActorCollection* theActors =
+              GEOM_AssemblyBuilder::BuildActors(Shape,0,aMode,true);
            theActors->InitTraversal();
-           while(vtkActor* anActor = theActors->GetNextActor()){
+           while (vtkActor* anActor = theActors->GetNextActor()) {
              GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor);
-             GActor->setName(const_cast<char*>(myName));
-             GActor->setIO(myIO);
-             myRenderInter->Display(GActor);
+             GActor->setName(const_cast<char*>(aNameValue.c_str()));
+             GActor->setIO(anIO);
+             aView->Display(GActor);
            }
-           myRenderInter->Update();
-         }else if(OCCViewer_ViewFrame* aViewFrame = GetFrame<OCCViewer_ViewFrame>(myStudy)){
-           Handle(AIS_InteractiveContext) ic = aViewFrame->getViewer()->getAISContext();
-           Handle(GEOM_AISShape) aSh = new GEOM_AISShape(myShape,const_cast<char*>(myName));
-           aSh->setName(const_cast<char*>(myName));
-           aSh->setIO(myIO);
-           
+           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);
          }
-         myStudy->updateObjBrowser(true);
-        }
-      };
-      ProcessVoidEvent(new TEvent(ActiveStudy,Shape,anIO,aNameValue.in()));
+       }
+      }
     }
-  }
+  };
+
+  // MESSAGE("createAndDisplayGO");
+  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());
+          if (app) {
+           CAM_Module* module = app->module("Geometry");
+           SalomeApp_Module* appMod = dynamic_cast<SalomeApp_Module*>(module);
+           if (appMod) appMod->updateObjBrowser(true);
+         }
+        }
+    };
+
+  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();
+         }
+      }
+  };
+
+  createAndDisplayGO(Entry);
+  ProcessVoidEvent(new TEventFitAll());
+}
 
-int  GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
+void GEOM_Swig::UpdateViewer()
 {
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
-  GEOM::GEOM_Gen_var  Geom = GEOM::GEOM_Gen::_narrow(comp);
-  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(); 
-    } 
-  } 
-  return -1;
+  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());
 }
 
-const char* GEOM_Swig::getShapeTypeString(const char* IOR)
+int GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
 {
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
-  GEOM::GEOM_Gen_var  Geom = GEOM::GEOM_Gen::_narrow(comp);
-  GEOM::GEOM_Object_var aShape = Geom->GetIORFromString(IOR);
-  TopoDS_Shape shape    = ShapeReader.GetShape(Geom, aShape);
+  GEOM::GEOM_Gen_var aGeomGen = GeometryGUI::GetGeomGen();
+  if (CORBA::is_nil(aGeomGen))
+    return -1;
 
-  if( shape.IsNull() ) {
-    return "Null Shape" ;
-  }
+  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;
 
-  switch (shape.ShapeType() )
+  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)
+{
+  TCollection_AsciiString aTypeName ("Shape of unknown type");
+
+  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:
-    { 
-      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_Object_var aShape = aGeomGen->GetIORFromString(IOR);
+    if (!CORBA::is_nil(aShape))
+    {
+      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)
 {
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
-  GEOM::GEOM_Gen_var  Geom = GEOM::GEOM_Gen::_narrow(comp);
+  GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen();
+  if ( CORBA::is_nil( Geom ) )
+    return "None";
+
   GEOM::GEOM_Object_var aShape = Geom->GetIORFromString(IOR);
   TopoDS_Shape shape = ShapeReader.GetShape(Geom, aShape);
 
   if( shape.IsNull() ) {
     return "None" ;
   }
-      
+
   switch (shape.ShapeType() )
     {
     case TopAbs_COMPOUND:
@@ -318,90 +363,272 @@ const char* GEOM_Swig::getShapeTypeIcon(const char* IOR)
     case TopAbs_VERTEX:
       { return "ICON_OBJBROWSER_VERTEX" ;}
     }
+
   return "None";
 }
 
-void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode)
+void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode, bool isUpdated)
 {
-  QAD_Study* aStudy = QAD_Application::getDesktop()->getActiveStudy();
-  Handle(SALOME_InteractiveObject) anIO = SALOME::FindIObject(aStudy,theEntry);
-
-  class TEvent: public SALOME_Event{
-    QAD_Study* myStudy;
-    Handle(SALOME_InteractiveObject) myIO;
-    int myParam;
+  class TEvent: public SALOME_Event {
+    std::string myEntry;
+    int myMode;
+    bool myUpdateViewer;
   public:
-    TEvent(QAD_Study* theStudy, const Handle(SALOME_InteractiveObject)& theIO, int theParam):
-      myStudy(theStudy), myIO(theIO), myParam(theParam)
+    TEvent(const char* theEntryArg, int theModeArg, bool theUpdated):
+      myEntry(theEntryArg), myMode(theModeArg), myUpdateViewer(theUpdated)
     {}
-    virtual void Execute(){
-      if(VTKViewer_ViewFrame* aViewFrame = GetFrame<VTKViewer_ViewFrame>(myStudy)){
-       VTKViewer_RenderWindowInteractor* myRenderInter= aViewFrame->getRWInteractor();
-       myRenderInter->SetDisplayMode(myIO,myParam);
-       myRenderInter->Update();
-      }else if(OCCViewer_ViewFrame* aViewFrame = GetFrame<OCCViewer_ViewFrame>(myStudy)){
-       OCCViewer_Viewer3d* v3d = aViewFrame->getViewer();
-       v3d->SwitchRepresentation(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->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);
       }
     }
   };
 
-  ProcessVoidEvent(new TEvent(aStudy,anIO,theMode));
+  ProcessVoidEvent(new TEvent (theEntry, theMode, isUpdated));
+}
+
+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(const char* theEntryArg, int theR, int theG, int theB, bool theUpdated):
+      myEntry(theEntryArg), myRed(theR), myGreen(theG), myBlue(theB), 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();
+        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();
+       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;
+         }
+       }
+      }
+    }
+  };
+  ProcessVoidEvent(new TEvent(theEntry, red, green, blue, isUpdated));
 }
 
-void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue)
+void GEOM_Swig::setTransparency(const char* theEntry, float transp, bool isUpdated)
 {
-  QAD_Study* aStudy = QAD_Application::getDesktop()->getActiveStudy();
-  Handle(SALOME_InteractiveObject) anIO = SALOME::FindIObject(aStudy,theEntry);
-  QColor aColor(red,green,blue);
-
-  class TEvent: public SALOME_Event{
-    QAD_Study* myStudy;
-    Handle(SALOME_InteractiveObject) myIO;
-    QColor myParam;
+  class TEvent: public SALOME_Event {
+    std::string myEntry;
+    float myParam;
+    bool myUpdateViewer;
   public:
-    TEvent(QAD_Study* theStudy, const Handle(SALOME_InteractiveObject)& theIO, const QColor& theParam):
-      myStudy(theStudy), myIO(theIO), myParam(theParam)
+    TEvent(const char* theEntryArg, float theParam, bool theUpdated):
+      myEntry(theEntryArg), myParam(theParam), myUpdateViewer(theUpdated)
     {}
-    virtual void Execute(){
-      if(VTKViewer_ViewFrame* aViewFrame = GetFrame<VTKViewer_ViewFrame>(myStudy)){
-       VTKViewer_RenderWindowInteractor* myRenderInter= aViewFrame->getRWInteractor();
-       myRenderInter->SetColor(myIO,myParam);
-       myRenderInter->Update();
-      }else if(OCCViewer_ViewFrame* aViewFrame = GetFrame<OCCViewer_ViewFrame>(myStudy)){
-       OCCViewer_Viewer3d* v3d = aViewFrame->getViewer();
-       v3d->SetColor(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(aStudy,anIO,aColor));
+  ProcessVoidEvent(new TEvent (theEntry, transp, isUpdated));
 }
 
-void GEOM_Swig::setTransparency(const char* theEntry, float transp)
+
+class TInitGeomGenEvent: public SALOME_Event {
+public:
+  typedef bool TResult;
+  TResult myResult;
+  TInitGeomGenEvent() : myResult(false) {}
+  virtual void Execute() {
+    myResult = GeometryGUI::InitGeomGen();
+  }
+};
+bool GEOM_Swig::initGeomGen()
 {
-  QAD_Study* aStudy = QAD_Application::getDesktop()->getActiveStudy();
-  Handle(SALOME_InteractiveObject) anIO = SALOME::FindIObject(aStudy,theEntry);
+  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));
+}
+
+
 
-  class TEvent: public SALOME_Event{
-    QAD_Study* myStudy;
-    Handle(SALOME_InteractiveObject) myIO;
+void GEOM_Swig::setDeflection(const char* theEntry, float theDeflect)
+{
+  class TEvent: public SALOME_Event {
+    std::string myEntry;
     float myParam;
   public:
-    TEvent(QAD_Study* theStudy, const Handle(SALOME_InteractiveObject)& theIO, float theParam):
-      myStudy(theStudy), myIO(theIO), myParam(theParam)
+    TEvent(const char* theEntryArg, float theParam):
+      myEntry(theEntryArg), myParam(theParam)
     {}
-    virtual void Execute(){
-      if(VTKViewer_ViewFrame* aViewFrame = GetFrame<VTKViewer_ViewFrame>(myStudy)){
-       VTKViewer_RenderWindowInteractor* myRenderInter= aViewFrame->getRWInteractor();
-       myRenderInter->SetTransparency(myIO,myParam);
-       myRenderInter->Update();
-      }else if(OCCViewer_ViewFrame* aViewFrame = GetFrame<OCCViewer_ViewFrame>(myStudy)){
-       OCCViewer_Viewer3d* v3d = aViewFrame->getViewer();
-       v3d->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)) {
+       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(aStudy,anIO,transp));
+  ProcessVoidEvent(new TEvent (theEntry, theDeflect));
 }
+