X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGEOM_Displayer.cxx;h=4dce2b1ea4210fcf6b1bae43d5b429892b98a87b;hb=49047f7d298f22733ce9bb55676486c1e7115855;hp=06d24894c5dd6121e454f5e8498902c72225c8e4;hpb=732211808796539fcf1de34e06038e7fb015ece9;p=modules%2Fgeom.git diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 06d24894c..4dce2b1ea 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -26,10 +26,9 @@ // Module : GEOM // $Header$ -#include - #include "GEOM_Displayer.h" -#include "GEOMImpl_Types.hxx" + +#include "GeometryGUI.h" #include "GEOM_TypeFilter.h" #include "GEOM_EdgeFilter.h" @@ -38,53 +37,58 @@ #include "GEOM_LogicalFilter.h" #include "GEOM_OCCFilter.h" -#include "GEOM_AssemblyBuilder.h" #include "GEOM_Actor.h" +#include "GEOM_AssemblyBuilder.h" +#include "GEOM_AISShape.hxx" +#include "GEOM_AISVector.hxx" #include "GEOM_AISTrihedron.hxx" #include "GEOM_VTKTrihedron.hxx" #include #include #include -#include #include +#include #include #include -#include +#include #include +#include #include -#include -#include -#include +#include +#include #include +#include #include #include -#include -#include - -#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) - -#include -#include -#include +// OCCT Includes #include +#include +#include #include -#include -#include +#include +#include #include #include -#include +#include #include -#include -#include +#include +#include +#include + +// VTK Includes #include +#include -#include +// CORBA Headers +#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) + +#include "GEOMImpl_Types.hxx" using namespace std; @@ -129,31 +133,31 @@ static inline int getTopAbsMode( const int implType ) SUIT_SelectionFilter* GEOM_Displayer::getFilter( const int theMode ) { SUIT_SelectionFilter* aFilter; - + int aTopAbsMode = getTopAbsMode( theMode ); if ( aTopAbsMode != -1 ) - aFilter = new GEOM_TypeFilter( getStudy(), theMode ); //@ aFilter = new GEOM_TypeFilter( ( 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( 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; } @@ -161,19 +165,19 @@ SUIT_SelectionFilter* GEOM_Displayer::getFilter( const int theMode ) // Function : getEntry // Purpose : //================================================================ -static char* getEntry( GEOM::GEOM_Object_ptr object ) +static string getEntry( GEOM::GEOM_Object_ptr object ) { SUIT_Session* session = SUIT_Session::session(); SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); - if ( app ) + if ( app ) { - string IOR = app->orb()->object_to_string( object ); - if ( IOR != "" ) + CORBA::String_var IOR = app->orb()->object_to_string( object ); + if ( strcmp(IOR.in(), "") != 0 ) { SalomeApp_Study* study = ( SalomeApp_Study* )app->activeStudy(); - _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) ); + _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( string(IOR) ) ); if ( SO ) - return (char*)(SO->GetID().c_str()); + return SO->GetID(); } } return ""; @@ -183,24 +187,24 @@ static char* getEntry( GEOM::GEOM_Object_ptr object ) // Function : getName // Purpose : //================================================================ -static const char* getName( GEOM::GEOM_Object_ptr object ) +static string getName( GEOM::GEOM_Object_ptr object ) { SUIT_Session* session = SUIT_Session::session(); SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); - if ( app ) + if ( app ) { - string IOR = app->orb()->object_to_string( object ); - if ( IOR != "" ) + CORBA::String_var IOR = app->orb()->object_to_string( object ); + if ( strcmp(IOR.in(), "") != 0 ) { SalomeApp_Study* study = ( SalomeApp_Study* )app->activeStudy(); - _PTR(SObject) aSObj ( study->studyDS()->FindObjectIOR( IOR ) ); + _PTR(SObject) aSObj ( study->studyDS()->FindObjectIOR( string(IOR) ) ); _PTR(GenericAttribute) anAttr; if ( aSObj && aSObj->FindAttribute( anAttr, "AttributeName") ) { _PTR(AttributeName) aNameAttr( anAttr ); - return aNameAttr->Value().c_str(); + return aNameAttr->Value(); } } } @@ -214,18 +218,28 @@ static const char* getName( GEOM::GEOM_Object_ptr object ) * Constructor */ //================================================================= -GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* study ) +GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st ) { - myStudy = study; - + if( st ) + myApp = dynamic_cast( st->application() ); + else + myApp = 0; + /* Shading Color */ SUIT_Session* session = SUIT_Session::session(); SUIT_ResourceMgr* resMgr = session->resourceMgr(); - QColor col = resMgr->colorValue( "Geometry", "SettingsShadingColor", QColor( "goldenrod" ) ); -// TO DO: make some utility method to convert QColor into Quantity_Color -// myShadingColor = SUIT_Tools::color( col ); - myShadingColor = Quantity_NOC_RED; + QColor col = resMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) ); + myShadingColor = SalomeApp_Tools::color( col ); + + myDisplayMode = resMgr->integerValue("Geometry", "display_mode", 0); + myTypeOfMarker = (Aspect_TypeOfMarker)resMgr->integerValue("Geometry", "type_of_marker", Aspect_TOM_PLUS); + myScaleOfMarker = resMgr->doubleValue("Geometry", "marker_scale", 1.); + if(myScaleOfMarker < 1.0) + myScaleOfMarker = 1.0; + if(myScaleOfMarker > 7.) + myScaleOfMarker = 7.; + myColor = -1; // This color is used for shape displaying. If it is equal -1 then @@ -250,55 +264,21 @@ GEOM_Displayer::~GEOM_Displayer() { } -//================================================================= -/*! - * GetActiveView - * Get active study frame, returns 0 if no open study frame - */ -//================================================================= -SALOME_View* GEOM_Displayer::GetActiveView() -{ - SUIT_Session* session = SUIT_Session::session(); - SUIT_Application* app = session->activeApplication(); - if ( app ) - { - SUIT_Desktop* desk = app->desktop(); - if ( desk ) - { - SUIT_ViewWindow* win = desk->activeWindow(); - if ( win ) - { - SUIT_ViewManager* vman = win->getViewManager(); - if ( vman ) - { - SUIT_ViewModel* vmodel = vman->getViewModel(); - if ( vmodel ) - { - SALOME_View* view = dynamic_cast(vmodel); - return view; - } - } - } - } - } - return 0; -} - //================================================================= /*! * GEOM_Displayer::Display * Display interactive object in the current viewer */ //================================================================= -void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO, +void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO, const bool updateViewer, SALOME_View* theViewFrame ) { SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); if ( vf ) { - SALOME_Prs* prs = buildPresentation( theIO, vf ); - + SALOME_Prs* prs = buildPresentation( theIO->getEntry(), vf ); + if ( prs ) { vf->BeforeDisplay( this ); @@ -307,7 +287,7 @@ void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO, if ( updateViewer ) vf->Repaint(); - + delete prs; // delete presentation because displayer is its owner } } @@ -327,8 +307,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); } } @@ -347,7 +327,7 @@ void GEOM_Displayer::Erase( const Handle(SALOME_InteractiveObject)& theIO, return; SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); - + if ( vf ) { SALOME_Prs* prs = vf->CreatePrs( theIO->getEntry() ); if ( prs ) { @@ -372,27 +352,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 ); - } -} - -//================================================================= -/*! - * GEOM_Displayer::EraseAll - * Erase all objects in the current viewer - */ -//================================================================= -void GEOM_Displayer::EraseAll ( const bool forced, - const bool updateViewer, - SALOME_View* theViewFrame ) -{ - SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); - - if ( vf ) { - vf->EraseAll( forced ); - if ( updateViewer ) - vf->Repaint(); + Erase(new SALOME_InteractiveObject(entry.c_str(), "GEOM", getName(theObj).c_str()), + forced, updateViewer); } } @@ -412,9 +373,10 @@ void GEOM_Displayer::Redisplay( const Handle(SALOME_InteractiveObject)& theIO, if ( app ) { SUIT_Desktop* desk = app->desktop(); - QPtrList wnds = desk->windows(); + QList wnds = desk->windows(); SUIT_ViewWindow* wnd; - for ( wnd = wnds.first(); wnd; wnd = wnds.next() ) + QListIterator it( wnds ); + while ( it.hasNext() && (wnd = it.next()) ) { SUIT_ViewManager* vman = wnd->getViewManager(); if ( vman ) @@ -487,19 +449,6 @@ void GEOM_Displayer::Redisplay( const SALOME_ListIO& theIOList, const bool updat UpdateViewer(); } -//================================================================= -/*! - * GEOM_Displayer::UpdateViewer - * Update current viewer - */ -//================================================================= -void GEOM_Displayer::UpdateViewer() -{ - SALOME_View* vf = GetActiveView(); - if ( vf ) - vf->Repaint(); -} - //================================================================= /*! * GEOM_Displayer::Update @@ -528,7 +477,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) { aTrh = new GEOM_AISTrihedron( aPlc ); - if ( HasColor() ) + if ( HasColor() ) aTrh->SetColor( (Quantity_NameOfColor)GetColor() ); if ( HasWidth() ) @@ -553,7 +502,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) if ( !aTrh.IsNull() ) { aTrh->SetComponent( aPlc ); - aTrh->SetToUpdate(); + aTrh->SetToUpdate(); } } } @@ -568,24 +517,94 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) { if ( !myShape.IsNull() ) { - Handle(GEOM_AISShape) AISShape = new GEOM_AISShape( myShape, "" ); + //Handle(GEOM_AISShape) AISShape = new GEOM_AISShape( myShape, "" ); + Handle(GEOM_AISShape) AISShape; + if (myType == GEOM_VECTOR) + AISShape = new GEOM_AISVector (myShape, ""); + else + AISShape = new GEOM_AISShape (myShape, ""); // Temporary staff: vertex must be infinite for correct visualization 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 ); + + // Set color and number for iso lines + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + QColor col = aResMgr->colorValue( "Geometry", "isos_color", + QColor(int(0.5*255), int(0.5*255), int(0.5*255)) ); + Quantity_Color aColor = SalomeApp_Tools::color( col ); + int anUIsoNumber = aResMgr->integerValue("OCCViewer", "iso_number_u", 1); + int aVIsoNumber = aResMgr->integerValue("OCCViewer", "iso_number_v", 1); + + Handle(Prs3d_IsoAspect) anAspect = AISShape->Attributes()->UIsoAspect(); + anAspect->SetNumber( anUIsoNumber ); + anAspect->SetColor( aColor ); + AISShape->Attributes()->SetUIsoAspect( anAspect ); + + anAspect = AISShape->Attributes()->VIsoAspect(); + anAspect->SetNumber( aVIsoNumber ); + anAspect->SetColor( aColor ); + AISShape->Attributes()->SetVIsoAspect( anAspect ); + 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() ); + anAspect->SetScale( myScaleOfMarker ); + anAspect->SetTypeOfMarker( myTypeOfMarker ); AISShape->Attributes()->SetPointAspect( anAspect ); } - else - AISShape->SetColor( (Quantity_NameOfColor)GetColor() ); } + else + { + if ( myShape.ShapeType() == TopAbs_VERTEX ) + { + col = aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ); + aColor = SalomeApp_Tools::color( col ); + + Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect(); + anAspect->SetColor( aColor ); + anAspect->SetScale( myScaleOfMarker ); + anAspect->SetTypeOfMarker( myTypeOfMarker ); + AISShape->Attributes()->SetPointAspect( anAspect ); + } + else + { + // Set line aspect + col = aResMgr->colorValue( "Geometry", "wireframe_color", QColor( 255, 255, 0 ) ); + aColor = SalomeApp_Tools::color( col ); + + Handle(Prs3d_LineAspect) anAspect = AISShape->Attributes()->LineAspect(); + anAspect->SetColor( aColor ); + AISShape->Attributes()->SetLineAspect( anAspect ); + + // Set unfree boundaries aspect + anAspect = AISShape->Attributes()->UnFreeBoundaryAspect(); + anAspect->SetColor( aColor ); + AISShape->Attributes()->SetUnFreeBoundaryAspect( anAspect ); + + // Set free boundaries aspect + col = aResMgr->colorValue( "Geometry", "free_bound_color", QColor( 0, 255, 0 ) ); + aColor = SalomeApp_Tools::color( col ); + + anAspect = AISShape->Attributes()->FreeBoundaryAspect(); + anAspect->SetColor( aColor ); + AISShape->Attributes()->SetFreeBoundaryAspect( anAspect ); + + // Set wire aspect + col = aResMgr->colorValue( "Geometry", "line_color", QColor( 255, 0, 0 ) ); + aColor = SalomeApp_Tools::color( col ); + + anAspect = AISShape->Attributes()->WireAspect(); + anAspect->SetColor( aColor ); + AISShape->Attributes()->SetWireAspect( anAspect ); + } + } if ( HasWidth() ) AISShape->SetWidth( GetWidth() ); @@ -658,12 +677,12 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) return; vtkActorCollection* theActors = 0; - - if ( myType == GEOM_MARKER && !myShape.IsNull() && myShape.ShapeType() == TopAbs_FACE ) + + if ( myType == GEOM_MARKER && myShape.ShapeType() == TopAbs_FACE ) { myToActivate = false; GEOM_VTKTrihedron* aTrh = GEOM_VTKTrihedron::New(); - + if ( HasColor() ) { Quantity_Color aColor( (Quantity_NameOfColor)GetColor() ); @@ -682,15 +701,18 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) // 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 ); - + { + bool isVector = (myType == GEOM_VECTOR); + theActors = GEOM_AssemblyBuilder::BuildActors( myShape, 0, 0, Standard_True, isVector ); + } + theActors->InitTraversal(); - + vtkActor* anActor = (vtkActor*)theActors->GetNextActor(); vtkProperty* aProp = 0; @@ -700,7 +722,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) aProp = vtkProperty::New(); aProp->SetRepresentationToWireframe(); } - + if ( HasColor() ) { Quantity_Color aColor( (Quantity_NameOfColor)GetColor() ); @@ -715,7 +737,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) while ( anActor != NULL ) { SALOME_Actor* GActor = SALOME_Actor::SafeDownCast( anActor ); - + GActor->setIO( myIO ); if ( aProp ) @@ -735,9 +757,9 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) GActor->PickableOn(); else GActor->PickableOff(); - + vtkPrs->AddObject( GActor ); - + anActor = (vtkActor*)theActors->GetNextActor(); } @@ -761,17 +783,17 @@ SALOME_Prs* GEOM_Displayer::BuildPrs( GEOM::GEOM_Object_ptr theObj ) myViewFrame = GetActiveView(); if ( myViewFrame == 0 ) return 0; - + SALOME_Prs* aPrs = myViewFrame->CreatePrs(); if ( aPrs == 0 ) return 0; - internalReset(); + internalReset(); setShape( GEOM_Client().GetShape( GeometryGUI::GetGeomGen(), theObj ) ); myType = theObj->GetType(); // Update presentation - UpdatePrs( aPrs ); + UpdatePrs( aPrs ); return aPrs; } @@ -806,44 +828,46 @@ 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, +SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry, SALOME_View* theViewFrame ) { SALOME_Prs* prs = 0; internalReset(); myViewFrame = theViewFrame ? theViewFrame : GetActiveView(); - - if ( myViewFrame ) + + if ( myViewFrame ) { - prs = myViewFrame->CreatePrs( !theIO.IsNull() ? theIO->getEntry() : 0 ); - if ( prs ) + prs = LightApp_Displayer::buildPresentation( entry, theViewFrame ); + if ( prs ) { - if ( !theIO.IsNull() ) + Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject(); + theIO->setEntry( entry.toLatin1() ); + if ( !theIO.IsNull() ) { // set interactive object setIO( theIO ); // Find SOBject (because shape should be published previously) SUIT_Session* session = SUIT_Session::session(); SUIT_Application* app = session->activeApplication(); - if ( app ) + if ( app ) { SalomeApp_Study* study = dynamic_cast( app->activeStudy() ); if ( study ) { _PTR(SObject) SO ( study->studyDS()->FindObjectID( theIO->getEntry() ) ); - if ( SO ) + if ( SO ) { // get CORBA reference to data object - CORBA::Object_var object = dynamic_cast(SO.get())->GetObject(); - if ( !CORBA::is_nil( 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() ) + if ( !GeomObject->_is_nil() ) { // finally set shape setShape( GEOM_Client().GetShape( GeometryGUI::GetGeomGen(), GeomObject ) ); @@ -887,18 +911,19 @@ void GEOM_Displayer::LocalSelection( const Handle(SALOME_InteractiveObject)& the if ( !app ) return; - SalomeApp_SelectionMgr* sm = app->selectionMgr(); - + LightApp_SelectionMgr* sm = app->selectionMgr(); + // remove all filters from selection sm->clearFilters(); SALOME_View* vf = GetActiveView(); - if ( vf ) - { - SALOME_Prs* prs = vf->CreatePrs( theIO.IsNull() ? 0 : theIO->getEntry() ); - vf->LocalSelection( prs, theMode ); - delete prs; // delete presentation because displayer is its owner - } + if ( vf ) { + if (!theIO.IsNull() && !vf->isVisible(theIO)) + Display(theIO); + SALOME_Prs* prs = vf->CreatePrs( theIO.IsNull() ? 0 : theIO->getEntry() ); + vf->LocalSelection( prs, theMode ); + delete prs; // delete presentation because displayer is its owner + } } //================================================================= @@ -929,16 +954,16 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); if ( !app ) return; - + SALOME_View* vf = GetActiveView(); if ( vf == 0 ) return; - + // Close local context vf->GlobalSelection( update ); // Set selection filters in accordance with current mode - SalomeApp_SelectionMgr* sm = app->selectionMgr(); + LightApp_SelectionMgr* sm = app->selectionMgr(); if ( !sm ) return; @@ -947,9 +972,9 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, clearTemporary( sm ); //@ aSel->ClearIndex(); - + sm->clearFilters(); - + // Remove filters from AIS_InteractiveContext Handle(AIS_InteractiveContext) ic; SOCC_Viewer* viewer = dynamic_cast( vf ); @@ -959,7 +984,7 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, if ( !ic.IsNull() ) ic->RemoveFilters(); } - + if ( theModes.Contains( GEOM_ALLOBJECTS ) ) return; @@ -973,14 +998,14 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, { TColStd_MapOfInteger aTopAbsModes; TColStd_MapIteratorOfMapOfInteger anIter( theModes ); - QPtrList aListOfFilters; + QList 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 ); } else @@ -1007,7 +1032,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 ); } @@ -1046,7 +1071,13 @@ void GEOM_Displayer::AfterDisplay( SALOME_View*, const SALOME_OCCViewType& ) //================================================================= void GEOM_Displayer::SetColor( const int color ) { - myColor = color; + if ( color == -1 ) + UnsetColor(); + else + { + myColor = color; + myShadingColor = Quantity_Color( (Quantity_NameOfColor)color ); + } } int GEOM_Displayer::GetColor() const @@ -1062,6 +1093,10 @@ bool GEOM_Displayer::HasColor() const void GEOM_Displayer::UnsetColor() { myColor = -1; + + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + QColor col = resMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) ); + myShadingColor = SalomeApp_Tools::color( col ); } //================================================================= @@ -1108,22 +1143,75 @@ bool GEOM_Displayer::ToActivate() const //================================================================= /*! * GEOM_Displayer::clearTemporary - * Removes from selection temporary objects + * Removes from selection temporary objects */ //================================================================= -void GEOM_Displayer::clearTemporary( SalomeApp_SelectionMgr* theSelMgr ) +void GEOM_Displayer::clearTemporary( LightApp_SelectionMgr* theSelMgr ) { - SALOME_ListIO toBeSelected; - theSelMgr->selectedObjects(toBeSelected) -; - SALOME_ListIteratorOfListIO anIter( toBeSelected ); - for ( ; anIter.More(); anIter.Next() ) - { - Handle(SALOME_InteractiveObject) anIO = anIter.Value(); - if ( !(anIO->hasEntry()) || ( strncmp( anIO->getEntry(), "TEMP_", 5 ) != 0 ) ) - toBeSelected.Remove( anIter ); - } - - theSelMgr->setSelectedObjects( toBeSelected, true ); + 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() ); + } + + 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(); } +int GEOM_Displayer::SetDisplayMode( const int theMode ) +{ + int aPrevMode = myDisplayMode; + if ( theMode != -1 ) + myDisplayMode = theMode; + else + { + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + myDisplayMode = resMgr->integerValue( "Geometry", "display_mode", 0 ); + } + return aPrevMode; +} + +int GEOM_Displayer::GetDisplayMode() const +{ + return myDisplayMode; +} + +int GEOM_Displayer::UnsetDisplayMode() +{ + int aPrevMode = myDisplayMode; + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + myDisplayMode = resMgr->integerValue( "Geometry", "display_mode", 0 ); + return aPrevMode; +}