From 4659606cd0b30ee7b8c33bec27913ba5c8414b92 Mon Sep 17 00:00:00 2001 From: isn Date: Tue, 11 Sep 2018 21:00:44 +0300 Subject: [PATCH 1/1] debug of tests --- src/HYDROData/HYDROData_BCPolygon.h | 8 -------- src/HYDROData/HYDROData_CalculationCase.h | 2 +- src/HYDROData/HYDROData_Entity.cxx | 2 +- src/HYDRO_tests/ExternalFiles.cmake | 2 ++ 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/HYDROData/HYDROData_BCPolygon.h b/src/HYDROData/HYDROData_BCPolygon.h index efaf01b9..3af48992 100644 --- a/src/HYDROData/HYDROData_BCPolygon.h +++ b/src/HYDROData/HYDROData_BCPolygon.h @@ -114,14 +114,6 @@ public: HYDRODATA_EXPORT void SetBoundaryType( int ) const; - -private: - - /** - * Create all necessary child group objects. - */ - //HYDRODATA_EXPORT void createGroupObjects(); - protected: friend class HYDROData_Iterator; diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h index f5aefb1b..74a128e0 100644 --- a/src/HYDROData/HYDROData_CalculationCase.h +++ b/src/HYDROData/HYDROData_CalculationCase.h @@ -95,7 +95,6 @@ public: DataTag_AssignmentMode, ///< assignment mode DataTag_StricklerTable, ///< reference Strickler table DataTag_InterPoly, ///< intersection polyline - DataTag_BCPolygon, ///< reference boundary polygons DataTag_LandCover_Obsolete, ///< reference land covers DataTag_CustomLandCoverRules_Obsolete, ///< custom rules for land covers priority @@ -104,6 +103,7 @@ public: DataTag_LandCoverRegion_Obsolete, ///< reference land cover regions DataTag_LandCoverMap, ///< reference to land cover map + DataTag_BCPolygon ///< reference boundary polygons }; public: diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx index 94c4921a..a39e125b 100644 --- a/src/HYDROData/HYDROData_Entity.cxx +++ b/src/HYDROData/HYDROData_Entity.cxx @@ -149,7 +149,7 @@ QString HYDROData_Entity::Type( ObjectKind theKind ) case KIND_DTM: return "DTM"; case KIND_BC_POLYGON: - return "Boundary Polygon"; + return "Boundary_Polygon"; } return ""; } diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake index 2b207f3c..b71f3d1e 100644 --- a/src/HYDRO_tests/ExternalFiles.cmake +++ b/src/HYDRO_tests/ExternalFiles.cmake @@ -21,6 +21,8 @@ set( EXTERNAL_FILES ../HYDROData/HYDROData_IInterpolator.cxx ../HYDROData/HYDROData_Image.cxx ../HYDROData/HYDROData_ImmersibleZone.cxx + ../HYDROData/HYDROData_BCPolygon.cxx + ../HYDROData/HYDROData_BoundaryPolygonTools.cxx ../HYDROData/HYDROData_IPolyline.cxx ../HYDROData/HYDROData_Iterator.cxx ../HYDROData/HYDROData_Lambert93.cxx -- 2.30.2