Solve merge conflicts.

include/openspace/util/histogram.h

@@ -33,19 +33,29 @@ class Histogram {
 
 public:
     Histogram();
-    Histogram(float minBin, float maxBin, int numBins);
-    Histogram(float minBin, float maxBin, int numBins, float *data);
+    Histogram(float minValue, float maxValue, int numBins);
+    Histogram(float minValue, float maxValue, int numBins, float *data);
     Histogram(Histogram&& other);
     ~Histogram();
 
     Histogram& operator=(Histogram&& other);
 
     int numBins() const;
-    float minBin() const;
-    float maxBin() const;
+    float minValue() const;
+    float maxValue() const;
     bool isValid() const;
 
-    bool add(float bin, float value);
+    /**
+     * Enter value into the histogram. The add method takes the given
+     * value, works out which bin this corresponds to, and increments
+     * this bin by 'repeat'.
+     * 
+     * @param value The Value to insert into the histogram
+     * @param repeat How many times you want to insert it
+     * 
+     * @return Returns true if succesful insertion, otherwise return false
+     */
+    bool add(float value, float repeat = 1.0f);
     bool add(const Histogram& histogram);
     bool addRectangle(float lowBin, float highBin, float value);
 
@@ -56,13 +66,25 @@ public:
 
     void normalize();
     void print() const;
+    void generateEqualizer();
+    Histogram equalize();
+    float equalize (float);
+    float entropy();
+
+    float highestBinValue(bool equalized);
+    float binWidth();
+
+    void changeRange(float minValue, float maxValue);
 
 private:
     int _numBins;
-    float _minBin;
-    float _maxBin;
+    float _minValue;
+    float _maxValue;
+
 
     float* _data;
+    std::vector<float> _equalizer;
+    int _numValues;
 
 }; // class Histogram
 }  // namespace openspace

include/openspace/util/screenlog.h

@@ -22,6 +22,9 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#ifndef __SCREENLOG_H__
+#define __SCREENLOG_H__
+
 #include <ghoul/logging/log.h>
 
 #include <chrono>
@@ -110,4 +113,6 @@ private:
     LogLevel _logLevel;
 };
     
-} // namespace openspace
+} // namespace openspace
+
+#endif // __SCREENLOG_H__

include/openspace/util/transformationmanager.h

@@ -0,0 +1,62 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2016                                                               *
+*                                                                                       *
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+* software and associated documentation files (the "Software"), to deal in the Software *
+* without restriction, including without limitation the rights to use, copy, modify,    *
+* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+* permit persons to whom the Software is furnished to do so, subject to the following   *
+* conditions:                                                                           *
+*                                                                                       *
+* The above copyright notice and this permission notice shall be included in all copies *
+* or substantial portions of the Software.                                              *
+*                                                                                       *
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+****************************************************************************************/
+
+#ifndef __TRANSFORMATIONMANAGER__
+#define __TRANSFORMATIONMANAGER__
+
+#include <ghoul/designpattern/singleton.h>
+#include <ghoul/glm.h>
+#ifdef OPENSPACE_MODULE_KAMELEON_ENABLED
+#include <ccmc/Kameleon.h>
+#endif
+
+#include <set>
+
+namespace ccmc {
+    class Kameleon;
+} // namespace ccmc
+
+namespace openspace {
+#ifdef OPENSPACE_MODULE_KAMELEON_ENABLED
+#endif
+class TransformationManager : public ghoul::Singleton<TransformationManager> {
+	friend class ghoul::Singleton<TransformationManager>;
+
+public:
+	TransformationManager();
+	~TransformationManager();
+
+	glm::dmat3 frameTransformationMatrix(std::string from, std::string to, double ephemerisTime) const;
+
+private:
+#ifdef OPENSPACE_MODULE_KAMELEON_ENABLED
+    std::shared_ptr<ccmc::Kameleon> _kameleon;
+#endif
+    std::set<std::string> _kameleonFrames;
+    std::set<std::string> _dipoleFrames;
+};
+
+}
+
+ #endif //__TRANSFORMATIONMANAGER__