Feature/new formatting (#547)

* Change to new logging format (closes #542)
 * Adds a screenshots folder that uses the application startup time
 * Creating focus nodes for VRT files if the info files contain location information
 * Fix issue with removing virtual properties
 * Add a method for returning the cartesian coordinates for a geolocation on a planet
This commit is contained in:
Alexander Bock
2018-03-07 18:10:32 -05:00
committed by GitHub
parent 4675554471
commit a3c849843f
131 changed files with 1229 additions and 751 deletions
+14 -13
View File
@@ -46,6 +46,7 @@
#endif
#include <cmath>
#include <ghoul/fmt.h>
#include <functional>
#include <fstream>
@@ -256,18 +257,18 @@ TouchInteraction::TouchInteraction()
_origin.onChange([this]() {
SceneGraphNode* node = sceneGraphNode(_origin.value());
if (!node) {
LWARNING(
"Could not find a node in scenegraph called '" << _origin.value() << "'"
);
return;
if (node) {
setFocusNode(node);
}
else {
LWARNING(fmt::format(
"Could not find a node in scenegraph called '{}'", _origin.value()
));
}
setFocusNode(node);
});
levmarq_init(&_lmstat);
_time.initSession();
}
@@ -319,12 +320,12 @@ bool TouchInteraction::guiMode(const std::vector<TuioCursor>& list) {
_guiON = !_guiON;
module.gui.setEnabled(_guiON);
std::string mode = (_guiON) ? "" : "de";
LINFO(
"GUI mode is " << mode << "activated. Inside box by: (" <<
static_cast<int>(100 * (pos.x / _guiButton.value().x)) << "%, " <<
static_cast<int>(100 * (pos.y / _guiButton.value().y)) << "%)\n"
);
LINFO(fmt::format(
"GUI mode is {}. Inside box by: ({}%, {}%)",
_guiON ? "activated" : "deactivated",
static_cast<int>(100 * (pos.x / _guiButton.value().x)),
static_cast<int>(100 * (pos.y / _guiButton.value().y))
));
}
else if (_guiON) {
module.touchInput = { _guiON, pos, 1 }; // emulate touch input as a mouse
-1
View File
@@ -25,7 +25,6 @@
#include <modules/touch/include/tuioear.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/settingsengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/interaction/navigationhandler.h>
#include <openspace/rendering/renderengine.h>
-1
View File
@@ -25,7 +25,6 @@
#include <modules/touch/touchmodule.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/settingsengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/interaction/navigationhandler.h>
#include <openspace/rendering/renderengine.h>