Skip to content
Permalink
Browse files

Merge of changes from analysis branch

git-svn-id: http://svn.osgeo.org/qgis/trunk@11552 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent
mhugent committed Sep 5, 2009
1 parent 25d260a commit 9fdde26a82bd0f086c532289b34a8e49b437adaf
Showing with 7,539 additions and 5 deletions.
  1. +3 −0 CMakeLists.txt
  2. +1 −1 src/CMakeLists.txt
  3. +92 −0 src/analysis/CMakeLists.txt
  4. +3,189 −0 src/analysis/interpolation/DualEdgeTriangulation.cc
  5. +231 −0 src/analysis/interpolation/DualEdgeTriangulation.h
  6. +3 −0 src/analysis/interpolation/HalfEdge.cc
  7. +126 −0 src/analysis/interpolation/HalfEdge.h
  8. +139 −0 src/analysis/interpolation/LinTriangleInterpolator.cc
  9. +83 −0 src/analysis/interpolation/LinTriangleInterpolator.h
  10. +89 −0 src/analysis/interpolation/Line3D.cc
  11. +84 −0 src/analysis/interpolation/Line3D.h
  12. +878 −0 src/analysis/interpolation/MathUtils.cc
  13. +84 −0 src/analysis/interpolation/MathUtils.h
  14. +64 −0 src/analysis/interpolation/Node.cc
  15. +76 −0 src/analysis/interpolation/Node.h
  16. +53 −0 src/analysis/interpolation/Point3D.cc
  17. +108 −0 src/analysis/interpolation/Point3D.h
  18. +3 −0 src/analysis/interpolation/TriangleInterpolator.cc
  19. +42 −0 src/analysis/interpolation/TriangleInterpolator.h
  20. +3 −0 src/analysis/interpolation/Triangulation.cc
  21. +98 −0 src/analysis/interpolation/Triangulation.h
  22. +48 −0 src/analysis/interpolation/Vector3D.cc
  23. +149 −0 src/analysis/interpolation/Vector3D.h
  24. +119 −0 src/analysis/interpolation/qgsgridfilewriter.cpp
  25. +56 −0 src/analysis/interpolation/qgsgridfilewriter.h
  26. +67 −0 src/analysis/interpolation/qgsidwinterpolator.cpp
  27. +48 −0 src/analysis/interpolation/qgsidwinterpolator.h
  28. +369 −0 src/analysis/interpolation/qgsinterpolator.cpp
  29. +94 −0 src/analysis/interpolation/qgsinterpolator.h
  30. +79 −0 src/analysis/interpolation/qgstininterpolator.cpp
  31. +48 −0 src/analysis/interpolation/qgstininterpolator.h
  32. +601 −0 src/analysis/vector/qgsgeometryanalyzer.cpp
  33. +117 −0 src/analysis/vector/qgsgeometryanalyzer.h
  34. +1 −0 tests/src/CMakeLists.txt
  35. +111 −0 tests/src/analysis/CMakeLists.txt
  36. +139 −0 tests/src/analysis/testqgsvectoranalyzer.cpp
  37. +44 −4 tests/src/core/testqgsgeometry.cpp
  38. BIN tests/testdata/expected_geometry_simplifyCheck1.png
@@ -282,16 +282,19 @@ IF (WIN32)
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
ENDIF (MSVC)
ELSE (WIN32)
# other compilers don't use that MSVC construct
ADD_DEFINITIONS(-DCORE_EXPORT=)
ADD_DEFINITIONS(-DGUI_EXPORT=)
ADD_DEFINITIONS(-DPYTHON_EXPORT=)
ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
ENDIF (WIN32)

#############################################################
@@ -1,5 +1,5 @@

SUBDIRS(core ui gui app providers plugins helpviewer)
SUBDIRS(core analysis ui gui app providers plugins helpviewer)

IF (HAVE_PYTHON AND WITH_BINDINGS)
SUBDIRS(python)
@@ -0,0 +1,92 @@


#############################################################
# sources

SET(QGIS_ANALYSIS_SRCS
interpolation/qgsgridfilewriter.cpp
interpolation/qgsidwinterpolator.cpp
interpolation/qgsinterpolator.cpp
interpolation/qgstininterpolator.cpp
interpolation/DualEdgeTriangulation.cc
interpolation/HalfEdge.cc
interpolation/Line3D.cc
interpolation/LinTriangleInterpolator.cc
interpolation/MathUtils.cc
interpolation/Node.cc
interpolation/Point3D.cc
interpolation/TriangleInterpolator.cc
interpolation/Triangulation.cc
interpolation/Vector3D.cc
vector/qgsgeometryanalyzer.cpp
)

SET(QGIS_ANALYSIS_MOC_HDRS
)

QT4_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})


INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core/
interpolation
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)

IF (WIN32)
IF (MSVC)
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllexport)")
ELSE (MSVC)
ADD_DEFINITIONS("-UANALYSIS_EXPORT \"-DANALYSIS_EXPORT=__declspec(dllexport)\"")
ENDIF (MSVC)
ENDIF (WIN32)


#############################################################
# qgis_analysis library

ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} )

ADD_DEPENDENCIES(qgis_analysis core)

SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})


# because of htonl
IF (WIN32)
SET(PLATFORM_LIBRARIES wsock32)
IF (MSVC)
#needed for linking to gdal which needs odbc
SET(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} odbc32 odbccp32)
ENDIF (MSVC)
ENDIF (WIN32)

TARGET_LINK_LIBRARIES(qgis_analysis
qgis_core
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTMAIN_LIBRARY}
${PROJ_LIBRARY}
${GEOS_LIBRARY}
${GDAL_LIBRARY}
${PLATFORM_LIBRARIES}
)

INSTALL(TARGETS qgis_analysis
RUNTIME DESTINATION ${QGIS_BIN_DIR}
LIBRARY DESTINATION ${QGIS_LIB_DIR}
ARCHIVE DESTINATION ${QGIS_LIB_DIR})


# Added by Tim to install headers

SET(QGIS_ANALYSIS_HDRS
)

INSTALL(CODE "MESSAGE(\"Installing ANALYSIS headers...\")")
INSTALL(FILES ${QGIS_ANALYSIS_HDRS} ${QGIS_ANALYSIS_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})

0 comments on commit 9fdde26

Please sign in to comment.
You can’t perform that action at this time.