From 418b38da8a901751f9a6468575e71def86b49d8c Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 16 Jan 2015 13:00:40 +0100
Subject: [PATCH] [GL] Using MathLib.:MathPoint as base of Point.
Conflicts:
GeoLib/Point.h
---
GeoLib/Point.h | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/GeoLib/Point.h b/GeoLib/Point.h
index bf65a82d20b..056a52b94f0 100644
--- a/GeoLib/Point.h
+++ b/GeoLib/Point.h
@@ -22,7 +22,7 @@
#include "GeoObject.h"
// MathLib
-#include "MathLib/TemplatePoint.h"
+#include "MathLib/MathPoint.h"
namespace GeoLib
{
@@ -30,31 +30,29 @@ namespace GeoLib
* \ingroup GeoLib
*/
-template<typename T> class GeoPoint : public MathLib::TemplatePoint<T>, public GeoLib::GeoObject
+class Point : public MathLib::MathPoint, public GeoLib::GeoObject
{
public:
- GeoPoint(T x1, T x2, T x3) :
- MathLib::TemplatePoint<T>(), GeoLib::GeoObject()
+ Point(double x1, double x2, double x3) :
+ MathLib::MathPoint(), GeoLib::GeoObject()
{
this->_x[0] = x1;
this->_x[1] = x2;
this->_x[2] = x3;
}
- GeoPoint() :
- MathLib::TemplatePoint<T>(), GeoLib::GeoObject()
+ Point() :
+ MathLib::MathPoint(), GeoLib::GeoObject()
{}
- GeoPoint (T const* x) :
- MathLib::TemplatePoint<T>(x), GeoObject()
+ Point (double const* x) :
+ MathLib::MathPoint(x), GeoLib::GeoObject()
{}
/// return a geometry type
virtual GEOTYPE getGeoType() const {return GEOTYPE::POINT;}
};
-typedef GeoLib::GeoPoint<double> Point;
-
static const Point ORIGIN(0, 0, 0);
/**
--
GitLab