X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGeometryGUI_Swig.cxx;h=0e75e9aeca11d825fc9fb7a9967ac1f29ee362d3;hb=755cee6ce69ea370fc2fb2b8d712964257e2493a;hp=e639b789e789a4b2622cdff25b5a6dcbdbd75943;hpb=629a486f1953fa7a23eec6869665c07e578cf152;p=modules%2Fgeom.git diff --git a/src/GEOMGUI/GeometryGUI_Swig.cxx b/src/GEOMGUI/GeometryGUI_Swig.cxx index e639b789e..0e75e9aec 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.cxx +++ b/src/GEOMGUI/GeometryGUI_Swig.cxx @@ -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 // // // @@ -31,54 +31,50 @@ #include "GeometryGUI.h" -#include -#include -#include -#include +#include "SUIT_Session.h" +#include "SalomeApp_Application.h" +#include "SalomeApp_Study.h" +#include "SalomeApp_ImportOperation.h" -#include +#include "OB_Browser.h" -#include -#include -#include +#include "OCCViewer_ViewWindow.h" +#include "OCCViewer_ViewManager.h" +#include "SOCC_ViewModel.h" -#include -#include -#include -#include -#include +#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" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +// OCCT Includes +#include +#include #include #include -#include +#include -#include "utilities.h" +// IDL Headers +#include +#include CORBA_SERVER_HEADER(GEOM_Gen) + +#include using namespace std; -#include "SALOMEDSClient.hxx" -#include "SALOMEDS_SObject.hxx" -#include "SALOMEDS_Study.hxx" static GEOM_Client ShapeReader; @@ -88,19 +84,19 @@ inline OCCViewer_Viewer* GetOCCViewer(SUIT_Application* theApp){ OCCViewer_ViewWindow* vw = dynamic_cast( window ); if ( vw ) { OCCViewer_ViewManager* vm = dynamic_cast( vw->getViewManager() ); - if ( vm ) + if ( vm ) return vm->getOCCViewer(); } } - + return 0; } inline SVTK_ViewWindow* GetSVTKViewWindow(SUIT_Application* theApp){ SUIT_ViewWindow* window = theApp->desktop()->activeWindow(); - if(window && window->getViewManager()->getType() == VTKViewer_Viewer::Type()) + if(window && window->getViewManager()->getType() == SVTK_Viewer::Type()) return dynamic_cast( window ); - + return 0; } @@ -114,238 +110,217 @@ GEOM_Swig::~GEOM_Swig() // MESSAGE("Destructeur"); } -void GEOM_Swig::createAndDisplayGO(const char* Entry) +void GEOM_Swig::createAndDisplayGO (const char* Entry) { - // MESSAGE("createAndDisplayGO"); - - SUIT_Application* app = SUIT_Session::session()->activeApplication(); - if ( !app ) return; - - SalomeApp_Study* ActiveStudy = dynamic_cast( 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 ) ) - return; - - string aFatherIOR; - _PTR(SComponent) father = aStudy->FindComponent("GEOM"); - aStudyBuilder->DefineComponentInstance( father, SalomeApp_Application::orb()->object_to_string(Geom) ); - father->ComponentIOR(aFatherIOR); - - _PTR(SObject) fatherSF; - - _PTR(SObject) obj = aStudy->FindObjectID(Entry); - _PTR(GenericAttribute) anAttr; - - // Create new actor - 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 ( obj ) { - 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(anIORValue.c_str()), - const_cast(aFatherIOR.c_str()), - "GEOM", - const_cast( obj->GetID().c_str() )); - - class TEvent: public SALOME_Event{ - SUIT_Application* myApp; - TopoDS_Shape myShape; - Handle(SALOME_InteractiveObject) myIO; - const char* myName; - public: - TEvent(SUIT_Application* theApp, TopoDS_Shape theShape, - const Handle(SALOME_InteractiveObject)& theIO, - const char* theName): - myApp(theApp), myShape(theShape), - myIO(theIO), myName(theName) - {} - virtual void Execute(){ - if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ - SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); - int aMode = myRenderInter->GetDisplayMode(); - - vtkActorCollection* theActors = GEOM_AssemblyBuilder::BuildActors(myShape,0,aMode,true); + class TEvent: public SALOME_Event + { + std::string myEntry; + public: + TEvent(const char* theEntry): + myEntry(theEntry) + {} + virtual void Execute() + { + SUIT_Application* app = SUIT_Session::session()->activeApplication(); + if (!app) return; + + SalomeApp_Study* ActiveStudy = dynamic_cast(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(anIORValue.c_str()), + const_cast(aFatherIOR.c_str()), + "GEOM", + const_cast( obj->GetID().c_str())); + + GEOM_Displayer(ActiveStudy).Display(anIO, true); + /*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(myName)); - GActor->setIO(myIO); - myRenderInter->Display(GActor); + GActor->setName(const_cast(aNameValue.c_str())); + GActor->setIO(anIO); + aView->Display(GActor); } - myRenderInter->Update(); - }else if( OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)){ + aView->Repaint(); + } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app)) { Handle(AIS_InteractiveContext) ic = occViewer->getAISContext(); - Handle(GEOM_AISShape) aSh = new GEOM_AISShape(myShape,const_cast(myName)); - aSh->setName(const_cast(myName)); - aSh->setIO(myIO); + Handle(GEOM_AISShape) aSh = + new GEOM_AISShape (Shape,const_cast(aNameValue.c_str())); + aSh->setName(const_cast(aNameValue.c_str())); + aSh->setIO(anIO); ic->Display(aSh); ic->AddOrRemoveCurrentObject(aSh,true); - } + }*/ // update object browser - SalomeApp_Application* app = dynamic_cast(myApp); + SalomeApp_Application* app = NULL; //dynamic_cast(app); if (app) { - CAM_Module* module = app->module( "Geometry" ); - SalomeApp_Module* appMod = dynamic_cast( module ); - if ( appMod ) - appMod->updateObjBrowser( true ); + CAM_Module* module = app->module("Geometry"); + SalomeApp_Module* appMod = dynamic_cast(module); + if (appMod) + appMod->updateObjBrowser(true); } - } - }; - ProcessVoidEvent(new TEvent(app,Shape,anIO,aNameValue.c_str())); + } } - } + }; + + // MESSAGE("createAndDisplayGO"); + ProcessVoidEvent(new TEvent (Entry)); + + class TEventUpdateBrowser: public SALOME_Event + { + public: + TEventUpdateBrowser() {} + virtual void Execute() { + SalomeApp_Application* app = + dynamic_cast(SUIT_Session::session()->activeApplication()); + if (app) { + CAM_Module* module = app->module("Geometry"); + SalomeApp_Module* appMod = dynamic_cast(module); + if (appMod) appMod->updateObjBrowser(true); + } + } + }; + + 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) +int GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR) { - GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen(); - if ( CORBA::is_nil( Geom ) ) + 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(); - } - } - return -1; + + 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; + + 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); + TCollection_AsciiString aTypeName ("Shape of unknown type"); - if( shape.IsNull() ) { - return "Null Shape" ; - } - - 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: - { - 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) { - GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen(); + 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: @@ -365,81 +340,80 @@ 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) { - 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; public: - TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, int theParam): - myApp(theApp), myIO(theIO), myParam(theParam) + TEvent(const char* theEntryArg, int theModeArg): + myEntry(theEntryArg), myMode(theModeArg) {} - virtual void Execute(){ - if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ - SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); - myRenderInter->SetDisplayMode(myIO,myParam); - myRenderInter->Update(); + 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); + aView->Repaint(); } - else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) { - SOCC_Viewer* soccViewer = dynamic_cast( occViewer ); + else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) { + SOCC_Viewer* soccViewer = dynamic_cast(occViewer); if (soccViewer) - soccViewer->switchRepresentation(myIO,myParam); + soccViewer->switchRepresentation(anIO, myMode); } } }; - ProcessVoidEvent(new TEvent(app,anIO,theMode)); + ProcessVoidEvent(new TEvent (theEntry, theMode)); } void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue) { - SUIT_Application* app = SUIT_Session::session()->activeApplication(); - if ( !app ) return; - - Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", ""); - - QColor aColor(red,green,blue); - - class TEvent: public SALOME_Event{ - SUIT_Application* myApp; - Handle(SALOME_InteractiveObject) myIO; - QColor myParam; + class TEvent: public SALOME_Event { + std::string myEntry; + int myRed; + int myGreen; + int myBlue; 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): + myEntry(theEntryArg), myRed(theR), myGreen(theG), myBlue(theB) {} - virtual void Execute(){ - if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ - SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); - myRenderInter->SetColor(myIO,myParam); - myRenderInter->Update(); - }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)){ + 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); + 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() ) { + 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 ); + 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); + ite.Value()->Redisplay(Standard_True); occViewer->update(); break; } @@ -447,36 +421,184 @@ void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue) } } }; - ProcessVoidEvent(new TEvent(app,anIO,aColor)); + ProcessVoidEvent(new TEvent(theEntry, red, green, blue)); } void GEOM_Swig::setTransparency(const char* theEntry, float transp) { - 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; public: - TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, float theParam): - myApp(theApp), myIO(theIO), myParam(theParam) + TEvent(const char* theEntryArg, float theParam): + myEntry(theEntryArg), myParam(theParam) {} - virtual void Execute(){ - if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ - SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); - myRenderInter->SetTransparency(myIO,myParam); - myRenderInter->Update(); - }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) { - SOCC_Viewer* soccViewer = dynamic_cast( occViewer ); + 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); + aView->Repaint(); + } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) { + SOCC_Viewer* soccViewer = dynamic_cast(occViewer); if (soccViewer) - soccViewer->setTransparency(myIO,myParam); + soccViewer->setTransparency(anIO, myParam); } } }; - - ProcessVoidEvent(new TEvent(app,anIO,transp)); + + ProcessVoidEvent(new TEvent (theEntry, 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() +{ + 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(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 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( theWin ); + if ( vw ) { + OCCViewer_ViewManager* vm = dynamic_cast( vw->getViewManager() ); + if ( vm ) { + SOCC_Viewer* aViewer = dynamic_cast(vm->getOCCViewer()); + if (aViewer) { + SALOME_Prs* aPrs = aViewer->CreatePrs(myEntry.c_str()); + if (aPrs) { + SALOME_OCCPrs* aOccPrs = dynamic_cast(aPrs); + if (aOccPrs) { + aViewer->Erase(aOccPrs); + aViewer->Repaint(); + } + } + } + } + } + } else if (theWin->getViewManager()->getType() == SVTK_Viewer::Type()){ + SVTK_ViewWindow* aViewWindow = dynamic_cast( 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(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()) { + Handle(AIS_Drawer) aDrawer = aShape->Attributes(); + if (aDrawer.IsNull()) + aDrawer = new AIS_Drawer(); + aDrawer->SetDeviationCoefficient(myParam); + aShape->SetAttributes(aDrawer); + aContext->Redisplay(aShape, true, true); + aContext->UpdateCurrentViewer(); + return; + } + } + } + } + } + }; + + ProcessVoidEvent(new TEvent (theEntry, theDeflect)); +} +