Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

include/openspace/util/histogram.h

@@ -82,7 +82,7 @@ public:
 
     void changeRange(float minValue, float maxValue);
 
-    friend std::ostream& operator<<(std::ostream& os, const Histogram& hist);
+    friend void operator<<(std::ostream& os, const Histogram& hist);
 private:
     int _numBins;
     float _minValue;

modules/iswa/rendering/datasphere.cpp

@@ -30,6 +30,11 @@
 
 #include <modules/onscreengui/include/gui.h>
 
+#ifdef WIN32        
+#define _USE_MATH_DEFINES
+#include <math.h>
+#endif
+
 namespace {
     const std::string _loggerCat = "DataSphere";
 }

modules/iswa/rendering/iswadatagroup.cpp

@@ -2,7 +2,7 @@
 *                                                                                       *
 * OpenSpace                                                                             *
 *                                                                                       *
-* Copyright (c) 2014-2015                                                               *
+* 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 *

modules/iswa/rendering/iswadatagroup.h

@@ -27,6 +27,7 @@
 #include <openspace/properties/vectorproperty.h>
 #include <openspace/properties/selectionproperty.h>
 #include <openspace/properties/stringproperty.h>
+#include <ghoul/misc/dictionary.h>
 
 namespace openspace{
 class IswaDataGroup : public IswaBaseGroup{

modules/iswa/util/iswamanager.cpp

@@ -51,7 +51,7 @@
 namespace {
     using json = nlohmann::json;
     const std::string _loggerCat = "IswaManager";
-    std::string baseUrl = "https://iswa-demo-server.herokuapp.com/";
+    std::string baseUrl = "http://iswa-demo-server.herokuapp.com/";
     //const std::string baseUrl = "http://128.183.168.116:3000/";
 }
 

scripts/bind_keys.lua

@@ -17,7 +17,7 @@ openspace.bindKey("x", helper.renderable.toggle('Constellation Bounds'))
 
 openspace.bindKey("c", "openspace.parallel.setAddress('130.236.142.51');openspace.parallel.setPassword('newhorizons-20150714');openspace.parallel.connect();")
 
-openspace.bindKey("h", "openspace.iswa.setBaseUrl('https://iswa-demo-server.herokuapp.com/')");
+openspace.bindKey("h", "openspace.iswa.setBaseUrl('http://iswa-demo-server.herokuapp.com/')");
 openspace.bindKey("g", "openspace.iswa.setBaseUrl('http://128.183.168.116:3000/')");
 openspace.bindKey("l", "openspace.iswa.setBaseUrl('http://localhost:3000/')");
 

src/util/histogram.cpp

@@ -356,7 +356,7 @@ float Histogram::binWidth(){
     return (_maxValue-_minValue)/float(_numBins);
 }
 
-std::ostream& operator<<(std::ostream& os, const Histogram& hist){
+void operator<<(std::ostream& os, const Histogram& hist){
     const float* data = hist.data();
     float max = hist.maxValue();
     float min = hist.minValue();