X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGEOM_Displayer.cxx;h=82853c712ff04441591de18bf7fd9352b4790a13;hb=22b9c99081495ff0b7c053b9b7e779b105a73044;hp=f518e4ecb50120261adb7e2eba088b53c850aed3;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index f518e4ecb..82853c712 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -1,91 +1,108 @@ -// GEOM GEOMGUI : GUI for Geometry component +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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. +// Copyright (C) 2003-2007 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. // -// 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 +// 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 // -// File : GEOM_Displayer.cxx -// Author : Vadim SANDLER -// Module : GEOM -// $Header$ +// GEOM GEOMGUI : GUI for Geometry component +// File : GEOM_Displayer.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #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 "GEOM_Actor.h" -#include "GEOM_AISTrihedron.hxx" -#include "GEOM_VTKTrihedron.hxx" - -#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) #include "GeometryGUI.h" -#include "GEOM_AISShape.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 +#include +#include + +#include +#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 +#include -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,38 +127,62 @@ 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; + { + case GEOM_LINE : aFilter = new GEOM_EdgeFilter( getStudy(), StdSelect_Line ); break; + case GEOM_CIRCLE : aFilter = new GEOM_EdgeFilter( getStudy(), StdSelect_Circle ); break; - default : aFilter = new GEOM_TypeFilter( theMode ); 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; +} +//================================================================ +// Function : getComplexFilter +// Purpose : Get compound filter corresponding to the type of +// object from GEOMImpl_Types.h +//================================================================ +SUIT_SelectionFilter* GEOM_Displayer::getComplexFilter( const QList* aSubShapes) +{ + GEOM_CompoundFilter* aFilter; + + if(aSubShapes != NULL ) { + aFilter = new GEOM_CompoundFilter(getStudy()); + QList aTopAbsTypes; + QList::const_iterator it; + for(it = aSubShapes->constBegin(); it != aSubShapes->constEnd(); ++it ) { + int topAbsMode = getTopAbsMode(*it); + if(topAbsMode != -1 ) + aTopAbsTypes.append(topAbsMode); + } + aFilter->addSubTypes(aTopAbsTypes); + } + return aFilter; } @@ -149,16 +190,19 @@ static inline Handle(SALOME_Filter) getFilter( const int theMode ) // Function : getEntry // Purpose : //================================================================ -static char* getEntry( GEOM::GEOM_Object_ptr object ) +static std::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() ) { - return SO->GetID(); - } + SUIT_Session* session = SUIT_Session::session(); + SalomeApp_Application* app = dynamic_cast( session->activeApplication() ); + if ( app ) + { + 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( std::string(IOR) ) ); + if ( SO ) + return SO->GetID(); } } return ""; @@ -168,21 +212,23 @@ static char* getEntry( GEOM::GEOM_Object_ptr object ) // Function : getName // Purpose : //================================================================ -static const char* getName( GEOM::GEOM_Object_ptr theObj ) +static std::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 != "" ) + CORBA::String_var IOR = app->orb()->object_to_string( object ); + if ( strcmp(IOR.in(), "") != 0 ) { - 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( std::string(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 +243,25 @@ 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); + int aType = resMgr->integerValue("Geometry", "type_of_marker", (int)Aspect_TOM_PLUS); + myTypeOfMarker = (Aspect_TypeOfMarker)(std::min((int)Aspect_TOM_RING3, std::max((int)Aspect_TOM_POINT, aType))); + myScaleOfMarker = (resMgr->integerValue("Geometry", "marker_scale", 1)-(int)GEOM::MS_10)*0.5 + 1.0; + myScaleOfMarker = std::min(7.0, std::max(1., myScaleOfMarker)); myColor = -1; // This color is used for shape displaying. If it is equal -1 then @@ -232,59 +286,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 } } @@ -302,10 +327,10 @@ void GEOM_Displayer::Display( GEOM::GEOM_Object_ptr theObj, const bool updateVie if ( theObj->_is_nil() ) return; - string entry = getEntry( theObj ); + std::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,21 +343,19 @@ 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(); + vf->Repaint(); delete prs; // delete presentation because displayer is its owner } } @@ -348,11 +371,11 @@ void GEOM_Displayer::Erase( GEOM::GEOM_Object_ptr theObj, const bool forced, const bool updateViewer ) { - string entry = getEntry( theObj ); + std::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 +390,35 @@ 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(); + QList wnds = desk->windows(); + SUIT_ViewWindow* wnd; + QListIterator it( wnds ); + while ( it.hasNext() && (wnd = it.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() ) - { - Erase( theIO, true, false, vf ); - Display( theIO, updateViewer, vf ); - } + SUIT_ViewManager* vman = wnd->getViewManager(); + if ( vman ) + { + SUIT_ViewModel* vmodel = vman->getViewModel(); + if ( vmodel ) + { + 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 +464,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 +480,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 +499,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 +524,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) if ( !aTrh.IsNull() ) { aTrh->SetComponent( aPlc ); - aTrh->SetToUpdate(); + aTrh->SetToUpdate(); } } } @@ -526,23 +539,106 @@ 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 { + if (myShape.ShapeType() != TopAbs_VERTEX && // fix pb with not displayed points + !TopoDS_Iterator(myShape).More()) + return;// NPAL15983 (Bug when displaying empty groups) + AISShape = new GEOM_AISShape (myShape, ""); + } // Temporary staff: vertex must be infinite for correct visualization - AISShape->SetInfiniteState( myShape.Infinite() || myShape.ShapeType() == TopAbs_VERTEX ); + AISShape->SetInfiniteState( myShape.Infinite() ); // || myShape.ShapeType() == TopAbs_VERTEX // VSR: 05/04/2010: Fix 20668 (Fit All for points & lines) // 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() ); + Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect(); + anAspect->SetColor( (Quantity_NameOfColor)GetColor() ); + if ( myShape.ShapeType() == TopAbs_VERTEX ) + { + anAspect->SetScale( myScaleOfMarker ); + anAspect->SetTypeOfMarker( myTypeOfMarker ); + } + AISShape->Attributes()->SetPointAspect( anAspect ); + } + else { if ( myShape.ShapeType() == TopAbs_VERTEX ) { - AISShape->SetColor( (Quantity_NameOfColor)GetColor() ); + col = aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ); + aColor = SalomeApp_Tools::color( col ); + Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect(); - anAspect->SetColor( (Quantity_NameOfColor)GetColor() ); + anAspect->SetColor( aColor ); + anAspect->SetScale( myScaleOfMarker ); + anAspect->SetTypeOfMarker( myTypeOfMarker ); AISShape->Attributes()->SetPointAspect( anAspect ); } else - AISShape->SetColor( (Quantity_NameOfColor)GetColor() ); + { + // 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 ); + + // bug [SALOME platform 0019868] + // Set deviation angle. Default one is 12 degrees (Prs3d_Drawer.cxx:18) + //AISShape->SetOwnDeviationAngle( 10*PI/180 ); + + // IMP 0020626 + double aDC = aResMgr->doubleValue("Geometry", "deflection_coeff", 0.001); + aDC = std::max( aDC, DEFLECTION_MIN ); // to avoid to small values of the coefficient + AISShape->SetOwnDeviationCoefficient(aDC); + } } if ( HasWidth() ) @@ -564,6 +660,118 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) AISShape->setIO( anObj ); AISShape->SetOwner( anObj ); } + + // Get color and other properties from GEOM_Object + SUIT_Session* session = SUIT_Session::session(); + SUIT_Application* app = session->activeApplication(); + if ( app ) + { + SalomeApp_Study* study = dynamic_cast( app->activeStudy() ); + if ( study ) + { + Handle( SALOME_InteractiveObject ) anIO = AISShape->getIO(); + if ( !anIO.IsNull() ) + { + _PTR(SObject) SO ( study->studyDS()->FindObjectID( anIO->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 aGeomObject = GEOM::GEOM_Object::_narrow( object ); + if ( !aGeomObject->_is_nil() ) + { + SALOMEDS::Color aSColor = aGeomObject->GetColor(); + bool hasColor = aSColor.R >= 0 && aSColor.G >= 0 && aSColor.B >= 0; + if( !hasColor && aGeomObject->GetType() == GEOM_GROUP ) // auto color for group + { + GEOM::GEOM_Gen_var aGeomGen = GeometryGUI::GetGeomGen(); + GEOM::GEOM_IGroupOperations_var anOperations = aGeomGen->GetIGroupOperations( study->id() ); + GEOM::GEOM_Object_var aMainObject = anOperations->GetMainShape( aGeomObject ); + if ( !aMainObject->_is_nil() && aMainObject->GetAutoColor() ) + { + QList aReservedColors; + + SalomeApp_Application* app = dynamic_cast( app ); + CORBA::String_var IOR = app->orb()->object_to_string( aMainObject ); + if ( strcmp(IOR.in(), "") != 0 ) + { + _PTR(Study) aStudy = study->studyDS(); + _PTR(SObject) aMainSObject( aStudy->FindObjectIOR( std::string(IOR) ) ); + _PTR(ChildIterator) it( aStudy->NewChildIterator( aMainSObject ) ); + for( ; it->More(); it->Next() ) + { + _PTR(SObject) aChildSObject( it->Value() ); + GEOM::GEOM_Object_var aChildObject = + GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(aChildSObject)); + if( CORBA::is_nil( aChildObject ) ) + continue; + + if( aChildObject->GetType() != GEOM_GROUP ) + continue; + + SALOMEDS::Color aReservedColor = aChildObject->GetColor(); + aReservedColors.append( aReservedColor ); + } + } + + aSColor = getUniqueColor( aReservedColors ); + hasColor = true; + } + } + + if( hasColor ) + { + Quantity_Color aQuanColor( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB ); + AISShape->SetColor( aQuanColor ); + AISShape->SetShadingColor( aQuanColor ); + if ( myShape.ShapeType() == TopAbs_VERTEX ) { + Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect(); + anAspect->SetColor( aQuanColor ); + anAspect->SetScale( myScaleOfMarker ); + anAspect->SetTypeOfMarker( myTypeOfMarker ); + AISShape->Attributes()->SetPointAspect( anAspect ); + } + } + // ... marker type + GEOM::marker_type aType = aGeomObject->GetMarkerType(); + GEOM::marker_size aSize = aGeomObject->GetMarkerSize(); + if ( aType > GEOM::MT_NONE && aType < GEOM::MT_USER && aSize > GEOM::MS_NONE && aSize <= GEOM::MS_70 ) { + Aspect_TypeOfMarker aMType = (Aspect_TypeOfMarker)( (int)aType-1 ); + double aMSize = ((int)aSize+1)*0.5; + Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect(); + anAspect->SetScale( aMSize ); + anAspect->SetTypeOfMarker( aMType ); + Quantity_Color aQuanColor = SalomeApp_Tools::color( aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ) ); + if ( hasColor ) + aQuanColor = Quantity_Color( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB ); + anAspect->SetColor( aQuanColor ); + AISShape->Attributes()->SetPointAspect( anAspect ); + } + else if ( aType == GEOM::MT_USER ) { + int aTextureId = aGeomObject->GetMarkerTexture(); + Quantity_Color aQuanColor = SalomeApp_Tools::color( aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ) ); + if ( hasColor ) aQuanColor = Quantity_Color( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB ); + Standard_Integer aWidth, aHeight; + Handle(Graphic3d_HArray1OfBytes) aTexture = GeometryGUI::getTexture( getStudy(), aTextureId, aWidth, aHeight ); + if ( !aTexture.IsNull() ) { + static int TextureId = 0; + Handle(Prs3d_PointAspect) aTextureAspect = new Prs3d_PointAspect(aQuanColor, + ++TextureId, + aWidth, aHeight, + aTexture ); + AISShape->Attributes()->SetPointAspect( aTextureAspect ); + } + } + } + } + } + } + } + } + // AISShape->SetName(???); ??? necessary to set name ??? occPrs->AddObject( AISShape ); @@ -611,17 +819,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 ) + + if ( myType == GEOM_MARKER && myShape.ShapeType() == TopAbs_FACE ) { - myToActivate = false; + //myToActivate = false; // ouv: commented to make the trihedron pickable (see IPAL18657) GEOM_VTKTrihedron* aTrh = GEOM_VTKTrihedron::New(); - + if ( HasColor() ) { Quantity_Color aColor( (Quantity_NameOfColor)GetColor() ); @@ -636,19 +844,21 @@ 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 = GEOM_AssemblyBuilder::BuildActors( myShape, 0, 0, Standard_True, myType == GEOM_VECTOR ); + } + theActors->InitTraversal(); - + vtkActor* anActor = (vtkActor*)theActors->GetNextActor(); vtkProperty* aProp = 0; @@ -658,7 +868,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) aProp = vtkProperty::New(); aProp->SetRepresentationToWireframe(); } - + if ( HasColor() ) { Quantity_Color aColor( (Quantity_NameOfColor)GetColor() ); @@ -673,7 +883,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 +903,9 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) GActor->PickableOn(); else GActor->PickableOff(); - + vtkPrs->AddObject( GActor ); - + anActor = (vtkActor*)theActors->GetNextActor(); } @@ -716,22 +926,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,42 +974,55 @@ 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() ) { - // 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(); - } - } - } + if ( myViewFrame ) + { + prs = LightApp_Displayer::buildPresentation( entry, theViewFrame ); + if ( prs ) + { + Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject(); + theIO->setEntry( entry.toLatin1().constData() ); + 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 ) + { + 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(); + } + } + } + } + } } UpdatePrs( prs ); // Update presentation by using of the double dispatch } @@ -809,6 +1030,44 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const Handle(SALOME_InteractiveOb return prs; } +//================================================================= +/*! + * GEOM_Displayer::buildSubshapePresentation + * Builds/finds object's presentation for the current viewer + * Calls corresponding Update() method by means of double dispatch + * For not published objects (for Mantis issue 0020435) + */ +//================================================================= +SALOME_Prs* GEOM_Displayer::buildSubshapePresentation(const TopoDS_Shape& aShape, + const QString& entry, + SALOME_View* theViewFrame) +{ + SALOME_Prs* prs = 0; + internalReset(); + + myViewFrame = theViewFrame ? theViewFrame : GetActiveView(); + + if (myViewFrame) + { + prs = LightApp_Displayer::buildPresentation(entry, theViewFrame); + if (prs) + { + Handle(SALOME_InteractiveObject) theIO = new SALOME_InteractiveObject(); + theIO->setEntry(entry.toLatin1().constData()); + if (!theIO.IsNull()) + { + // set interactive object + setIO(theIO); + // finally set shape + setShape(aShape); + myType = GEOM_SUBSHAPE; + } + UpdatePrs(prs); // Update presentation by using of the double dispatch + } + } + return prs; +} + //================================================================= /*! * GEOM_Displayer::internalReset @@ -831,19 +1090,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 - } + } } //================================================================= @@ -868,9 +1132,14 @@ void GEOM_Displayer::GlobalSelection( const int theMode, const bool update ) */ //================================================================= void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, - const bool update ) + const bool update, const QList* theSubShapes ) { - 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 +1147,73 @@ 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(); + + sm->clearFilters(); - aSel->ClearIndex(); - - aSel->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(); + + if ( aMode == GEOM_COMPOUNDFILTER ) + aFilter = getComplexFilter( theSubShapes ); + else + aFilter = getFilter( aMode ); } + else if ( theModes.Extent() > 1 ) + { + TColStd_MapOfInteger aTopAbsModes; + TColStd_MapIteratorOfMapOfInteger anIter( theModes ); + QList aListOfFilters; + for ( ; anIter.More(); anIter.Next() ) + { + SUIT_SelectionFilter* aFilter; + int aMode = anIter.Key(); + if ( aMode == GEOM_COMPOUNDFILTER ) + aFilter = getComplexFilter( theSubShapes ); + else + aFilter = getFilter( aMode ); + + 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 +1226,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 +1239,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() ) @@ -968,7 +1265,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 @@ -984,6 +1287,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 ); } //================================================================= @@ -1030,45 +1337,133 @@ 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(); +} +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; +} +SALOMEDS::Color GEOM_Displayer::getUniqueColor( const QList& theReservedColors ) +{ + int aHue = -1; + int aTolerance = 64; + int anIterations = 0; + int aPeriod = 5; + while( 1 ) + { + anIterations++; + if( anIterations % aPeriod == 0 ) + { + aTolerance /= 2; + if( aTolerance < 1 ) + break; + } + //std::cout << "Iteration N" << anIterations << " (tolerance=" << aTolerance << ")"<< std::endl; + aHue = (int)( 360.0 * rand() / RAND_MAX ); + //std::cout << "Hue = " << aHue << std::endl; + //std::cout << "Auto colors : "; + bool ok = true; + QList::const_iterator it = theReservedColors.constBegin(); + QList::const_iterator itEnd = theReservedColors.constEnd(); + for( ; it != itEnd; ++it ) + { + SALOMEDS::Color anAutoColor = *it; + QColor aQColor( (int)( anAutoColor.R * 255.0 ), (int)( anAutoColor.G * 255.0 ), (int)( anAutoColor.B * 255.0 ) ); + int h, s, v; + aQColor.getHsv( &h, &s, &v ); + //std::cout << h << " "; + if( abs( h - aHue ) < aTolerance ) + { + ok = false; + //std::cout << "break (diff = " << abs( h - aHue ) << ")"; + break; + } + } + //std::cout << std::endl; + if( ok ) + break; + } + //std::cout << "Hue of the returned color = " << aHue << std::endl; + QColor aColor; + aColor.setHsv( aHue, 255, 255 ); + SALOMEDS::Color aSColor; + aSColor.R = (double)aColor.red() / 255.0; + aSColor.G = (double)aColor.green() / 255.0; + aSColor.B = (double)aColor.blue() / 255.0; - - - - - - + return aSColor; +}