From 419cb246be5d55f49b79e607911672eee3b451d4 Mon Sep 17 00:00:00 2001 From: isn Date: Fri, 10 Nov 2017 20:15:11 +0300 Subject: [PATCH] debug of test --- src/HYDRO_tests/TestViewer.cxx | 13 +++++++++++-- src/HYDRO_tests/TestViewer.h | 2 +- .../reference_data/cyprus_natural_all.png | Bin 8386 -> 7524 bytes .../test_HYDROData_LandCoverMap.cxx | 7 ++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx index 28292718..5c143368 100644 --- a/src/HYDRO_tests/TestViewer.cxx +++ b/src/HYDRO_tests/TestViewer.cxx @@ -118,10 +118,20 @@ QColor TestViewer::GetColor(int i) } } -void TestViewer::eraseAll( bool isUpdate ) +void TestViewer::eraseAll( bool isUpdate, bool eraseStructures ) { context()->CloseLocalContext( -1, Standard_False ); context()->EraseAll( isUpdate ); + if( eraseStructures ) + { + Graphic3d_MapOfStructure GmapS; + viewer()->getViewer3d()->StructureManager()->DisplayedStructures(GmapS); + for (Graphic3d_MapOfStructure::Iterator it(GmapS); it.More(); it.Next()) + { + Handle(Graphic3d_Structure) GS = it.Key(); + GS->Erase(); + } + } } void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject, @@ -367,7 +377,6 @@ void TestViewer::select( int theViewX, int theViewY ) Handle(V3d_View) aView = myViewWindow->getViewPort()->getView(); context()->MoveTo( theViewX, theViewY, aView ); context()->Select(); - // context()->ClearLocalContext(); // context()->CloseAllContexts(); } diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h index 9165763f..af8400f0 100644 --- a/src/HYDRO_tests/TestViewer.h +++ b/src/HYDRO_tests/TestViewer.h @@ -38,7 +38,7 @@ public: static OCCViewer_ViewFrame* viewWindow(); static Handle(AIS_InteractiveContext) context(); - static void eraseAll( bool isUpdate ); + static void eraseAll( bool isUpdate, bool eraseStructures = false ); static void show( const Handle(AIS_InteractiveObject)& theObject, int theMode, int theSelectionMode, bool isFitAll, const char* theKey ); static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor, diff --git a/src/HYDRO_tests/reference_data/cyprus_natural_all.png b/src/HYDRO_tests/reference_data/cyprus_natural_all.png index edd084aad0747b8d207a47cd11c314ef6646a94b..eca9f5f4ddb3d0828c550151b67b4133bcc55011 100644 GIT binary patch literal 7524 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 T3BREXC;%Flw27}(NWuRB%(HMJ diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx index 21e0440a..be1326b9 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx @@ -600,8 +600,8 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types() TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByTypes" ); // select one of faces (first) TestViewer::select( 200, 300 ); - // CPPUNIT_ASSERT_IMAGES - + CPPUNIT_ASSERT_IMAGES + TestViewer::eraseAll(true, true); aDoc->Close(); } @@ -810,6 +810,8 @@ void test_HYDROData_LandCoverMap::test_assign_to_calc_case() #include void test_HYDROData_LandCoverMap::test_shp_import_cyp() { + //TestViewer::eraseAll(true); + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); QString aFileName = REF_DATA_PATH + "/cyprus_natural.shp"; HYDROData_ShapeFile anImporter; @@ -834,7 +836,6 @@ void test_HYDROData_LandCoverMap::test_shp_import_cyp() LCM->StoreLandCovers(aMapFace2ST); TestViewer::show( LCM->GetShape(), AIS_Shaded, true, "cyprus_natural_all" ); - QTest::qWait(100000); CPPUNIT_ASSERT_IMAGES aDoc->Close(); } -- 2.39.2