X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FGEOMGUI%2FGEOM_Displayer.cxx;h=40b20d41fc5327dae1b4c1e5fa459ae64677292c;hb=e180c20f73ffa96c2d039106f2a2a868c8bc0df1;hp=f518e4ecb50120261adb7e2eba088b53c850aed3;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index f518e4ecb..40b20d41f 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.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 +// 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 +// 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 // // // @@ -27,65 +27,84 @@ // $Header$ #include "GEOM_Displayer.h" -#include "GEOM_ShapeTypeFilter.hxx" -#include "GEOM_TypeFilter.hxx" -#include "QAD_Desktop.h" -#include "QAD_Application.h" -#include "QAD_Study.h" -#include "QAD_StudyFrame.h" -#include "QAD_RightFrame.h" -#include "QAD_ViewFrame.h" -#include "QAD_Config.h" -#include "SALOME_ListIteratorOfListIO.hxx" -#include "OCCViewer_Prs.h" -#include "OCCViewer_ViewFrame.h" -#include "OCCViewer_Viewer3d.h" -#include "VTKViewer_Prs.h" -#include "VTKViewer_ViewFrame.h" -#include "GEOMImpl_Types.hxx" -#include "TColStd_MapOfInteger.hxx" -#include "TColStd_MapIteratorOfMapOfInteger.hxx" -#include "GEOM_EdgeFilter.hxx" -#include "GEOM_FaceFilter.hxx" -#include "GEOM_PreviewFilter.hxx" -#include "GEOM_LogicalFilter.hxx" -#include "GEOM_AssemblyBuilder.h" + +#include "GeometryGUI.h" + +#include "GEOM_TypeFilter.h" +#include "GEOM_EdgeFilter.h" +#include "GEOM_FaceFilter.h" +#include "GEOM_PreviewFilter.h" +#include "GEOM_LogicalFilter.h" +#include "GEOM_OCCFilter.h" + #include "GEOM_Actor.h" +#include "GEOM_AssemblyBuilder.h" +#include "GEOM_AISShape.hxx" #include "GEOM_AISTrihedron.hxx" #include "GEOM_VTKTrihedron.hxx" -#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) +#include +#include +#include +#include +#include -#include "GeometryGUI.h" -#include "GEOM_AISShape.hxx" -#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include + +#include +#include + +// OCCT Includes #include +#include #include #include -#include +#include +#include #include #include -#include +#include #include +#include +#include +#include +// VTK Includes #include +#include +// STL Includes #include +// CORBA Headers +#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) + +#include "GEOMImpl_Types.hxx" + using namespace std; //================================================================ // Function : getActiveStudy // Purpose : Get active study, returns 0 if no open study frame //================================================================ -static inline QAD_Study* getActiveStudy() +static inline SalomeApp_Study* getActiveStudy() { - QAD_Desktop* desktop = QAD_Application::getDesktop(); - if ( desktop ) { - QAD_Application* app = desktop->getActiveApp(); - if ( app ) - return app->getActiveStudy(); - } + SUIT_Session* session = SUIT_Session::session(); + SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); + if ( app ) + return ( SalomeApp_Study* )app->activeStudy(); return 0; } @@ -110,37 +129,37 @@ static inline int getTopAbsMode( const int implType ) } //================================================================ -// Function : getTopAbsMode +// Function : getFilter // Purpose : Get filter corresponding to the type of object // from GEOMImpl_Types.h //================================================================ -static inline Handle(SALOME_Filter) getFilter( const int theMode ) +SUIT_SelectionFilter* GEOM_Displayer::getFilter( const int theMode ) { - Handle(SALOME_Filter) aFilter; - + SUIT_SelectionFilter* aFilter; + int aTopAbsMode = getTopAbsMode( theMode ); if ( aTopAbsMode != -1 ) - aFilter = new GEOM_ShapeTypeFilter( ( TopAbs_ShapeEnum )aTopAbsMode ); + aFilter = new GEOM_TypeFilter( getStudy(), aTopAbsMode, true ); //@ aFilter = new GEOM_TypeFilter( ( TopAbs_ShapeEnum )aTopAbsMode ); else switch ( theMode ) - { - case GEOM_LINE : aFilter = new GEOM_EdgeFilter( StdSelect_Line ); break; - case GEOM_CIRCLE : aFilter = new GEOM_EdgeFilter( StdSelect_Circle ); break; - - case GEOM_PLANE : aFilter = new GEOM_FaceFilter( StdSelect_Plane ); break; - case GEOM_CYLINDER : aFilter = new GEOM_FaceFilter( StdSelect_Cylinder ); break; - case GEOM_SPHERE : aFilter = new GEOM_FaceFilter( StdSelect_Sphere ); break; - case GEOM_TORUS : aFilter = new GEOM_FaceFilter( StdSelect_Torus ); break; - case GEOM_REVOLUTION: aFilter = new GEOM_FaceFilter( StdSelect_Revol ); break; - case GEOM_CONE : aFilter = new GEOM_FaceFilter( StdSelect_Cone ); break; - - case GEOM_PREVIEW : aFilter = new GEOM_PreviewFilter(); break; - - case GEOM_ALLSHAPES : aFilter = new GEOM_ShapeTypeFilter( -1, true ); break; - case GEOM_ALLGEOM : aFilter = new SALOME_TypeFilter( "GEOM" ); break; - - default : aFilter = new GEOM_TypeFilter( theMode ); break; - } + { + case GEOM_LINE : aFilter = new GEOM_EdgeFilter( getStudy(), StdSelect_Line ); break; + case GEOM_CIRCLE : aFilter = new GEOM_EdgeFilter( getStudy(), StdSelect_Circle ); break; + + case GEOM_PLANE : aFilter = new GEOM_FaceFilter( getStudy(), StdSelect_Plane ); break; + case GEOM_CYLINDER : aFilter = new GEOM_FaceFilter( getStudy(), StdSelect_Cylinder ); break; + case GEOM_SPHERE : aFilter = new GEOM_FaceFilter( getStudy(), StdSelect_Sphere ); break; + case GEOM_TORUS : aFilter = new GEOM_FaceFilter( getStudy(), StdSelect_Torus ); break; + case GEOM_REVOLUTION: aFilter = new GEOM_FaceFilter( getStudy(), StdSelect_Revol ); break; + case GEOM_CONE : aFilter = new GEOM_FaceFilter( getStudy(), StdSelect_Cone ); break; + + case GEOM_PREVIEW : aFilter = new GEOM_PreviewFilter( getStudy() ); break; + + case GEOM_ALLSHAPES : aFilter = new GEOM_SelectionFilter(getStudy(), true ); break; + case GEOM_ALLGEOM : aFilter = new SalomeApp_TypeFilter( getStudy(), "GEOM" ); break; + + default : aFilter = new GEOM_TypeFilter( getStudy(), theMode ); break; + } return aFilter; } @@ -149,16 +168,19 @@ static inline Handle(SALOME_Filter) getFilter( const int theMode ) // Function : getEntry // Purpose : //================================================================ -static char* getEntry( GEOM::GEOM_Object_ptr object ) +static string getEntry( GEOM::GEOM_Object_ptr object ) { - QAD_Study* study = getActiveStudy(); - if ( study ) { - string IOR = GeometryGUI::GetORB()->object_to_string( object ); - if ( IOR != "" ) { - SALOMEDS::SObject_var SO = study->getStudyDocument()->FindObjectIOR( IOR.c_str() ); - if ( !SO->_is_nil() ) { + SUIT_Session* session = SUIT_Session::session(); + SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); + if ( app ) + { + string IOR = app->orb()->object_to_string( object ); + if ( IOR != "" ) + { + SalomeApp_Study* study = ( SalomeApp_Study* )app->activeStudy(); + _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) ); + if ( SO ) return SO->GetID(); - } } } return ""; @@ -168,21 +190,23 @@ static char* getEntry( GEOM::GEOM_Object_ptr object ) // Function : getName // Purpose : //================================================================ -static const char* getName( GEOM::GEOM_Object_ptr theObj ) +static string getName( GEOM::GEOM_Object_ptr object ) { - QAD_Study* aStudy = QAD_Application::getDesktop()->getActiveStudy(); - - if ( aStudy ) + SUIT_Session* session = SUIT_Session::session(); + SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); + if ( app ) { - string anIOR = GeometryGUI::GetORB()->object_to_string( theObj ); - if ( anIOR != "" ) + string IOR = app->orb()->object_to_string( object ); + if ( IOR != "" ) { - SALOMEDS::SObject_var aSObj = aStudy->getStudyDocument()->FindObjectIOR( anIOR.c_str() ); - SALOMEDS::GenericAttribute_var anAttr; + SalomeApp_Study* study = ( SalomeApp_Study* )app->activeStudy(); + _PTR(SObject) aSObj ( study->studyDS()->FindObjectIOR( IOR ) ); + + _PTR(GenericAttribute) anAttr; - if ( !aSObj->_is_nil() && aSObj->FindAttribute( anAttr, "AttributeName") ) + if ( aSObj && aSObj->FindAttribute( anAttr, "AttributeName") ) { - SALOMEDS::AttributeName_var aNameAttr = SALOMEDS::AttributeName::_narrow( anAttr ); + _PTR(AttributeName) aNameAttr( anAttr ); return aNameAttr->Value(); } } @@ -197,17 +221,21 @@ static const char* getName( GEOM::GEOM_Object_ptr theObj ) * Constructor */ //================================================================= -GEOM_Displayer::GEOM_Displayer() +GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st ) { - /* Shading Color */ - QString SCr = QAD_CONFIG->getSetting( "Geometry:SettingsShadingColorRed" ); - QString SCg = QAD_CONFIG->getSetting( "Geometry:SettingsShadingColorGreen" ); - QString SCb = QAD_CONFIG->getSetting( "Geometry:SettingsShadingColorBlue" ); - if ( !SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty() ) - myShadingColor = Quantity_Color( - SCr.toInt()/255., SCg.toInt()/255., SCb.toInt()/255., Quantity_TOC_RGB ); + if( st ) + myApp = dynamic_cast( st->application() ); else - myShadingColor = Quantity_Color( Quantity_NOC_GOLDENROD ); + myApp = 0; + + /* Shading Color */ + SUIT_Session* session = SUIT_Session::session(); + SUIT_ResourceMgr* resMgr = session->resourceMgr(); + + QColor col = resMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) ); + myShadingColor = SalomeApp_Tools::color( col ); + + myDisplayMode = resMgr->integerValue("Geometry", "display_mode", 0); myColor = -1; // This color is used for shape displaying. If it is equal -1 then @@ -232,59 +260,30 @@ GEOM_Displayer::~GEOM_Displayer() { } -//================================================================= -/*! - * GetActiveView - * Get active study frame, returns 0 if no open study frame - */ -//================================================================= -QAD_ViewFrame* GEOM_Displayer::GetActiveView() -{ - QAD_Study* activeStudy = getActiveStudy(); - if ( activeStudy ) - { - QAD_StudyFrame* sf = activeStudy->getActiveStudyFrame(); - if ( sf ) - { - return sf->getRightFrame()->getViewFrame(); - } - } - return 0; -} - //================================================================= /*! * GEOM_Displayer::Display * Display interactive object in the current viewer */ //================================================================= -void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO, const bool updateViewer, - QAD_ViewFrame* theViewFrame ) +void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO, + const bool updateViewer, + SALOME_View* theViewFrame ) { - QAD_ViewFrame* vf = theViewFrame; - if ( !vf ) - vf = GetActiveView(); - + SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); if ( vf ) { - if ( vf->inherits( "VTKViewer_ViewFrame" ) ) - { - SALOME_Prs* prs = vf->CreatePrs( !theIO.IsNull() ? theIO->getEntry() : 0 ); - ((SALOME_View*)vf)->Erase( prs, true ); - delete prs; - } - - SALOME_Prs* prs = buildPresentation( theIO, vf ); - + SALOME_Prs* prs = buildPresentation( theIO->getEntry(), vf ); + if ( prs ) { vf->BeforeDisplay( this ); - ((SALOME_View*)vf)->Display( prs ); + vf->Display( prs ); vf->AfterDisplay( this ); - + if ( updateViewer ) vf->Repaint(); - + delete prs; // delete presentation because displayer is its owner } } @@ -304,8 +303,8 @@ void GEOM_Displayer::Display( GEOM::GEOM_Object_ptr theObj, const bool updateVie string entry = getEntry( theObj ); if ( entry != "" ) { - Display( new SALOME_InteractiveObject( - entry.c_str(), "GEOM", strdup( getName( theObj ) ) ), updateViewer ); + Display(new SALOME_InteractiveObject(entry.c_str(), "GEOM", getName(theObj).c_str()), + updateViewer); } } @@ -318,19 +317,17 @@ void GEOM_Displayer::Display( GEOM::GEOM_Object_ptr theObj, const bool updateVie void GEOM_Displayer::Erase( const Handle(SALOME_InteractiveObject)& theIO, const bool forced, const bool updateViewer, - QAD_ViewFrame* theViewFrame ) + SALOME_View* theViewFrame ) { if ( theIO.IsNull() ) return; - QAD_ViewFrame* vf = theViewFrame; - if ( !vf ) - vf = GetActiveView(); - + SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); + if ( vf ) { SALOME_Prs* prs = vf->CreatePrs( theIO->getEntry() ); if ( prs ) { - ((SALOME_View*)vf)->Erase( prs, forced ); + vf->Erase( prs, forced ); if ( updateViewer ) vf->Repaint(); delete prs; // delete presentation because displayer is its owner @@ -351,8 +348,8 @@ void GEOM_Displayer::Erase( GEOM::GEOM_Object_ptr theObj, string entry = getEntry( theObj ); if ( entry != "" ) { - Erase( new SALOME_InteractiveObject( - entry.c_str(), "GEOM", strdup( getName( theObj ) ) ), forced, updateViewer ); + Erase(new SALOME_InteractiveObject(entry.c_str(), "GEOM", getName(theObj).c_str()), + forced, updateViewer); } } @@ -367,28 +364,34 @@ void GEOM_Displayer::Redisplay( const Handle(SALOME_InteractiveObject)& theIO, const bool updateViewer ) { // Remove the object permanently ( == true) - - QAD_Study* activeStudy = getActiveStudy(); - if ( !activeStudy ) - return; - - int aNbFrames = activeStudy->getStudyFramesCount(); - for (int i = 0; i < aNbFrames; i++) + SUIT_Session* ses = SUIT_Session::session(); + SUIT_Application* app = ses->activeApplication(); + if ( app ) + { + SUIT_Desktop* desk = app->desktop(); + QPtrList wnds = desk->windows(); + SUIT_ViewWindow* wnd; + for ( wnd = wnds.first(); wnd; wnd = wnds.next() ) { - QAD_StudyFrame* sf = activeStudy->getStudyFrame(i); - if ( !sf ) - continue; - - QAD_ViewFrame* vf = sf->getRightFrame()->getViewFrame(); - if ( !vf ) - continue; - - if ( vf->isVisible(theIO) || vf == GetActiveView() ) + SUIT_ViewManager* vman = wnd->getViewManager(); + if ( vman ) + { + SUIT_ViewModel* vmodel = vman->getViewModel(); + if ( vmodel ) { - Erase( theIO, true, false, vf ); - Display( theIO, updateViewer, vf ); + SALOME_View* view = dynamic_cast(vmodel); + if ( view ) + { + if ( view->isVisible( theIO ) || view == GetActiveView() ) + { + Erase( theIO, true, false, view ); + Display( theIO, updateViewer, view ); + } + } } + } } + } } //================================================================= @@ -434,26 +437,13 @@ void GEOM_Displayer::Erase( const SALOME_ListIO& theIOList, void GEOM_Displayer::Redisplay( const SALOME_ListIO& theIOList, const bool updateViewer ) { SALOME_ListIteratorOfListIO Iter( theIOList ); - for ( ; Iter.More(); Iter.Next() ) { + for ( ; Iter.More(); Iter.Next() ) Redisplay( Iter.Value(), false ); - } + if ( updateViewer ) UpdateViewer(); } -//================================================================= -/*! - * GEOM_Displayer::UpdateViewer - * Update current viewer - */ -//================================================================= -void GEOM_Displayer::UpdateViewer() -{ - QAD_ViewFrame* vf = GetActiveView(); - if ( vf ) - vf->Repaint(); -} - //================================================================= /*! * GEOM_Displayer::Update @@ -463,14 +453,10 @@ void GEOM_Displayer::UpdateViewer() //================================================================= void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) { - OCCViewer_Prs* occPrs = dynamic_cast( prs ); + SOCC_Prs* occPrs = dynamic_cast( prs ); if ( !occPrs ) return; - OCCViewer_ViewFrame* vf = dynamic_cast( myViewFrame ); - if ( !vf ) - return; - if ( myType == GEOM_MARKER && !myShape.IsNull() && myShape.ShapeType() == TopAbs_FACE ) { TopoDS_Face aFace = TopoDS::Face( myShape ); @@ -486,7 +472,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) { aTrh = new GEOM_AISTrihedron( aPlc ); - if ( HasColor() ) + if ( HasColor() ) aTrh->SetColor( (Quantity_NameOfColor)GetColor() ); if ( HasWidth() ) @@ -511,7 +497,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) if ( !aTrh.IsNull() ) { aTrh->SetComponent( aPlc ); - aTrh->SetToUpdate(); + aTrh->SetToUpdate(); } } } @@ -531,18 +517,18 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) AISShape->SetInfiniteState( myShape.Infinite() || myShape.ShapeType() == TopAbs_VERTEX ); // Setup shape properties here ..., e.g. display mode, color, transparency, etc + AISShape->SetDisplayMode( myDisplayMode ); AISShape->SetShadingColor( myShadingColor ); + if ( HasColor() ) { + AISShape->SetColor( (Quantity_NameOfColor)GetColor() ); if ( myShape.ShapeType() == TopAbs_VERTEX ) { - AISShape->SetColor( (Quantity_NameOfColor)GetColor() ); Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect(); anAspect->SetColor( (Quantity_NameOfColor)GetColor() ); AISShape->Attributes()->SetPointAspect( anAspect ); } - else - AISShape->SetColor( (Quantity_NameOfColor)GetColor() ); } if ( HasWidth() ) @@ -611,17 +597,17 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) //================================================================= void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) { - VTKViewer_Prs* vtkPrs = dynamic_cast( prs ); + SVTK_Prs* vtkPrs = dynamic_cast( prs ); if ( !vtkPrs || myShape.IsNull() ) return; vtkActorCollection* theActors = 0; - + if ( myType == GEOM_MARKER && !myShape.IsNull() && myShape.ShapeType() == TopAbs_FACE ) { myToActivate = false; GEOM_VTKTrihedron* aTrh = GEOM_VTKTrihedron::New(); - + if ( HasColor() ) { Quantity_Color aColor( (Quantity_NameOfColor)GetColor() ); @@ -636,19 +622,19 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) gp_Ax2 anAx2 = aPlane->Pln().Position().Ax2(); aTrh->SetPlacement( new Geom_Axis2Placement( anAx2 ) ); - if ( VTKViewer_ViewFrame* vf = dynamic_cast( GetActiveView() ) ) - aTrh->SetSize( 0.5 * vf->GetTrihedronSize() ); +// if ( SVTK_Viewer* vf = dynamic_cast( GetActiveView() ) ) +// aTrh->SetSize( 0.5 * vf->GetTrihedronSize() ); vtkPrs->AddObject( aTrh ); - + theActors = vtkActorCollection::New(); theActors->AddItem( aTrh ); } else theActors = GEOM_AssemblyBuilder::BuildActors( myShape, 0, 0, Standard_True ); - + theActors->InitTraversal(); - + vtkActor* anActor = (vtkActor*)theActors->GetNextActor(); vtkProperty* aProp = 0; @@ -658,7 +644,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) aProp = vtkProperty::New(); aProp->SetRepresentationToWireframe(); } - + if ( HasColor() ) { Quantity_Color aColor( (Quantity_NameOfColor)GetColor() ); @@ -673,7 +659,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) while ( anActor != NULL ) { SALOME_Actor* GActor = SALOME_Actor::SafeDownCast( anActor ); - + GActor->setIO( myIO ); if ( aProp ) @@ -693,9 +679,9 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) GActor->PickableOn(); else GActor->PickableOff(); - + vtkPrs->AddObject( GActor ); - + anActor = (vtkActor*)theActors->GetNextActor(); } @@ -716,22 +702,20 @@ SALOME_Prs* GEOM_Displayer::BuildPrs( GEOM::GEOM_Object_ptr theObj ) if ( theObj->_is_nil() ) return 0; - GeometryGUI* geomGUI = GeometryGUI::GetGeomGUI(); - myViewFrame = GetActiveView(); if ( myViewFrame == 0 ) return 0; - + SALOME_Prs* aPrs = myViewFrame->CreatePrs(); if ( aPrs == 0 ) return 0; - internalReset(); - setShape( geomGUI->GetShapeReader().GetShape( geomGUI->GetGeomGen(), theObj ) ); + internalReset(); + setShape( GEOM_Client().GetShape( GeometryGUI::GetGeomGen(), theObj ) ); myType = theObj->GetType(); // Update presentation - UpdatePrs( aPrs ); + UpdatePrs( aPrs ); return aPrs; } @@ -766,39 +750,52 @@ SALOME_Prs* GEOM_Displayer::BuildPrs( const TopoDS_Shape& theShape ) * GEOM_Displayer::buildPresentation * Builds/finds object's presentation for the current viewer * Calls corresponding Update() method by means of double dispatch - * [ internal ] + * [ internal ] */ //================================================================= -SALOME_Prs* GEOM_Displayer::buildPresentation( const Handle(SALOME_InteractiveObject)& theIO, - QAD_ViewFrame* theViewFrame ) +SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry, + SALOME_View* theViewFrame ) { SALOME_Prs* prs = 0; internalReset(); - GeometryGUI* geomGUI = GeometryGUI::GetGeomGUI(); + myViewFrame = theViewFrame ? theViewFrame : GetActiveView(); - myViewFrame = theViewFrame; // no dynamic_cast here to use double dispatch - if ( !myViewFrame ) - myViewFrame = GetActiveView(); - - if ( myViewFrame ) { - prs = myViewFrame->CreatePrs( !theIO.IsNull() ? theIO->getEntry() : 0 ); - if ( prs ) { - if ( !theIO.IsNull() ) { + if ( myViewFrame ) + { + prs = LightApp_Displayer::buildPresentation( entry, theViewFrame ); + if ( prs ) + { + Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject(); + theIO->setEntry( entry.latin1() ); + if ( !theIO.IsNull() ) + { // set interactive object setIO( theIO ); // Find SOBject (because shape should be published previously) - SALOMEDS::SObject_var SO = getActiveStudy()->getStudyDocument()->FindObjectID( theIO->getEntry() ); - if ( !SO->_is_nil() ) { - // get CORBA reference to data object - CORBA::Object_var object = SO->GetObject(); - if ( !CORBA::is_nil( object ) ) { - // downcast to GEOM object - GEOM::GEOM_Object_var GeomObject = GEOM::GEOM_Object::_narrow( object ); - if ( !GeomObject->_is_nil() ) { - // finally set shape - setShape( geomGUI->GetShapeReader().GetShape( geomGUI->GetGeomGen(), GeomObject ) ); - myType = GeomObject->GetType(); + SUIT_Session* session = SUIT_Session::session(); + SUIT_Application* app = session->activeApplication(); + if ( app ) + { + SalomeApp_Study* study = dynamic_cast( app->activeStudy() ); + if ( study ) + { + _PTR(SObject) SO ( study->studyDS()->FindObjectID( theIO->getEntry() ) ); + if ( SO ) + { + // get CORBA reference to data object + CORBA::Object_var object = GeometryGUI::ClientSObjectToObject(SO); + if ( !CORBA::is_nil( object ) ) + { + // downcast to GEOM object + GEOM::GEOM_Object_var GeomObject = GEOM::GEOM_Object::_narrow( object ); + if ( !GeomObject->_is_nil() ) + { + // finally set shape + setShape( GEOM_Client().GetShape( GeometryGUI::GetGeomGen(), GeomObject ) ); + myType = GeomObject->GetType(); + } + } } } } @@ -831,19 +828,24 @@ void GEOM_Displayer::internalReset() //================================================================= void GEOM_Displayer::LocalSelection( const Handle(SALOME_InteractiveObject)& theIO, const int theMode ) { - // remove all filters from selection - SALOME_Selection* aSel = SALOME_Selection::Selection( - QAD_Application::getDesktop()->getActiveStudy()->getSelection() ); + SUIT_Session* session = SUIT_Session::session(); + SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); + if ( !app ) + return; - aSel->ClearFilters(); + LightApp_SelectionMgr* sm = app->selectionMgr(); - QAD_ViewFrame* vf = GetActiveView(); - if ( vf ) - { + // remove all filters from selection + sm->clearFilters(); + + SALOME_View* vf = GetActiveView(); + if ( vf ) { + if (!theIO.IsNull() && !vf->isVisible(theIO)) + Display(theIO); SALOME_Prs* prs = vf->CreatePrs( theIO.IsNull() ? 0 : theIO->getEntry() ); - ((SALOME_View*)vf)->LocalSelection( prs, theMode ); + vf->LocalSelection( prs, theMode ); delete prs; // delete presentation because displayer is its owner - } + } } //================================================================= @@ -870,7 +872,12 @@ void GEOM_Displayer::GlobalSelection( const int theMode, const bool update ) void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, const bool update ) { - QAD_ViewFrame* vf = GetActiveView(); + SUIT_Session* session = SUIT_Session::session(); + SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); + if ( !app ) + return; + + SALOME_View* vf = GetActiveView(); if ( vf == 0 ) return; @@ -878,45 +885,63 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, vf->GlobalSelection( update ); // Set selection filters in accordance with current mode - SALOME_Selection* aSel = SALOME_Selection::Selection( - QAD_Application::getDesktop()->getActiveStudy()->getSelection() ); + LightApp_SelectionMgr* sm = app->selectionMgr(); + if ( !sm ) + return; // Remove from selection temporary objects if necessary if ( !theModes.Contains( GEOM_PREVIEW ) ) - clearTemporary( aSel ); + clearTemporary( sm ); + + //@ aSel->ClearIndex(); - aSel->ClearIndex(); - - aSel->ClearFilters(); + sm->clearFilters(); + + // Remove filters from AIS_InteractiveContext + Handle(AIS_InteractiveContext) ic; + SOCC_Viewer* viewer = dynamic_cast( vf ); + if ( viewer ) + { + ic = viewer->getAISContext(); + if ( !ic.IsNull() ) + ic->RemoveFilters(); + } if ( theModes.Contains( GEOM_ALLOBJECTS ) ) return; - Handle(SALOME_Filter) aFilter; + SUIT_SelectionFilter* aFilter; if ( theModes.Extent() == 1 ) - { - int aMode = TColStd_MapIteratorOfMapOfInteger( theModes ).Key(); - aFilter = getFilter( aMode ); - } - else if ( theModes.Extent() > 1 ) - { - TColStd_MapOfInteger aTopAbsModes; - TColStd_MapIteratorOfMapOfInteger anIter( theModes ); - GEOM_ListOfFilter aListOfFilters; - for ( ; anIter.More(); anIter.Next() ) { - Handle(SALOME_Filter) aFilter = getFilter( anIter.Key() ); - if ( !aFilter.IsNull() ) - aListOfFilters.Append( aFilter ); + int aMode = TColStd_MapIteratorOfMapOfInteger( theModes ).Key(); + aFilter = getFilter( aMode ); } + else if ( theModes.Extent() > 1 ) + { + TColStd_MapOfInteger aTopAbsModes; + TColStd_MapIteratorOfMapOfInteger anIter( theModes ); + QPtrList aListOfFilters; + for ( ; anIter.More(); anIter.Next() ) + { + SUIT_SelectionFilter* aFilter = getFilter( anIter.Key() ); + if ( aFilter ) + aListOfFilters.append( aFilter ); + } - aFilter = new GEOM_LogicalFilter( aListOfFilters, GEOM_LogicalFilter::LO_OR ); - } + aFilter = new GEOM_LogicalFilter( aListOfFilters, GEOM_LogicalFilter::LO_OR ); + } else return; - if ( !aFilter.IsNull() ) - aSel->AddFilter( aFilter ); + if ( aFilter ) + { + sm->installFilter( aFilter ); + if ( !ic.IsNull() ) + { + Handle(GEOM_OCCFilter) anOCCFilter = new GEOM_OCCFilter( sm ); + ic->AddFilter( anOCCFilter ); + } + } } //================================================================= @@ -929,7 +954,7 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, void GEOM_Displayer::LocalSelection( const SALOME_ListIO& theIOList, const int theMode ) { SALOME_ListIteratorOfListIO Iter( theIOList ); - for ( ; Iter.More(); Iter.Next() ) + for ( ; Iter.More(); Iter.Next() ) LocalSelection( Iter.Value(), theMode ); } @@ -942,10 +967,10 @@ void GEOM_Displayer::LocalSelection( const SALOME_ListIO& theIOList, const int t //================================================================= void GEOM_Displayer::BeforeDisplay( SALOME_View* v, const SALOME_OCCViewType& ) { - OCCViewer_ViewFrame* vf = dynamic_cast( v ); + SOCC_Viewer* vf = dynamic_cast( v ); if ( vf ) { - Handle(AIS_InteractiveContext) ic = vf->getViewer()->getAISContext(); + Handle(AIS_InteractiveContext) ic = vf->getAISContext(); if ( !ic.IsNull() ) { if ( ic->HasOpenedContext() ) @@ -1030,45 +1055,49 @@ bool GEOM_Displayer::ToActivate() const //================================================================= /*! * GEOM_Displayer::clearTemporary - * Removes from selection temporary objects + * Removes from selection temporary objects */ //================================================================= -void GEOM_Displayer::clearTemporary( SALOME_Selection* theSel ) +void GEOM_Displayer::clearTemporary( LightApp_SelectionMgr* theSelMgr ) { - SALOME_ListIO toBeRemoved; - SALOME_ListIteratorOfListIO anIter( theSel->StoredIObjects() ); - for ( ; anIter.More(); anIter.Next() ) - { - Handle(SALOME_InteractiveObject) anIO = anIter.Value(); - if ( anIO->hasEntry() && ( strncmp( anIO->getEntry(), "TEMP_", 5 ) == 0 ) ) - toBeRemoved.Append( anIO ); + SALOME_ListIO selected, toSelect; + theSelMgr->selectedObjects( selected ); + + for ( SALOME_ListIteratorOfListIO it( selected ) ; it.More(); it.Next() ) { + Handle(SALOME_InteractiveObject) io = it.Value(); + if ( !io.IsNull() && io->hasEntry() && strncmp( io->getEntry(), "TEMP_", 5 ) != 0 ) + toSelect.Append( it.Value() ); } - SALOME_ListIteratorOfListIO anIter2( toBeRemoved ); - for ( ; anIter2.More(); anIter2.Next() ) - theSel->RemoveIObject( anIter2.Value(), false ); + theSelMgr->setSelectedObjects( toSelect, true ); } +void GEOM_Displayer::SetName( const char* theName ) +{ + myName = theName; +} +void GEOM_Displayer::UnsetName() +{ + myName = ""; +} +SalomeApp_Study* GEOM_Displayer::getStudy() const +{ + return dynamic_cast( myApp->activeStudy() ); +} +void GEOM_Displayer::setIO( const Handle(SALOME_InteractiveObject)& theIO ) +{ + myIO = theIO; +} +void GEOM_Displayer::setShape( const TopoDS_Shape& theShape ) +{ + myShape = theShape; +} - - - - - - - - - - - - - - - - - - +bool GEOM_Displayer::canBeDisplayed( const QString& /*entry*/, const QString& viewer_type ) const +{ + return viewer_type==SOCC_Viewer::Type() || viewer_type==SVTK_Viewer::Type(); +}