From 886031d285d687211e9fea939063582c75c50959 Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 22 Oct 2015 09:48:17 +0300 Subject: [PATCH] #662: updated hilight/select presentations for land covers --- src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx | 46 ++++++++++++++++-- src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h | 4 ++ src/HYDRO_tests/TestViewer.cxx | 7 +++ src/HYDRO_tests/TestViewer.h | 2 + .../LandCoverMap_PrsByTypes.png | Bin 9242 -> 9819 bytes .../test_HYDROData_LandCoverMap.cxx | 4 ++ 6 files changed, 58 insertions(+), 5 deletions(-) diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx index 7a005c24..6f654a6d 100644 --- a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx +++ b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx @@ -21,11 +21,16 @@ #include #include #include +#include #include +#include #include #include #include +const Quantity_Color EDGES_COLOR = Quantity_NOC_WHITE; +const int HILIGHT_ISO_NB = 10; + IMPLEMENT_STANDARD_HANDLE( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape ) IMPLEMENT_STANDARD_RTTIEXT( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape ) @@ -33,6 +38,8 @@ HYDROGUI_LandCoverMapPrs::HYDROGUI_LandCoverMapPrs( const Handle(HYDROData_LandC : AIS_ColoredShape( theMap->GetShape() ) { SetLandCoverMap( theMap ); + SetAutoHilight( Standard_False ); + SetHilightAttributes( EDGES_COLOR ); } HYDROGUI_LandCoverMapPrs::~HYDROGUI_LandCoverMapPrs() @@ -135,13 +142,11 @@ void HYDROGUI_LandCoverMapPrs::Compute( const Handle(PrsMgr_PresentationManager3 { thePresentation->Clear(); - Quantity_Color anEdgeColor = Quantity_NOC_WHITE; - myDrawer->UIsoAspect()->SetNumber( 0 ); myDrawer->VIsoAspect()->SetNumber( 0 ); - myDrawer->LineAspect()->SetColor( anEdgeColor ); - myDrawer->FaceBoundaryAspect()->SetColor( anEdgeColor ); - myDrawer->FreeBoundaryAspect()->SetColor( anEdgeColor ); + myDrawer->LineAspect()->SetColor( EDGES_COLOR ); + myDrawer->FaceBoundaryAspect()->SetColor( EDGES_COLOR ); + myDrawer->FreeBoundaryAspect()->SetColor( EDGES_COLOR ); switch( theMode ) { @@ -155,3 +160,34 @@ void HYDROGUI_LandCoverMapPrs::Compute( const Handle(PrsMgr_PresentationManager3 StdPrs_WFDeflectionShape::Add( thePresentation, Shape(), myDrawer ); } +void HYDROGUI_LandCoverMapPrs::HilightSelected( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const SelectMgr_SequenceOfOwner& theOwners ) +{ + Handle(Prs3d_Presentation) aSelectPrs = GetSelectPresentation( thePresentationManager ); + + SetHilightAttributes( EDGES_COLOR ); + + for( int i=1, n=theOwners.Length(); i<=n; i++ ) + { + Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast( theOwners.Value( i ) ); + if( !anOwner.IsNull() ) + StdPrs_WFDeflectionShape::Add( aSelectPrs, anOwner->Shape(), HilightAttributes() ); + } + + HilightAttributes()->UIsoAspect()->SetNumber( 0 ); + HilightAttributes()->VIsoAspect()->SetNumber( 0 ); + + aSelectPrs->SetDisplayPriority( 9 ); + aSelectPrs->Display(); +} + +void HYDROGUI_LandCoverMapPrs::SetHilightAttributes( const Quantity_Color& theEdgesColor ) +{ + HilightAttributes()->UIsoAspect()->SetNumber( HILIGHT_ISO_NB ); + HilightAttributes()->UIsoAspect()->SetColor( theEdgesColor ); + HilightAttributes()->VIsoAspect()->SetNumber( HILIGHT_ISO_NB ); + HilightAttributes()->VIsoAspect()->SetColor( theEdgesColor ); + HilightAttributes()->LineAspect()->SetColor( theEdgesColor ); + HilightAttributes()->FaceBoundaryAspect()->SetColor( theEdgesColor ); + HilightAttributes()->FreeBoundaryAspect()->SetColor( theEdgesColor ); +} diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h index 0e9888a1..e1acc832 100644 --- a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h +++ b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h @@ -47,10 +47,14 @@ public: const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode ); + virtual void HilightSelected( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const SelectMgr_SequenceOfOwner& theOwners ); + Quantity_Color GetColor( const QString& theStricklerType ) const; protected: void UpdateColors(); + void SetHilightAttributes( const Quantity_Color& theEdgesColor ); private: Handle(HYDROData_LandCoverMap) myLCMap; diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx index 44e3fc2c..1fef8ca1 100644 --- a/src/HYDRO_tests/TestViewer.cxx +++ b/src/HYDRO_tests/TestViewer.cxx @@ -243,3 +243,10 @@ Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow ) } return aColorScale; } + +void TestViewer::select( int theViewX, int theViewY ) +{ + Handle(V3d_View) aView = myViewWindow->getViewPort()->getView(); + context()->MoveTo( theViewX, theViewY, aView ); + context()->Select(); +} diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h index 61f0d6bb..d5bd15d6 100644 --- a/src/HYDRO_tests/TestViewer.h +++ b/src/HYDRO_tests/TestViewer.h @@ -26,6 +26,8 @@ public: static Handle_Aspect_ColorScale showColorScale( bool ); + static void select( int theViewX, int theViewY ); + private: static OCCViewer_ViewManager* myViewManager; static OCCViewer_ViewWindow* myViewWindow; diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_PrsByTypes.png b/src/HYDRO_tests/reference_data/LandCoverMap_PrsByTypes.png index 218a62161542c2f0854a3e7ecda63b327631dd41..2d7da92e5365cde7aafbb44f4fa9e677976fdc55 100644 GIT binary patch literal 9819 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 F{a>^N@+JTP literal 9242 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 diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx index 5e7e8fca..e1f52ed7 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx @@ -478,9 +478,13 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types() 127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "Zones de champs, prairies, sans cultures" ) ); + // build presentation object Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap ); aPrs->SetTable( aTable ); + // show presentation in viewer TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByTypes" ); + // select one of faces (first) + TestViewer::select( 200, 300 ); CPPUNIT_ASSERT_IMAGES aDoc->Close(); -- 2.39.2