From 67b73de3c55a81d4124803f6f8e71fbf928ff061 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 16 Jan 2015 14:46:03 +0100
Subject: [PATCH] [GL] Using MathPoint instead of Point in Raster.
---
GeoLib/Raster.cpp | 6 +++---
GeoLib/Raster.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/GeoLib/Raster.cpp b/GeoLib/Raster.cpp
index b476fe19862..fc4270de567 100644
--- a/GeoLib/Raster.cpp
+++ b/GeoLib/Raster.cpp
@@ -101,7 +101,7 @@ Raster* Raster::getRasterFromSurface(Surface const& sfc, double cell_size, doubl
return new Raster(n_cols, n_rows, ll[0], ll[1], cell_size, z_vals, z_vals+n_cols*n_rows ,-9999);
}
-double Raster::getValueAtPoint(const GeoLib::Point &pnt) const
+double Raster::getValueAtPoint(const MathLib::MathPoint &pnt) const
{
if (pnt[0]>=_ll_pnt[0] && pnt[0]<(_ll_pnt[0]+(_cell_size*_n_cols)) &&
pnt[1]>=_ll_pnt[1] && pnt[1]<(_ll_pnt[1]+(_cell_size*_n_rows)))
@@ -119,7 +119,7 @@ double Raster::getValueAtPoint(const GeoLib::Point &pnt) const
return _no_data_val;
}
-double Raster::interpolateValueAtPoint(GeoLib::Point const& pnt) const
+double Raster::interpolateValueAtPoint(MathLib::MathPoint const& pnt) const
{
// position in raster
double const xPos ((pnt[0] - _ll_pnt[0]) / _cell_size);
@@ -167,7 +167,7 @@ double Raster::interpolateValueAtPoint(GeoLib::Point const& pnt) const
return MathLib::scalarProduct<double,4>(weight.data(), pix_val.data());
}
-bool Raster::isPntOnRaster(GeoLib::Point const& pnt) const
+bool Raster::isPntOnRaster(MathLib::MathPoint const& pnt) const
{
if ((pnt[0]<_ll_pnt[0]) || (pnt[0]>_ll_pnt[0]+(_n_cols*_cell_size)) ||
(pnt[1]<_ll_pnt[1]) || (pnt[1]>_ll_pnt[1]+(_n_rows*_cell_size)))
diff --git a/GeoLib/Raster.h b/GeoLib/Raster.h
index 47986d5461b..1199f7b81f0 100644
--- a/GeoLib/Raster.h
+++ b/GeoLib/Raster.h
@@ -99,13 +99,13 @@ public:
/**
* Returns the raster value at the position of the given point.
*/
- double getValueAtPoint(const GeoLib::Point &pnt) const;
+ double getValueAtPoint(const MathLib::MathPoint &pnt) const;
/// Interpolates the elevation of the given point based on the 8-neighbourhood of the raster cell it is located on
- double interpolateValueAtPoint(const GeoLib::Point &pnt) const;
+ double interpolateValueAtPoint(const MathLib::MathPoint &pnt) const;
/// Checks if the given point is located within the (x,y)-extension of the raster.
- bool isPntOnRaster(GeoLib::Point const& node) const;
+ bool isPntOnRaster(MathLib::MathPoint const& node) const;
~Raster();
--
GitLab