// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
#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 "GeometryGUI.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 <VTKViewer_ViewWindow.h>
+#include <VTKViewer_ViewModel.h>
+#include <VTKViewer_RenderWindowInteractor.h>
+#include <SVTK_ViewWindow.h>
+#include <SVTK_RenderWindowInteractor.h>
+
+#include "GEOM_Actor.h"
+#include "GEOM_Client.hxx"
+#include "GEOM_AISShape.hxx"
+#include "GEOM_AssemblyBuilder.h"
+#include "GEOM_InteractiveObject.hxx"
+
+#include <SALOME_Event.hxx>
-#include "OCCViewer_Viewer3d.h"
-#include "OCCViewer_ViewFrame.h"
+#include "utilities.h"
+
+#include "SALOMEDSClient.hxx"
+
+// OCCT Includes
#include <TopExp_Explorer.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <V3d_Viewer.hxx>
-#include "SALOME_Event.hxx"
-
-#include "VTKViewer_RenderWindowInteractor.h"
-#include "VTKViewer_ViewFrame.h"
-
-#include "GEOM_Actor.h"
-#include "GEOM_Client.hxx"
-#include "GEOM_AISShape.hxx"
-#include "GEOM_AssemblyBuilder.h"
-#include "GEOM_InteractiveObject.hxx"
-
-#include "utilities.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() == VTKViewer_Viewer::Type())
+ return dynamic_cast<SVTK_ViewWindow*>( window );
+
+ return 0;
+}
GEOM_Swig::GEOM_Swig()
{
// MESSAGE("Destructeur");
}
-void GEOM_Swig::createAndDisplayGO(const char* Entry)
+void GEOM_Swig::createAndDisplayGO (const char* Entry)
{
- // 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;
+ 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<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))
+ return;
+
+ string aFatherIOR;
+ _PTR(SComponent) father = aStudy->FindComponent("GEOM");
+ aStudyBuilder->DefineComponentInstance
+ (father, SalomeApp_Application::orb()->object_to_string(Geom));
+ father->ComponentIOR(aFatherIOR);
+
+ _PTR(SObject) obj = aStudy->FindObjectID(myEntry);
+ _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<char*>(anIORValue.c_str()),
+ const_cast<char*>(aFatherIOR.c_str()),
+ "GEOM",
+ const_cast<char*>( obj->GetID().c_str()));
+
+ if (SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(app)) {
+
+ SVTK_RenderWindowInteractor* aRenderInter= svtkViewWindow->getRWInteractor();
+ int aMode = aRenderInter->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);
+ aRenderInter->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);
+ aRenderInter->Update();
+ cout << 8.2 << endl;
+ } 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);
}
- myStudy->updateObjBrowser(true);
- }
- };
- ProcessVoidEvent(new TEvent(ActiveStudy,Shape,anIO,aNameValue.in()));
+ // 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));
+
+ 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);
+ }
+ }
+ };
+
+ ProcessVoidEvent(new TEventUpdateBrowser ());
}
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_Gen_var Geom = GeometryGUI::GetGeomGen();
+ if ( CORBA::is_nil( Geom ) )
+ return -1;
+
GEOM::GEOM_Object_var aMainShape = Geom->GetIORFromString(IOR);
TopoDS_Shape shape = ShapeReader.GetShape(Geom, aMainShape);
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;
+ 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()) {
+ 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());
+ return index;
+ else
+ index++;
+ CL.Append(it.Value());
}
- }
- }
- }
- else {
- TopExp_Explorer Exp(shape, subshape.ShapeType());
- TopTools_MapOfShape M;
- while(Exp.More()) {
+ }
+ }
+ }
+ 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();
- }
- }
+ if(Exp.Current().IsSame(subshape))
+ return index;
+ index++;
+ }
+ Exp.Next();
+ }
+ }
+
return -1;
}
const char* GEOM_Swig::getShapeTypeString(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 0;
+
GEOM::GEOM_Object_var aShape = Geom->GetIORFromString(IOR);
TopoDS_Shape shape = ShapeReader.GetShape(Geom, aShape);
case TopAbs_SHELL:
{ return "Shell" ;}
case TopAbs_FACE:
- {
+ {
BRepAdaptor_Surface surf(TopoDS::Face(shape));
if ( surf.GetType() == GeomAbs_Plane ) {
return "Plane" ;
case TopAbs_WIRE:
{ return "Wire" ;}
case TopAbs_EDGE:
- {
+ {
BRepAdaptor_Curve curv(TopoDS::Edge(shape));
if ( curv.GetType() == GeomAbs_Line ) {
- if ( (Abs(curv.FirstParameter()) >= 1E6 ) ||
+ if ( (Abs(curv.FirstParameter()) >= 1E6 ) ||
(Abs(curv.LastParameter()) >= 1E6 )) {
return "Line" ;
} else
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:
case TopAbs_VERTEX:
{ return "ICON_OBJBROWSER_VERTEX" ;}
}
+
return "None";
}
void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode)
{
- QAD_Study* aStudy = QAD_Application::getDesktop()->getActiveStudy();
- Handle(SALOME_InteractiveObject) anIO = SALOME::FindIObject(aStudy,theEntry);
+ SUIT_Application* app = SUIT_Session::session()->activeApplication();
+ if ( !app ) return;
+
+ Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", "");
class TEvent: public SALOME_Event{
- QAD_Study* myStudy;
+ SUIT_Application* myApp;
Handle(SALOME_InteractiveObject) myIO;
int myParam;
public:
- TEvent(QAD_Study* theStudy, const Handle(SALOME_InteractiveObject)& theIO, int theParam):
- myStudy(theStudy), myIO(theIO), myParam(theParam)
+ TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, int theParam):
+ myApp(theApp), myIO(theIO), myParam(theParam)
{}
virtual void Execute(){
- if(VTKViewer_ViewFrame* aViewFrame = GetFrame<VTKViewer_ViewFrame>(myStudy)){
- VTKViewer_RenderWindowInteractor* myRenderInter= aViewFrame->getRWInteractor();
+ if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){
+ SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->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);
+ }
+ else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) {
+ SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>( occViewer );
+ if (soccViewer)
+ soccViewer->switchRepresentation(myIO,myParam);
}
}
};
- ProcessVoidEvent(new TEvent(aStudy,anIO,theMode));
+ ProcessVoidEvent(new TEvent(app,anIO,theMode));
}
void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue)
{
- QAD_Study* aStudy = QAD_Application::getDesktop()->getActiveStudy();
- Handle(SALOME_InteractiveObject) anIO = SALOME::FindIObject(aStudy,theEntry);
+ 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{
- QAD_Study* myStudy;
+ SUIT_Application* myApp;
Handle(SALOME_InteractiveObject) myIO;
QColor myParam;
public:
- TEvent(QAD_Study* theStudy, const Handle(SALOME_InteractiveObject)& theIO, const QColor& theParam):
- myStudy(theStudy), myIO(theIO), myParam(theParam)
+ TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, const QColor& theParam):
+ myApp(theApp), myIO(theIO), myParam(theParam)
{}
virtual void Execute(){
- if(VTKViewer_ViewFrame* aViewFrame = GetFrame<VTKViewer_ViewFrame>(myStudy)){
- VTKViewer_RenderWindowInteractor* myRenderInter= aViewFrame->getRWInteractor();
+ if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){
+ SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor();
myRenderInter->SetColor(myIO,myParam);
myRenderInter->Update();
- }else if(OCCViewer_ViewFrame* aViewFrame = GetFrame<OCCViewer_ViewFrame>(myStudy)){
- OCCViewer_Viewer3d* v3d = aViewFrame->getViewer();
- Handle(AIS_InteractiveContext) ic = aViewFrame->getViewer()->getAISContext();
+ }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)){
+ Handle(AIS_InteractiveContext) ic = occViewer->getAISContext();
AIS_ListOfInteractive List;
ic->DisplayedObjects(List);
AIS_ListIteratorOfListOfInteractive ite(List);
Quantity_TOC_RGB );
ite.Value()->SetColor( CSFColor );
if ( ite.Value()->IsKind( STANDARD_TYPE(GEOM_AISShape) ) )
- Handle(GEOM_AISShape)::DownCast( ite.Value() )->SetShadingColor( CSFColor );
+ Handle(GEOM_AISShape)::DownCast( ite.Value() )->SetShadingColor( CSFColor );
ite.Value()->Redisplay( Standard_True );
- v3d->getViewer3d()->Update();
+ occViewer->update();
break;
}
}
}
}
};
-
- ProcessVoidEvent(new TEvent(aStudy,anIO,aColor));
+ ProcessVoidEvent(new TEvent(app,anIO,aColor));
}
void GEOM_Swig::setTransparency(const char* theEntry, float transp)
{
- QAD_Study* aStudy = QAD_Application::getDesktop()->getActiveStudy();
- Handle(SALOME_InteractiveObject) anIO = SALOME::FindIObject(aStudy,theEntry);
+ SUIT_Application* app = SUIT_Session::session()->activeApplication();
+ if ( !app ) return;
+
+ Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", "");
class TEvent: public SALOME_Event{
- QAD_Study* myStudy;
+ SUIT_Application* myApp;
Handle(SALOME_InteractiveObject) myIO;
float myParam;
public:
- TEvent(QAD_Study* theStudy, const Handle(SALOME_InteractiveObject)& theIO, float theParam):
- myStudy(theStudy), myIO(theIO), myParam(theParam)
+ TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, float theParam):
+ myApp(theApp), myIO(theIO), myParam(theParam)
{}
virtual void Execute(){
- if(VTKViewer_ViewFrame* aViewFrame = GetFrame<VTKViewer_ViewFrame>(myStudy)){
- VTKViewer_RenderWindowInteractor* myRenderInter= aViewFrame->getRWInteractor();
+ if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){
+ SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->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);
+ }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) {
+ SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>( occViewer );
+ if (soccViewer)
+ soccViewer->setTransparency(myIO,myParam);
}
}
};
- ProcessVoidEvent(new TEvent(aStudy,anIO,transp));
+ ProcessVoidEvent(new TEvent(app,anIO,transp));
+}
+
+
+bool GEOM_Swig::initGeomGen()
+{
+ return GeometryGUI::InitGeomGen();
}
