mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

windows fix

Browse Source
This commit is contained in:
Michael Nilsson
2016-06-21 11:21:37 -04:00
parent 8f0c8e422b
commit 122f44384b
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/util/histogram.h
View File

@@ -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;

5
modules/iswa/rendering/datasphere.cpp
View File

@@ -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";
}

2
modules/iswa/rendering/iswadatagroup.cpp
View File

@@ -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 *

1
modules/iswa/rendering/iswadatagroup.h
View File

@@ -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{

2
src/util/histogram.cpp
View File

@@ -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();