From 67af024c8cc0b69db70a624438279ccc0180c1f7 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 17 Jul 2015 18:26:47 +0200
Subject: [PATCH] [DE] Move Color class into DataExplorer tree.
---
Applications/DataExplorer/Base/CMakeLists.txt | 1 +
{GeoLib => Applications/DataExplorer/Base}/Color.cpp | 6 +++---
{GeoLib => Applications/DataExplorer/Base}/Color.h | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
rename {GeoLib => Applications/DataExplorer/Base}/Color.cpp (97%)
rename {GeoLib => Applications/DataExplorer/Base}/Color.h (97%)
diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
index a86ef47ce4d..caa0c4c0b5b 100644
--- a/Applications/DataExplorer/Base/CMakeLists.txt
+++ b/Applications/DataExplorer/Base/CMakeLists.txt
@@ -10,6 +10,7 @@ set(SOURCES
# modeltest.cpp # Not needed
CheckboxDelegate.cpp
QValueTooltipSlider.cpp
+ Color.cpp
)
# Moc headers
diff --git a/GeoLib/Color.cpp b/Applications/DataExplorer/Base/Color.cpp
similarity index 97%
rename from GeoLib/Color.cpp
rename to Applications/DataExplorer/Base/Color.cpp
index a3319f01534..6aa80d13731 100644
--- a/GeoLib/Color.cpp
+++ b/Applications/DataExplorer/Base/Color.cpp
@@ -12,14 +12,14 @@
*
*/
-#include <iostream>
+#include "Color.h"
+
#include <fstream>
#include <sstream>
#include <logog/include/logog.hpp>
-#include "Color.h"
-#include "StringTools.h"
+#include "BaseLib/StringTools.h"
namespace GeoLib {
diff --git a/GeoLib/Color.h b/Applications/DataExplorer/Base/Color.h
similarity index 97%
rename from GeoLib/Color.h
rename to Applications/DataExplorer/Base/Color.h
index 6a7ef328264..edeabf67e85 100644
--- a/GeoLib/Color.h
+++ b/Applications/DataExplorer/Base/Color.h
@@ -16,11 +16,11 @@
#ifndef COLOR_H_
#define COLOR_H_
-#include "TemplatePoint.h"
-
#include <map>
#include <string>
+#include "MathLib/TemplatePoint.h"
+
namespace GeoLib
{
typedef MathLib::TemplatePoint<unsigned char> Color;
--
GitLab