Salome HOME
projects
/
modules
/
hydro.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c16caee
)
debug of tests
author
isn
<isn@opencascade.com>
Tue, 11 Sep 2018 18:00:44 +0000
(21:00 +0300)
committer
isn
<isn@opencascade.com>
Wed, 12 Sep 2018 14:43:09 +0000
(17:43 +0300)
src/HYDROData/HYDROData_BCPolygon.h
patch
|
blob
|
history
src/HYDROData/HYDROData_CalculationCase.h
patch
|
blob
|
history
src/HYDROData/HYDROData_Entity.cxx
patch
|
blob
|
history
src/HYDRO_tests/ExternalFiles.cmake
patch
|
blob
|
history
diff --git
a/src/HYDROData/HYDROData_BCPolygon.h
b/src/HYDROData/HYDROData_BCPolygon.h
index efaf01b9f410e2e7edc67a1cc51e2abf4dc75a61..3af4899207e2214fb540726a483e6b56b1f091ba 100644
(file)
--- a/
src/HYDROData/HYDROData_BCPolygon.h
+++ b/
src/HYDROData/HYDROData_BCPolygon.h
@@
-114,14
+114,6
@@
public:
HYDRODATA_EXPORT void SetBoundaryType( int ) const;
HYDRODATA_EXPORT void SetBoundaryType( int ) const;
-
-private:
-
- /**
- * Create all necessary child group objects.
- */
- //HYDRODATA_EXPORT void createGroupObjects();
-
protected:
friend class HYDROData_Iterator;
protected:
friend class HYDROData_Iterator;
diff --git
a/src/HYDROData/HYDROData_CalculationCase.h
b/src/HYDROData/HYDROData_CalculationCase.h
index f5aefb1b935564b2d89f44c284beec8fe9f84cde..74a128e0988751fe2f468b877ff8e50b1a70cadf 100644
(file)
--- 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_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
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_LandCoverRegion_Obsolete, ///< reference land cover regions
DataTag_LandCoverMap, ///< reference to land cover map
+ DataTag_BCPolygon ///< reference boundary polygons
};
public:
};
public:
diff --git
a/src/HYDROData/HYDROData_Entity.cxx
b/src/HYDROData/HYDROData_Entity.cxx
index 94c4921a78dc8e04e42db0b1440bd7abba083a6e..a39e125b465d7ffd894dc2c959cb3cf8d33a04d3 100644
(file)
--- 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:
case KIND_DTM:
return "DTM";
case KIND_BC_POLYGON:
- return "Boundary
Polygon";
+ return "Boundary
_
Polygon";
}
return "";
}
}
return "";
}
diff --git
a/src/HYDRO_tests/ExternalFiles.cmake
b/src/HYDRO_tests/ExternalFiles.cmake
index 2b207f3c03f9757f15bb402d02f7bf09a26857e5..b71f3d1e6f7ba781ab57e4585efc4ae3fb6ad3e5 100644
(file)
--- 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_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
../HYDROData/HYDROData_IPolyline.cxx
../HYDROData/HYDROData_Iterator.cxx
../HYDROData/HYDROData_Lambert93.cxx