From 73c6183c872b9bef4db51730512666316f055553 Mon Sep 17 00:00:00 2001
From: asl <asl@opencascade.com>
Date: Wed, 21 Oct 2015 17:25:31 +0300
Subject: [PATCH] test for polyline presentation

---
 src/HYDROData/HYDROData_BSplineOperation.cxx  |   4 --
 src/HYDROGUI/HYDROGUI_Polyline.cxx            |  13 ++++-
 src/HYDRO_tests/CMakeLists.txt                |   7 ++-
 src/HYDRO_tests/ExternalFiles.cmake           |   1 +
 src/HYDRO_tests/TestViewer.cxx                |  14 +++--
 .../reference_data/Polyline_Presentation.png  | Bin 0 -> 7750 bytes
 src/HYDRO_tests/test_HYDROData_PolylineXY.cxx |  54 +++++++++++++++++-
 src/HYDRO_tests/test_HYDROData_PolylineXY.h   |   2 +
 8 files changed, 80 insertions(+), 15 deletions(-)
 create mode 100644 src/HYDRO_tests/reference_data/Polyline_Presentation.png

diff --git a/src/HYDROData/HYDROData_BSplineOperation.cxx b/src/HYDROData/HYDROData_BSplineOperation.cxx
index 058005d9..64ae37d4 100644
--- a/src/HYDROData/HYDROData_BSplineOperation.cxx
+++ b/src/HYDROData/HYDROData_BSplineOperation.cxx
@@ -23,9 +23,7 @@
 #include <TColgp_HArray1OfPnt.hxx>
 #include <QPainterPath>
 
-#ifndef LIGHT_MODE
 #include <CurveCreator_Utils.hxx>
