X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGEOM_Displayer.cxx;h=0896c4ea972cc942173001d6d65743ede8271fff;hb=09ece3edc1896e16a412b35810d76411f06d68ec;hp=5dfc36699c7f60931226ab96d3d4e8c40452961e;hpb=5e7cf6df5a668d1e1608ba946c59ba34234d8942;p=modules%2Fgeom.git diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx old mode 100755 new mode 100644 index 5dfc36699..0896c4ea9 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -59,8 +60,6 @@ #include #include -#include - #include #include #include @@ -79,10 +78,31 @@ #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 @@ -90,14 +110,11 @@ #include #include #include -#if OCC_VERSION_MAJOR < 7 - #include -#endif #include #include #include #include -#include +//#include #include #include #include @@ -113,6 +130,7 @@ #include #include #include +#include #include @@ -122,6 +140,7 @@ #include #include +#include // CORBA Headers #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) @@ -129,6 +148,15 @@ #include +#include "vtkSMSourceProxy.h" +#include "pqServerManagerModel.h" +#include "vtkPVTrivialProducer.h" +#include "vtkSMViewProxy.h" + +#if OCC_VERSION_LARGE >= 0x070400ff +#include +#endif + // If the next macro is defined, autocolor feature works for all sub-shapes; // if it is undefined, autocolor feature works for groups only #define GENERAL_AUTOCOLOR @@ -242,8 +270,15 @@ namespace if ( aAISShape.IsNull() ) continue; -#ifdef USE_TEXTURED_SHAPE - const Handle(Image_PixMap)& aPixmap = aAISShape->TexturePixMap(); + const Handle(Graphic3d_TextureMap)& aTexture = aAISShape->Attributes()->ShadingAspect()->Aspect()->TextureMap(); + if ( aTexture.IsNull() ) + continue; +#if OCC_VERSION_LARGE >= 0x070400ff + Handle(Image_SupportedFormats) aFormats = new Image_SupportedFormats(); + const Handle(Image_PixMap)& aPixmap = aTexture->GetImage(aFormats); +#else + const Handle(Image_PixMap)& aPixmap = aTexture->GetImage(); +#endif if ( aPixmap.IsNull() ) continue; @@ -258,7 +293,6 @@ namespace aPixmapUsersMap.UnBind( aPixmap ); aPixmapCacheMap.remove( aPixmapCacheMap.key( aPixmap ) ); } -#endif } } @@ -389,7 +423,7 @@ SUIT_SelectionFilter* GEOM_Displayer::getFilter( const int theMode ) //================================================================ SUIT_SelectionFilter* GEOM_Displayer::getComplexFilter( const QList* aSubShapes) { - GEOM_CompoundFilter* aFilter; + GEOM_CompoundFilter* aFilter = 0; if(aSubShapes != NULL ) { aFilter = new GEOM_CompoundFilter(getStudy()); @@ -509,13 +543,6 @@ GEOM_Displayer::GEOM_Displayer() myViewFrame = 0; -#if OCC_VERSION_MAJOR >= 7 - myColorScale = new AIS_ColorScale; - myColorScale->SetZLayer (Graphic3d_ZLayerId_TopOSD); - myColorScale->SetTransformPersistence ( - Graphic3d_TransformPers::FromDeprecatedParams(Graphic3d_TMF_2d, gp_Pnt (-1,-1,0))); -#endif - myFieldDataType = GEOM::FDT_Double; myFieldDimension = 0; myFieldStepRangeMin = 0; @@ -785,7 +812,7 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap else if ( !myName.empty() ) { // workaround to allow selection of temporary objects static int tempId = 0; - anIO = new SALOME_InteractiveObject( QString( "TEMP_%1" ).arg( tempId++ ).toLatin1().data(), "GEOM", myName.c_str() ); + anIO = new SALOME_InteractiveObject( QString( "TEMP_%1" ).arg( tempId++ ).toUtf8().data(), "GEOM", myName.c_str() ); AISShape->setIO( anIO ); AISShape->SetOwner( anIO ); } @@ -839,16 +866,20 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap AISShape->Attributes()->SetLineAspect( anAspect ); // - unfree boundaries color - anAspect = AISShape->Attributes()->UnFreeBoundaryAspect(); - anAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : + Handle(Prs3d_LineAspect) aUnFreeBoundaryAspect = + new Prs3d_LineAspect (Quantity_NOC_RED, Aspect_TOL_SOLID, 1.0); + *aUnFreeBoundaryAspect->Aspect() = *AISShape->Attributes()->UnFreeBoundaryAspect()->Aspect(); + aUnFreeBoundaryAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value() ) ); - AISShape->Attributes()->SetUnFreeBoundaryAspect( anAspect ); + AISShape->Attributes()->SetUnFreeBoundaryAspect( aUnFreeBoundaryAspect ); // - free boundaries color - anAspect = AISShape->Attributes()->FreeBoundaryAspect(); - anAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : + Handle(Prs3d_LineAspect) aFreeBoundaryAspect = + new Prs3d_LineAspect (Quantity_NOC_RED, Aspect_TOL_SOLID, 1.0); + *aFreeBoundaryAspect->Aspect() = *AISShape->Attributes()->FreeBoundaryAspect()->Aspect(); + aFreeBoundaryAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::FreeBndColor ) ).value() ) ); - AISShape->Attributes()->SetFreeBoundaryAspect( anAspect ); + AISShape->Attributes()->SetFreeBoundaryAspect( aFreeBoundaryAspect ); // - standalone edges color anAspect = AISShape->Attributes()->WireAspect(); @@ -863,11 +894,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap AISShape->SetLabelColor( qColorFromResources( "label_color", QColor( 255, 255, 255 ) ) ); // set display mode - AISShape->SetDisplayMode( HasDisplayMode() ? - // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function - GetDisplayMode() : - // display mode from properties - propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt() ); + int displayMode = HasDisplayMode() ? + // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function + GetDisplayMode() : + // display mode from properties + propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt(); + AISShape->SetDisplayMode( displayMode ); // - face boundaries color and line width anAspect = AISShape->Attributes()->FaceBoundaryAspect(); @@ -948,7 +980,7 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap study->setObjectProperty( aMgrId, entry, GEOM::propertyName( GEOM::Texture ), QString( GetTexture().c_str() ) ); study->setObjectProperty( aMgrId, entry, GEOM::propertyName( GEOM::DisplayMode ), 3 ); - // Update propeties map + // Update properties map propMap = getObjectProperties( entry, myViewFrame ); } } @@ -957,7 +989,6 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap aImagePath = propMap.value( GEOM::propertyName( GEOM::Texture ) ).toString(); } -#ifdef USE_TEXTURED_SHAPE Handle(Image_PixMap) aPixmap; if ( !aImagePath.isEmpty() ) aPixmap = cacheTextureFor( aImagePath, AISShape ); @@ -966,14 +997,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap // apply image to shape if ( !aPixmap.IsNull() ) { - AISShape->SetTexturePixMap( aPixmap ); - AISShape->SetTextureMapOn(); - AISShape->DisableTextureModulate(); + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMap( new Graphic3d_Texture2Dmanual( aPixmap ) ); } - else { - AISShape->SetTextureMapOff(); - } -#endif + if ( displayMode == GEOM_AISShape::TexturedShape ) + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMapOn(); + else + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMapOff(); // set line width AISShape->SetWidth( HasWidth() ? @@ -1058,7 +1087,7 @@ void GEOM_Displayer::updateActorProperties( GEOM_Actor* actor, bool create ) else if ( !myName.empty() ) { // workaround to allow selection of temporary objects static int tempId = 0; - anIO = new SALOME_InteractiveObject( QString( "TEMP_VTK_%1" ).arg( tempId++ ).toLatin1().data(), "GEOM", myName.c_str() ); + anIO = new SALOME_InteractiveObject( QString( "TEMP_VTK_%1" ).arg( tempId++ ).toUtf8().data(), "GEOM", myName.c_str() ); actor->setIO( anIO ); } @@ -1354,12 +1383,21 @@ void GEOM_Displayer::updateDimensions( const Handle(SALOME_InteractiveObject)& t if ( aUnitsAngle == "deg" ) { aPrs->SetSpecialSymbol(0xB0); +#if OCC_VERSION_LARGE >= 0x070400ff + aPrs->SetDisplaySpecialSymbol( isUnitsShown ? PrsDim_DisplaySpecialSymbol_After : + PrsDim_DisplaySpecialSymbol_No ); +#else aPrs->SetDisplaySpecialSymbol( isUnitsShown ? AIS_DSS_After : AIS_DSS_No ); +#endif aStyle->MakeUnitsDisplayed(Standard_False); } else { +#if OCC_VERSION_LARGE >= 0x070400ff + aPrs->SetDisplaySpecialSymbol(PrsDim_DisplaySpecialSymbol_No); +#else aPrs->SetDisplaySpecialSymbol(AIS_DSS_No); +#endif aStyle->MakeUnitsDisplayed( (Standard_Boolean) isUnitsShown ); } } @@ -1441,7 +1479,7 @@ void GEOM_Displayer::Redisplay( const SALOME_ListIO& theIOList, //================================================================= /*! * GEOM_Displayer::Update - * Update OCC presentaion + * Update OCC presentation * [ Reimplemented from SALOME_Displayer ] */ //================================================================= @@ -1576,7 +1614,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) //================================================================= /*! * GEOM_Displayer::Update - * Update VTK presentaion + * Update VTK presentation * [ Reimplemented from SALOME_Displayer ] */ //================================================================= @@ -1677,10 +1715,48 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) } } +//================================================================= +/*! + * GEOM_Displayer::Update + * Update PV3D presentation + * [ Reimplemented from SALOME_Displayer ] + */ +//================================================================= +void GEOM_Displayer::Update( SALOME_PV3DPrs* prs ) +{ + SPV3D_Prs* pv3dPrs = dynamic_cast( prs ); + + SalomeApp_Study* study = getStudy(); + + if ( !pv3dPrs || myShape.IsNull() || !study ) + return; + + if ( myType == GEOM_MARKER && myShape.ShapeType() == TopAbs_FACE ) + { + // + // specific processing for local coordinate system presentation + // + // NYI - Update(PV3DPrs) for the local coordinate system + } + else + { + // + // processing for usual geometry presentation + // + { + pv3dPrs->SetName( myNameInObjBrowser ); + GEOM_Actor *actor = GEOM_Actor::New(); + updateActorProperties( actor, true ); + pv3dPrs->FillUsingActor( actor ); + } + } +} + + //================================================================= /*! * GEOM_Displayer::BuildPrs - * Build presentation accordint to the current viewer type + * Build presentation according to the current viewer type */ //================================================================= SALOME_Prs* GEOM_Displayer::BuildPrs( GEOM::GEOM_Object_ptr theObj ) @@ -1709,7 +1785,7 @@ SALOME_Prs* GEOM_Displayer::BuildPrs( GEOM::GEOM_Object_ptr theObj ) //================================================================= /*! * GEOM_Displayer::BuildPrs - * Build presentation accordint to the current viewer type + * Build presentation according to the current viewer type */ //================================================================= SALOME_Prs* GEOM_Displayer::BuildPrs( const TopoDS_Shape& theShape ) @@ -1753,7 +1829,7 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry, if ( prs ) { Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject(); - theIO->setEntry( entry.toLatin1().constData() ); + theIO->setEntry( entry.toUtf8().constData() ); if ( !theIO.IsNull() ) { // set interactive object @@ -1762,7 +1838,7 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry, if ( getStudy() ) { _PTR(SObject) SO ( getStudy()->studyDS()->FindObjectID( theIO->getEntry() ) ); - if ( SO ) + if ( SO ) //GeometryGUI::IsInGeomComponent( SO )) { // get CORBA reference to data object CORBA::Object_var object = GeometryGUI::ClientSObjectToObject(SO); @@ -1772,6 +1848,7 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry, GEOM::GEOM_BaseObject_var GeomBaseObject = GEOM::GEOM_BaseObject::_narrow( object ); if ( !GeomBaseObject->_is_nil() ) { + myNameInObjBrowser = getName( GeomBaseObject ); myType = GeomBaseObject->GetType(); // downcast to GEOM object @@ -1793,9 +1870,10 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry, if ( !GeomObject->_is_nil() ) { - theIO->setName( GeomObject->GetName() ); - // finally set shape - setShape( GEOM_Client::get_client().GetShape( GeometryGUI::GetGeomGen(), GeomObject ) ); + CORBA::String_var name = GeomObject->GetName(); + theIO->setName( name ); + // finally set shape + setShape( GEOM_Client::get_client().GetShape( GeometryGUI::GetGeomGen(), GeomObject ) ); } } } @@ -1831,7 +1909,7 @@ SALOME_Prs* GEOM_Displayer::buildSubshapePresentation(const TopoDS_Shape& aShape if (prs) { Handle(SALOME_InteractiveObject) theIO = new SALOME_InteractiveObject(); - theIO->setEntry(entry.toLatin1().constData()); + theIO->setEntry(entry.toUtf8().constData()); if (!theIO.IsNull()) { // set interactive object @@ -1971,27 +2049,26 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, if ( theModes.Contains( GEOM_ALLOBJECTS ) ) return; - SUIT_SelectionFilter* aFilter; - if ( theModes.Extent() == 1 ) - { - int aMode = TColStd_MapIteratorOfMapOfInteger( theModes ).Key(); - - if ( aMode == GEOM_COMPOUNDFILTER ) - aFilter = getComplexFilter( theSubShapes ); - else - aFilter = getFilter( aMode ); - } - else if ( theModes.Extent() > 1 ) + SUIT_SelectionFilter* aFilter = NULL; + if ( theModes.Extent() > 0 ) { TColStd_MapOfInteger aTopAbsModes; TColStd_MapIteratorOfMapOfInteger anIter( theModes ); QList aListOfFilters; for ( ; anIter.More(); anIter.Next() ) { - SUIT_SelectionFilter* aFilter; + SUIT_SelectionFilter* aFilter = 0; int aMode = anIter.Key(); if ( aMode == GEOM_COMPOUNDFILTER ) aFilter = getComplexFilter( theSubShapes ); + if ( aMode == GEOM_COMPOUND ) { + // always add COMPSOLID filter together with COMPOUND filter + aFilter = new GEOM_TypeFilter( getStudy(), TopAbs_COMPSOLID, true ); + aListOfFilters.append( aFilter ); + + // add the COMPOUND filter itself + aFilter = getFilter( aMode ); + } else aFilter = getFilter( aMode ); @@ -1999,7 +2076,8 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, aListOfFilters.append( aFilter ); } - aFilter = new GEOM_LogicalFilter( aListOfFilters, GEOM_LogicalFilter::LO_OR ); + if (aListOfFilters.size() > 1) + aFilter = new GEOM_LogicalFilter( aListOfFilters, GEOM_LogicalFilter::LO_OR ); } else return; @@ -2058,15 +2136,15 @@ void GEOM_Displayer::BeforeDisplay( SALOME_View* v, const SALOME_OCCPrs* ) Handle(AIS_InteractiveContext) ic = vf->getAISContext(); if ( !ic.IsNull() ) { - if ( ic->HasOpenedContext() ) - ic->CloseAllContexts(Standard_True); + ic->Deactivate(); + ic->Activate( 0 ); } } } void GEOM_Displayer::AfterDisplay( SALOME_View* v, const SALOME_OCCPrs* p ) { - UpdateColorScale(false,false); + UpdateColorScale(); // visualize annotations for displayed presentation SUIT_Session* session = SUIT_Session::session(); @@ -2090,7 +2168,7 @@ void GEOM_Displayer::BeforeErase( SALOME_View* v, const SALOME_OCCPrs* p ) void GEOM_Displayer::AfterErase( SALOME_View* v, const SALOME_OCCPrs* p ) { LightApp_Displayer::AfterErase( v, p ); - UpdateColorScale(false,false); + UpdateColorScale(); if ( !myIsRedisplayed ) { // hide annotations for erased presentation @@ -2367,12 +2445,17 @@ void GEOM_Displayer::setFieldStepInfo( const GEOM::field_data_type theFieldDataT bool GEOM_Displayer::canBeDisplayed( const QString& entry, const QString& viewer_type ) const { - _PTR(SObject) anObj = getStudy()->studyDS()->FindObjectID( (const char*)entry.toLatin1() ); - GEOM::GEOM_Object_var aGeomObj = GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(anObj)); // enable displaying of GEOM objects - GEOM::GEOM_FieldStep_var aFieldStepObj = GEOM::GEOM_FieldStep::_narrow(GeometryGUI::ClientSObjectToObject(anObj)); // enable displaying of GEOM field steps - GEOM::GEOM_Gen_var aCompObj = GEOM::GEOM_Gen::_narrow(GeometryGUI::ClientSObjectToObject(anObj)); // enable displaying of whole GEOM component - return ( !CORBA::is_nil( aGeomObj ) || !CORBA::is_nil( aFieldStepObj ) || !CORBA::is_nil( aCompObj ) ) && - (viewer_type == SOCC_Viewer::Type() || viewer_type == SVTK_Viewer::Type()); + _PTR(SObject) anObj = getStudy()->studyDS()->FindObjectID( (const char*)entry.toUtf8() ); + //if ( ! GeometryGUI::IsInGeomComponent( anObj )) return false; + CORBA::Object_var anOrbObj = GeometryGUI::ClientSObjectToObject(anObj); + bool isCorbaObj = (!CORBA::is_nil(anOrbObj)); + GEOM::GEOM_Object_var aGeomObj = GEOM::GEOM_Object::_narrow(anOrbObj); // enable displaying of GEOM objects + GEOM::GEOM_FieldStep_var aFieldStepObj = GEOM::GEOM_FieldStep::_narrow(anOrbObj); // enable displaying of GEOM field steps + GEOM::GEOM_Gen_var aCompObj = GEOM::GEOM_Gen::_narrow(anOrbObj); // enable displaying of whole GEOM component + bool isGeomObj = (!CORBA::is_nil( aGeomObj ) || !CORBA::is_nil( aFieldStepObj ) || !CORBA::is_nil( aCompObj )); + bool ret = ( isGeomObj ) && + (viewer_type == SOCC_Viewer::Type() || viewer_type == SVTK_Viewer::Type() || viewer_type == SPV3D_ViewModel::Type()); + return ret; } int GEOM_Displayer::SetDisplayMode( const int theMode ) @@ -2529,7 +2612,7 @@ PropMap GEOM_Displayer::getObjectProperties( const QString& entry, if ( !entry.isEmpty() ) { // get CORBA reference to geom object _PTR(SObject) SO( getStudy()->studyDS()->FindObjectID( entry.toStdString() ) ); - if ( SO ) { + if ( SO ) { //GeometryGUI::IsInGeomComponent( SO )) { CORBA::Object_var object = GeometryGUI::ClientSObjectToObject( SO ); if ( !CORBA::is_nil( object ) ) { GEOM::GEOM_Object_var geomObject = GEOM::GEOM_Object::_narrow( object ); @@ -2684,38 +2767,40 @@ SALOMEDS::Color GEOM_Displayer::getColor(GEOM::GEOM_Object_var theGeomObject, bo aSColor = theGeomObject->GetColor(); hasColor = aSColor.R >= 0 && aSColor.G >= 0 && aSColor.B >= 0; if ( !hasColor ) { + if (!theGeomObject->IsMainShape()) { #ifdef GENERAL_AUTOCOLOR // auto-color for all sub-shapes - bool general_autocolor = true; + bool general_autocolor = true; #else // auto-color for groups only - bool general_autocolor = false; + bool general_autocolor = false; #endif // GENERAL_AUTOCOLOR - if ( general_autocolor || theGeomObject->GetType() == GEOM_GROUP ) { - GEOM::GEOM_Object_var aMainObject = theGeomObject->GetMainShape(); - if ( !CORBA::is_nil( aMainObject ) && aMainObject->GetAutoColor() ) { + if ( general_autocolor || theGeomObject->GetType() == GEOM_GROUP ) { + GEOM::GEOM_Object_var aMainObject = theGeomObject->GetMainShape(); + if ( !CORBA::is_nil( aMainObject ) && aMainObject->GetAutoColor() ) { #ifdef SIMPLE_AUTOCOLOR // simplified algorithm for auto-colors - aSColor = getPredefinedUniqueColor(); - hasColor = true; + aSColor = getPredefinedUniqueColor(); + hasColor = true; #else // old algorithm for auto-colors - QList aReservedColors; - CORBA::String_var IOR = app->orb()->object_to_string( aMainObject ); - _PTR(SObject) aMainSObject( aStudy->FindObjectIOR( IOR.in() ) ); - if ( aMainSObject ) { - _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; - - SALOMEDS::Color aReservedColor = aChildObject->GetColor(); - if ( aReservedColor.R >= 0 && aReservedColor.G >= 0 && aReservedColor.B >= 0 ) - aReservedColors.append( aReservedColor ); + QList aReservedColors; + CORBA::String_var IOR = app->orb()->object_to_string( aMainObject ); + _PTR(SObject) aMainSObject( aStudy->FindObjectIOR( IOR.in() ) ); + if ( aMainSObject ) { + _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; + + SALOMEDS::Color aReservedColor = aChildObject->GetColor(); + if ( aReservedColor.R >= 0 && aReservedColor.G >= 0 && aReservedColor.B >= 0 ) + aReservedColors.append( aReservedColor ); + } } - } - aSColor = getUniqueColor( aReservedColors ); - hasColor = true; + aSColor = getUniqueColor( aReservedColors ); + hasColor = true; #endif // SIMPLE_AUTOCOLOR + } } } } @@ -2756,7 +2841,7 @@ void GEOM_Displayer::EraseWithChildren(const Handle(SALOME_InteractiveObject)& t if(l_obj) foreach ( view, views ) { Handle(SALOME_InteractiveObject) anIO = - new SALOME_InteractiveObject(qPrintable(l_obj->entry()), "GEOM", ""); + new SALOME_InteractiveObject(qUtf8Printable(l_obj->entry()), "GEOM", ""); Erase(anIO, false, false, view); } } @@ -2902,7 +2987,10 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS aValue = double( aVariant.toLongLong() ); else if( aVariant.type() == QVariant::Double ) aValue = aVariant.toDouble(); - aNorm += aValue * aValue; + if ( theFieldNbComponents > 1 ) + aNorm += aValue * aValue; + else + aNorm += aValue; } } } @@ -2913,7 +3001,7 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS { if( anIsBoolean ) aNorm /= theFieldNbComponents; - else + else if ( theFieldNbComponents > 1 ) aNorm = pow( aNorm, 0.5 ); if( aGroupedList.isEmpty() ) @@ -2948,11 +3036,7 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS { QColor aQColor; Quantity_Color aColor; -#if OCC_VERSION_MAJOR < 7 - if( FindColor( aVariant.toDouble(), theFieldStepRangeMin, theFieldStepRangeMax, anIsBoolean ? 2 : aNbIntervals, aColor ) ) -#else if( AIS_ColorScale::FindColor( aVariant.toDouble(), theFieldStepRangeMin, theFieldStepRangeMax, anIsBoolean ? 2 : aNbIntervals, aColor ) ) -#endif aQColor = QColor::fromRgbF( aColor.Red(), aColor.Green(), aColor.Blue() ); aResultList << aQColor; } @@ -2960,201 +3044,91 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS return aResultList; } -#if OCC_VERSION_MAJOR < 7 -// Note: the method is copied from Aspect_ColorScale class -Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue, - const Standard_Integer aMin, - const Standard_Integer aMax ) -{ - Standard_Integer minLimit( 0 ), maxLimit( 230 ); - - Standard_Integer aHue = maxLimit; - if ( aMin != aMax ) - aHue = (Standard_Integer)( maxLimit - ( maxLimit - minLimit ) * ( aValue - aMin ) / ( aMax - aMin ) ); - - aHue = Min( Max( minLimit, aHue ), maxLimit ); - - return aHue; -} - -// Note: the method is copied from Aspect_ColorScale class -Standard_Boolean GEOM_Displayer::FindColor( const Standard_Real aValue, - const Standard_Real aMin, - const Standard_Real aMax, - const Standard_Integer ColorsCount, - Quantity_Color& aColor ) -{ - if( aValueaMax || aMaxaMax ) - IntervNumber = ColorsCount-1; - else if( Abs( aMax-aMin ) > Precision::Approximation() ) - IntervNumber = Floor( Standard_Real( ColorsCount ) * ( aValue - aMin ) / ( aMax - aMin ) ); // 'Ceiling' replaced with 'Floor' - - Standard_Integer Interv = Standard_Integer( IntervNumber ); - - aColor = Quantity_Color( HueFromValue( Interv, 0, ColorsCount - 1 ), 1.0, 1.0, Quantity_TOC_HLS ); - - return Standard_True; - } -} -#endif - -void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, const bool updateViewer ) +void GEOM_Displayer::UpdateColorScale() { - SOCC_Viewer* aViewModel = dynamic_cast( GetActiveView() ); - if( !aViewModel ) - return; - - Handle(V3d_Viewer) aViewer = aViewModel->getViewer3d(); - if( aViewer.IsNull() ) + if ( !myUpdateColorScale ) return; - aViewer->InitActiveViews(); - if( !aViewer->MoreActiveViews() ) - return; - - Handle(V3d_View) aView = aViewer->ActiveView(); - if( aView.IsNull() ) - return; - - Standard_Boolean anIsDisplayColorScale = Standard_False; - TCollection_AsciiString aColorScaleTitle; - Standard_Real aColorScaleMin = 0, aColorScaleMax = 0; - Standard_Boolean anIsBoolean = Standard_False; + SUIT_Session* session = SUIT_Session::session(); + SUIT_Application* app = session->activeApplication(); + if ( !app ) return; - Handle(SALOME_InteractiveObject) anIO; - if ( myUpdateColorScale ) - anIO = myApp->selectionMgr()->soleSelectedObject(); + Handle(SALOME_InteractiveObject) io = myApp->selectionMgr()->soleSelectedObject(); - if( !anIO.IsNull() ) + QList windows = app->desktop()->windows(); + foreach( SUIT_ViewWindow* window, windows ) { - SOCC_Prs* aPrs = dynamic_cast( aViewModel->CreatePrs( anIO->getEntry() ) ); - if( aPrs ) + OCCViewer_ViewWindow* occWindow = dynamic_cast( window ); + if ( !occWindow ) continue; + if ( !occWindow->getViewManager() ) continue; + if ( !window->getViewManager() ) continue; + if ( !window->getViewManager()->getViewModel() ) continue; + SOCC_Viewer* view = dynamic_cast( window->getViewManager()->getViewModel() ); + if ( !view ) continue; + Handle(V3d_Viewer) viewer = view->getViewer3d(); + if ( !io.IsNull() && view->isVisible( io ) ) { - AIS_ListOfInteractive aList; - aPrs->GetObjects( aList ); - AIS_ListIteratorOfListOfInteractive anIter( aList ); - for( ; anIter.More(); anIter.Next() ) + bool visible = false; + SOCC_Prs* prs = dynamic_cast( view->CreatePrs( io->getEntry() ) ); + if ( prs ) { - Handle(GEOM_AISShape) aShape = Handle(GEOM_AISShape)::DownCast( anIter.Value() ); - if( !aShape.IsNull() ) + AIS_ListOfInteractive presentations; + prs->GetObjects( presentations ); + AIS_ListIteratorOfListOfInteractive iter( presentations ); + for ( ; iter.More(); iter.Next() ) { - GEOM::field_data_type aFieldDataType; - int aFieldDimension; - QList aFieldStepData; - TCollection_AsciiString aFieldStepName; - double aFieldStepRangeMin, aFieldStepRangeMax; - aShape->getFieldStepInfo( aFieldDataType, - aFieldDimension, - aFieldStepData, - aFieldStepName, - aFieldStepRangeMin, - aFieldStepRangeMax ); - if( !aFieldStepData.isEmpty() && aFieldDataType != GEOM::FDT_String ) + Handle(GEOM_AISShape) shape = Handle(GEOM_AISShape)::DownCast( iter.Value() ); + if ( shape.IsNull() ) continue; + GEOM::field_data_type fieldDataType; + int fieldDimension; + QList fieldStepData; + TCollection_AsciiString fieldStepName; + Standard_Real fieldStepRangeMin, fieldStepRangeMax; + shape->getFieldStepInfo( fieldDataType, fieldDimension, fieldStepData, + fieldStepName, fieldStepRangeMin, fieldStepRangeMax ); + visible = !fieldStepData.isEmpty() && fieldDataType != GEOM::FDT_String; + if ( visible ) { - anIsDisplayColorScale = Standard_True; - aColorScaleTitle = aFieldStepName; - aColorScaleMin = aFieldStepRangeMin; - aColorScaleMax = aFieldStepRangeMax; - anIsBoolean = aFieldDataType == GEOM::FDT_Bool; - } + SUIT_Session* session = SUIT_Session::session(); + SUIT_ResourceMgr* resMgr = session->resourceMgr(); + + Standard_Real xPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 ); + Standard_Real yPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 ); + Standard_Real width = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 ); + Standard_Real height = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 ); + Standard_Integer textHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 ); + Standard_Integer nbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 ); + + Standard_Integer viewWidth = 0, viewHeight = 0; + occWindow->getView(0)->getViewPort()->getView()->Window()->Size( viewWidth, viewHeight ); + + Handle(AIS_ColorScale) colorScale = view->getColorScale(); + + colorScale->SetPosition( viewWidth * xPos, viewHeight * yPos ); + colorScale->SetBreadth( viewWidth * width ); + colorScale->SetHeight( viewHeight * height ); + colorScale->SetRange( fieldStepRangeMin, fieldStepRangeMax ); + colorScale->SetNumberOfIntervals( fieldDataType == GEOM::FDT_Bool ? 2 : nbIntervals ); + colorScale->SetTextHeight( textHeight ); + colorScale->SetTitle( fieldStepName ); + } // if ( visible ) } } - } - } - - if( anIsDisplayColorScale ) - { - SUIT_Session* session = SUIT_Session::session(); - SUIT_ResourceMgr* resMgr = session->resourceMgr(); - - Standard_Real anXPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 ); - Standard_Real anYPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 ); - Standard_Real aWidth = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 ); - Standard_Real aHeight = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 ); - Standard_Integer aTextHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 ); - Standard_Integer aNbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 ); - -#if OCC_VERSION_MAJOR < 7 - Handle(Aspect_ColorScale) myColorScale = aView->ColorScale(); - if( !myColorScale.IsNull() ) + view->setColorScaleShown( visible ); + } // if ( view->isVisible( io ) ) + else { - myColorScale->SetXPosition( anXPos ); - myColorScale->SetYPosition( anYPos ); - myColorScale->SetWidth( aWidth ); - myColorScale->SetHeight( aHeight ); -#else - Standard_Integer aWinWidth = 0, aWinHeight = 0; - aView->Window()->Size (aWinWidth, aWinHeight); - - myColorScale->SetPosition (aWinWidth*anXPos, aWinHeight*anYPos); - //myColorScale->SetBreadth (aWinWidth); // ??? - myColorScale->SetBreadth (aWinWidth*aWidth); // ??? - myColorScale->SetHeight (aWinHeight*aHeight); -#endif - - myColorScale->SetRange( aColorScaleMin, aColorScaleMax ); - myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals ); - - myColorScale->SetTextHeight( aTextHeight ); - myColorScale->SetTitle( aColorScaleTitle ); - -#if OCC_VERSION_MAJOR < 7 + view->setColorScaleShown( false ); } - if( !aView->ColorScaleIsDisplayed() ) - aView->ColorScaleDisplay(); - } - else - if( aView->ColorScaleIsDisplayed() ) - aView->ColorScaleErase(); -#else - if( !aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) - aViewModel->getAISContext()->Display( myColorScale, Standard_True); - } - else - if( aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) - aViewModel->getAISContext()->Erase( myColorScale, Standard_True ); -#endif + } // foreach( SUIT_ViewWindow* window, windows ) +} - if( theIsRedisplayFieldSteps ) - { - _PTR(Study) aStudyDS = getStudy()->studyDS(); - QList vmList; - myApp->viewManagers( vmList ); - for( QList::Iterator vmIt = vmList.begin(); vmIt != vmList.end(); vmIt++ ) - { - if( SUIT_ViewManager* aViewManager = *vmIt ) - { - const ObjMap& anObjects = getStudy()->getObjectProperties( aViewManager->getGlobalId() ); - for( ObjMap::ConstIterator objIt = anObjects.begin(); objIt != anObjects.end(); objIt++ ) - { - _PTR(SObject) aSObj( aStudyDS->FindObjectID( objIt.key().toLatin1().constData() ) ); - if( aSObj ) - { - CORBA::Object_var anObject = GeometryGUI::ClientSObjectToObject( aSObj ); - if( !CORBA::is_nil( anObject ) ) - { - GEOM::GEOM_FieldStep_var aFieldStep = GEOM::GEOM_FieldStep::_narrow( anObject ); - if( !aFieldStep->_is_nil() ) - { - CORBA::String_var aStepEntry = aFieldStep->GetStudyEntry(); - Handle(SALOME_InteractiveObject) aStepIO = - new SALOME_InteractiveObject( aStepEntry.in(), "GEOM", "TEMP_IO" ); - Redisplay( aStepIO, false, false ); - } - } - } - } - } - } - } - if(updateViewer) - UpdateViewer(); +bool GEOM_Displayer::SetUpdateColorScale( bool toUpdate ) // IPAL54049 +{ + bool previous = myUpdateColorScale; + myUpdateColorScale = toUpdate; + if ( myUpdateColorScale && !previous ) + UpdateColorScale(); + return previous; } +