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

actually fix thread blocking issue + changeRange fix in Histogram + unused function cleanup

Browse Source
This commit is contained in:
Michael Nilsson
2016-06-29 16:52:04 -04:00
parent 636fdf2394
commit eb4e2bb08a
6 changed files with 65 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/openspace/engine/downloadmanager.h
View File

@@ -68,6 +68,8 @@ public:
bool corrupted;
};
using MemoryFileFuture = std::future<DownloadManager::MemoryFile>;
using DownloadProgressCallback = std::function<void(const FileFuture&)>;
using DownloadFinishedCallback = std::function<void(const FileFuture&)>;
@@ -95,8 +97,7 @@ public:
);
/**
* Downloads a file to memory. This is done in a separate thread if the
* returned future object is kept alive.
* Downloads a file to memory. This is done in a separate thread.
*
* @param url the url you want to request a file from
* @param successCallback optional callback that will be called when download is complete
@@ -119,9 +120,6 @@ public:
bool overrideFiles, AsyncDownloadFinishedCallback callback
);
void getFileExtension(const std::string& url,
RequestFinishedCallback finishedCallback = RequestFinishedCallback());
private:
std::vector<std::string> _requestURL;
int _applicationVersion;

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

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2015 *
* Copyright (c) 2015-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 *
@@ -95,8 +95,8 @@ public:
/**
* Sets a bin to a certain value directly. This method is similar
* to add(float value, float repeat) but does the normalize the bin.
* Instead it access the bin value directly. It also changes the bin value
* to add(float value, float repeat) but does not normalize the bin.
* Instead it access the bin value directly. It also replaces the bin value
* instead of just adding upon it.
*
* @param bin The bin you want to change the value of