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

Various small fixes

Browse Source
This commit is contained in:
Alexander Bock
2018-11-06 15:04:19 -05:00
parent 7c0268e87c
commit f8c27629f5
23 changed files with 174 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/webgui/webguimodule.cpp
View File

@@ -58,34 +58,34 @@ namespace openspace {
WebGuiModule::WebGuiModule()
: OpenSpaceModule(WebGuiModule::Name)
, _serverProcessEnabled(ServerProcessEnabledInfo, false)
, _serverProcessEntryPoint(ServerProcessEntryPointInfo)
, _serverProcessWorkingDirectory(ServerProcessWorkingDirectoryInfo)
, _enabled(ServerProcessEnabledInfo, false)
, _entryPoint(ServerProcessEntryPointInfo)
, _workingDirectory(ServerProcessWorkingDirectoryInfo)
{
addProperty(_serverProcessEnabled);
addProperty(_serverProcessEntryPoint);
addProperty(_serverProcessWorkingDirectory);
addProperty(_enabled);
addProperty(_entryPoint);
addProperty(_workingDirectory);
}
void WebGuiModule::internalInitialize(const ghoul::Dictionary&) {
const std::function<void()> startOrStop = [this]() {
if (_serverProcessEnabled) {
auto startOrStop = [this]() {
if (_enabled) {
startProcess();
} else {
stopProcess();
}
};
const std::function<void()> restartIfEnabled = [this]() {
auto restartIfEnabled = [this]() {
stopProcess();
if (_serverProcessEnabled) {
if (_enabled) {
startProcess();
}
};
_serverProcessEnabled.onChange(startOrStop);
_serverProcessEntryPoint.onChange(restartIfEnabled);
_serverProcessWorkingDirectory.onChange(restartIfEnabled);
_enabled.onChange(startOrStop);
_entryPoint.onChange(restartIfEnabled);
_workingDirectory.onChange(restartIfEnabled);
startOrStop();
}
@@ -97,8 +97,8 @@ void WebGuiModule::startProcess() {
#endif
_process = std::make_unique<ghoul::Process>(
"\"" + nodePath + "\" \"" + _serverProcessEntryPoint.value() + "\"",
_serverProcessWorkingDirectory.value(),
"\"" + nodePath + "\" \"" + _entryPoint.value() + "\"",
_workingDirectory.value(),
[](const char* data, size_t n) {
const std::string str(data, n);
LDEBUG(fmt::format("Web GUI server output: {}", str));