mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary includes from dataprocessor

Browse Source
This commit is contained in:
Michael Nilsson
2016-06-16 16:56:30 -04:00
parent 35c3d3ce8b
commit f9411385d6
4 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/iswa/util/dataprocessor.cpp
View File

@@ -25,21 +25,9 @@
#include <openspace/util/histogram.h>
#include <fstream>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/textureunit.h>
#include <openspace/scene/scene.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/util/spicemanager.h>
#include <ghoul/filesystem/filesystem.h>
#include <modules/iswa/util/iswamanager.h>
#include <modules/iswa/ext/json/json.hpp>
namespace {
const std::string _loggerCat = "DataProcessor";
using json = nlohmann::json;
}
namespace openspace {

4
modules/iswa/util/dataprocessor.h
View File

@@ -25,11 +25,9 @@
#ifndef __DATAPROCESSOR_H__
#define __DATAPROCESSOR_H__
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/scalarproperty.h>
#include <openspace/properties/selectionproperty.h>
#include <ghoul/glm.h>
#include <ghoul/opengl/texture.h>
#include <glm/gtx/std_based_type.hpp>
#include <set>
#include <openspace/util/histogram.h>

2
modules/iswa/util/dataprocessorkameleon.cpp
View File

@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/iswa/util/dataprocessorkameleon.h>
#include <algorithm>
//#include <algorithm>
#include <ghoul/filesystem/filesystem.h>
namespace {

9
modules/iswa/util/dataprocessortext.cpp
View File

@@ -22,8 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/iswa/util/dataprocessortext.h>
#include <algorithm>
#include <iterator>
//#include <algorithm>
//#include <boost/iostreams/device/mapped_file.hpp>
//
//#include <boost/config/warning_disable.hpp>
@@ -159,13 +158,13 @@ std::vector<float*> DataProcessorText::processData(std::string data, properties:
int first, last, option, lineSize;
std::vector<float*> dataOptions(numOptions, nullptr);
for(int option : selectedOptions){
for (int option : selectedOptions) {
dataOptions[option] = new float[dimensions.x*dimensions.y]{0.0f};
}
int numValues = 0;
while(getline(memorystream, line)){
if(line.find("#") == 0) continue;
while (getline(memorystream, line)) {
if (line.find("#") == 0) continue;
// ----------- OLD METHODS ------------------------