-#endif
 
 Handle(Geom_BSplineCurve) HYDROData_BSplineOperation::ComputeCurve(
   const NCollection_Sequence<gp_XYZ>& thePoints,
@@ -58,11 +56,9 @@ Handle(Geom_BSplineCurve) HYDROData_BSplineOperation::ComputeCurve(
 
   // compute BSpline
   Handle(Geom_BSplineCurve) aBSpline;
-#ifndef LIGHT_MODE
   if( CurveCreator_Utils::constructBSpline( aHCurvePoints, theIsClosed, aBSpline ) )
     return aBSpline;
   else
-#endif
     return Handle(Geom_BSplineCurve)();
 }
 
diff --git a/src/HYDROGUI/HYDROGUI_Polyline.cxx b/src/HYDROGUI/HYDROGUI_Polyline.cxx
index 91e0a06a..4f070b47 100644
--- a/src/HYDROGUI/HYDROGUI_Polyline.cxx
+++ b/src/HYDROGUI/HYDROGUI_Polyline.cxx
@@ -26,6 +26,7 @@
 #include <BRep_Tool.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
 #include <GeomAdaptor_Curve.hxx>
+#include <Graphic3d_AspectLine3d.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
 #include <Prs3d_Arrow.hxx>
@@ -82,8 +83,11 @@ void HYDROGUI_Polyline::Compute(const Handle(PrsMgr_PresentationManager3d)& aPre
 
   aPrs->Clear();
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup( aPrs );
-  Handle(Graphic3d_AspectLine3d) anAspect = Attributes()->FaceBoundaryAspect()->Aspect();
-  aGroup->SetGroupPrimitivesAspect( anAspect );
+  Quantity_Color aColor;
+  Aspect_TypeOfLine aType;
+  Standard_Real anWidth;
+  Attributes()->LineAspect()->Aspect()->Values( aColor, aType, anWidth );
+  Handle(Graphic3d_AspectLine3d) anAspect = new Graphic3d_AspectLine3d( aColor, aType, anWidth );
 
   TopExp_Explorer Exp1 ( myshape, TopAbs_EDGE );
   for ( ; Exp1.More(); Exp1.Next() )
@@ -91,7 +95,10 @@ void HYDROGUI_Polyline::Compute(const Handle(PrsMgr_PresentationManager3d)& aPre
     TopoDS_Edge anEdge = TopoDS::Edge( Exp1.Current() );
     Handle( Graphic3d_ArrayOfPolylines ) anArray = BuildEdgePresentation( anEdge, 0.1 );
     if( !anArray.IsNull() )
-      aGroup->AddPrimitiveArray ( anArray );
+    {
+      aGroup->SetPrimitivesAspect( anAspect );
+      aGroup->AddPrimitiveArray( anArray );
+    }
   }
 
    
diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 7f1e99b1..14b5b4dc 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -59,6 +59,7 @@ SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
 SET( CAS_INCLUDES $ENV{CAS_ROOT_DIR}/inc )
 SET( QT_INCLUDES $ENV{QT4_ROOT_DIR}/include $ENV{QT4_ROOT_DIR}/include/QtCore $ENV{QT4_ROOT_DIR}/include/QtGui $ENV{QT4_ROOT_DIR}/include/QtTest )
 SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
+SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
 
 IF( ${WIN32} )
   link_directories( $ENV{CAS_ROOT_DIR}/win32/libd )
@@ -81,8 +82,9 @@ ELSE()
   SET( CPPUNIT_LIBRARIES cppunit )
 ENDIF()
 
-link_directories( $ENV{GUI_ROOT_DIR}/lib/salome )
+link_directories( $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
 SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
+SET( GEOM_LIBRARIES CurveCreator )
 
 include_directories(
   ${BOOST_INCLUDES}
@@ -90,6 +92,7 @@ include_directories(
   ${QT_INCLUDES}
   ${CPPUNIT_INCLUDES}
   ${GUI_INCLUDES}
+  ${GEOM_INCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROGUI
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
@@ -98,7 +101,7 @@ include_directories(
 source_group( "External files" FILES ${EXTERNAL_FILES} )
 
 add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} )
-target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib )
+target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib )
 
 IF( ${WIN32} )
   add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake
index 663cd087..7ccb5c26 100644
--- a/src/HYDRO_tests/ExternalFiles.cmake
+++ b/src/HYDRO_tests/ExternalFiles.cmake
@@ -56,4 +56,5 @@ set( EXTERNAL_FILES
   ../HYDROGUI/HYDROGUI_ListModel.cxx
   ../HYDROGUI/HYDROGUI_DataObject.cxx
   ../HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
+  ../HYDROGUI/HYDROGUI_Polyline.cxx
 )
diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index d6ae86ff..44e3fc2c 100644
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -89,17 +89,21 @@ QColor TestViewer::GetColor(int i)
 void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
                        int theMode, int theSelectionMode, bool isFitAll, const char* theKey )
 {
-  context()->CloseLocalContext();
-  context()->EraseAll( Standard_False );
+  QString aNewKey = theKey;
+  if( !aNewKey.isEmpty() )
+  {
+    myKey = aNewKey;
+    context()->CloseLocalContext();
+    context()->EraseAll( Standard_False );
+  }
+  
+  context()->Display( theObject, theMode, theSelectionMode );
   if( theSelectionMode > 0 )
   {
-    context()->Display( theObject, theMode, theSelectionMode );
     context()->OpenLocalContext();
     context()->Activate( theObject, theSelectionMode, Standard_True );
   }
 
-  myKey = theKey;
-
   if( isFitAll )
   {
     viewWindow()->onTopView();
diff --git a/src/HYDRO_tests/reference_data/Polyline_Presentation.png b/src/HYDRO_tests/reference_data/Polyline_Presentation.png
new file mode 100644
index 0000000000000000000000000000000000000000..acbf8663999106bb59067551edfc22af7aa71f2b
GIT binary patch
literal 7750
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
HtnmK=^6(Gn

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
index a311e48d..e11b3a23 100644
--- a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
+++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
@@ -27,8 +27,13 @@
 #include <HYDROData_Iterator.h>
 #include <HYDROData_ImmersibleZone.h>
 #include <HYDROData_Tool.h>
+#include <HYDROGUI_Polyline.h>
 
 #include <AIS_DisplayMode.hxx>
+#include <AIS_PointCloud.hxx>
+#include <Prs3d_LineAspect.hxx>
+#include <Prs3d_PointAspect.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
 #include <QColor>
 #include <QList>
 #include <QPointF>
@@ -157,7 +162,7 @@ void test_HYDROData_PolylineXY::test_extraction_immersible_zone()
 
 void test_HYDROData_PolylineXY::test_extraction_channel_refs_611()
 {
-Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
   Handle(HYDROData_PolylineXY) aPolyline2d = 
     Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
@@ -211,3 +216,50 @@ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
   aDoc->Close();
 }
+
+void test_HYDROData_PolylineXY::test_presentation()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_PolylineXY) aPolyline2d = 
+    Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
+  aPolyline2d->SetName( "polyline2d_1" );
+  aPolyline2d->AddSection( "", HYDROData_IPolyline::SECTION_SPLINE, false );
+
+  QList<gp_XY> aPoints = QList<gp_XY>() << gp_XY(  0,  0 )
+                                        << gp_XY( 10, 10 )
+                                        << gp_XY( 20, 40 )
+                                        << gp_XY( 30, 10 )
+                                        << gp_XY( 40, 50 )
+                                        << gp_XY( 50, 60 )
+                                        << gp_XY( -10, 40 )
+                                        << gp_XY( -9, 39 )
+                                        << gp_XY( -8, 38 )
+                                        << gp_XY(  0, 20 );
+  Handle(TColgp_HArray1OfPnt) aPnts = new TColgp_HArray1OfPnt( 1, aPoints.size() );
+  int i = 1;
+  foreach( gp_XY aPoint, aPoints )
+  {
+    aPolyline2d->AddPoint( 0, aPoint );
+    aPnts->SetValue( i, gp_Pnt( aPoint.X(), aPoint.Y(), 0 ) );
+    i++;
+  }
+  aPolyline2d->Update();
+
+  CPPUNIT_ASSERT_EQUAL( false, (bool)aPolyline2d->GetShape().IsNull() );
+
+  Handle(AIS_PointCloud) aPointsPrs = new AIS_PointCloud();
+  aPointsPrs->SetPoints( aPnts );
+  aPointsPrs->SetColor( Quantity_NOC_BLUE1 );
+  aPointsPrs->Attributes()->PointAspect()->SetTypeOfMarker( Aspect_TOM_O );
+
+  Handle(HYDROGUI_Polyline) aNewPolylinePrs = new HYDROGUI_Polyline( aPolyline2d->GetShape() );
+  aNewPolylinePrs->SetColor( Quantity_NOC_DARKGREEN );
+
+  TestViewer::show( aPointsPrs, AIS_PointCloud::DM_Points, 0, true, "Polyline_Presentation" );
+  TestViewer::show( aPolyline2d->GetShape(), 0, true, Qt::red );
+  TestViewer::show( aNewPolylinePrs, AIS_PointCloud::DM_Points, 0, true, "" );
+  CPPUNIT_ASSERT_IMAGES
+
+  aDoc->Close();
+}
diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.h b/src/HYDRO_tests/test_HYDROData_PolylineXY.h
index cf58c980..dde74539 100644
--- a/src/HYDRO_tests/test_HYDROData_PolylineXY.h
+++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.h
@@ -23,6 +23,7 @@ class test_HYDROData_PolylineXY : public CppUnit::TestFixture {
   CPPUNIT_TEST( testPolyline );
   CPPUNIT_TEST( testCopy );
   CPPUNIT_TEST( testSplit_refs_624 );
+  CPPUNIT_TEST( test_presentation );
   CPPUNIT_TEST( test_extraction_immersible_zone );
   CPPUNIT_TEST( test_extraction_channel_refs_611 );
   CPPUNIT_TEST_SUITE_END();
@@ -45,6 +46,7 @@ public:
 
   void test_extraction_immersible_zone();
   void test_extraction_channel_refs_611();
+  void test_presentation();
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test_HYDROData_PolylineXY);
-- 
2.39.2