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

Feature/webgui ops (#723)

Browse Source 
* Update node packages, download nodejs in build process, start server from openspace process
  * Patch CEF cmake automatically
  * Build webserver automatically
  * Work on CMake for WebBrowser, Webgui and CefWebGui
  * Map key modifiers to CEF
  * Smooth time interpolation in webgui
  * Automatically focus on search field in filter lists
  * Move webgui code to external repositories
  * Use asset system to distribute webgui
  * Remove webgui from main repository
  * Add support for right click in webgui and improve timetopic
  * Resolve cmake policy warning
  * Add relative time interpolation to lua interface
  * Sanitize json error message before logging error. Workaround for #736
  * Added gui properties to scene graph nodes
  * Add version topic
  * Add shortcuttopic
  * Add ability to disable rendering of cefwebgui
  * Don't do message loop work if there is no browser.
  * Set correct path to nodejs on unix
  * Message loop work in presync
  * modifications for shortcuts in gui, added names for shortcuts
  * Set properties via lua scripts
  * Allow gui grouping for shortcuts
  * Add gui paths keybindings
  * Blocking keyboard callbacks when webgui has keyboard focus in an editable field
  * Allow disabling of WebBrowser and CefWebGui
  * Make it possible to hide GUI
  * Get rid of redundant dashboard items if web gui is used
  * Hide WebGUI on slave nodes
  * Hide WebGUI on main rendering window if a GUI window exists
 * Enable WebGUI on default unless it is overwritten in the openspace.cfg
  * Add guiName for propery owners in socket api
This commit is contained in:
Emil Axelsson
2018-11-05 20:45:38 -05:00
committed by Alexander Bock
parent ec67169854
commit 7181de4673
286 changed files with 2546 additions and 18165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -25,62 +25,141 @@
#include <modules/webbrowser/webbrowsermodule.h>
#include "cefwebguimodule.h"
#include <openspace/engine/configuration.h>
#include <openspace/engine/globals.h>
#include <openspace/engine/globalscallbacks.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/engine/windowdelegate.h>
#include <modules/webbrowser/include/browserinstance.h>
#include <modules/cefwebgui/include/guirenderhandler.h>
#include <modules/cefwebgui/include/guikeyboardhandler.h>
#include <ghoul/misc/dictionary.h>
#include <ghoul/fmt.h>
#include <ghoul/logging/logmanager.h>
namespace {
constexpr const char* _loggerCat = "CefWebGui";
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"This setting determines whether the browser should be enabled or not."
};
constexpr openspace::properties::Property::PropertyInfo VisibleInfo = {
"Visible",
"Is Visible",
"This setting determines whether the browser should be visible or not."
};
constexpr openspace::properties::Property::PropertyInfo GuiUrlInfo = {
"GuiUrl",
"GUI URL",
"The URL to load the Web GUI from"
};
} // namespace
namespace openspace {
CefWebGuiModule::CefWebGuiModule()
: OpenSpaceModule(CefWebGuiModule::Name)
{}
, _cefWebGuiEnabled(EnabledInfo, true)
, _cefWebGuiVisible(VisibleInfo, true)
, _guiUrl(GuiUrlInfo, "")
{
addProperty(_cefWebGuiEnabled);
addProperty(_cefWebGuiVisible);
addProperty(_guiUrl);
}
void CefWebGuiModule::startOrStopGui() {
WebBrowserModule* webBrowserModule =
global::moduleEngine.module<WebBrowserModule>();
const bool isGuiWindow =
global::windowDelegate.hasGuiWindow() ?
global::windowDelegate.isGuiWindow() :
true;
const bool isMaster = global::windowDelegate.isMaster();
void CefWebGuiModule::internalInitialize(const ghoul::Dictionary&) {
_guiInstance = std::make_shared<BrowserInstance>(new GUIRenderHandler);
_guiLocation = OsEng.configuration().cefWebGuiUrl;
global::callback::initialize.push_back([this]() {
LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _guiLocation));
_guiInstance->loadUrl(_guiLocation);
WebBrowserModule* webBrowserModule =
OsEng.moduleEngine().module<WebBrowserModule>();
if (webBrowserModule) {
webBrowserModule->attachEventHandler(_guiInstance);
webBrowserModule->addBrowser(_guiInstance);
if (_cefWebGuiEnabled && isGuiWindow && isMaster) {
LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _guiUrl));
if (!_guiInstance) {
_guiInstance = std::make_shared<BrowserInstance>(
new GUIRenderHandler,
new GUIKeyboardHandler
);
_guiInstance->loadUrl(_guiUrl);
}
});
global::callback::render.push_back([this](){
WindowWrapper& wrapper = OsEng.windowWrapper();
if (wrapper.isMaster()) {
if (wrapper.windowHasResized()) {
_guiInstance->reshape(wrapper.currentWindowSize());
}
_guiInstance->draw();
}
});
global::callback::deinitialize.push_back()[this]() {
webBrowserModule->attachEventHandler(_guiInstance);
webBrowserModule->addBrowser(_guiInstance);
} else if (_guiInstance) {
_guiInstance->close(true);
WebBrowserModule* webBrowserModule =
OsEng.moduleEngine().module<WebBrowserModule>();
if (webBrowserModule) {
webBrowserModule->removeBrowser(_guiInstance);
}
webBrowserModule->removeBrowser(_guiInstance);
webBrowserModule->detachEventHandler();
_guiInstance.reset();
}
}
void CefWebGuiModule::updateUrl() {
if (_guiInstance) {
_guiInstance->loadUrl(_guiUrl);
}
}
void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
WebBrowserModule* webBrowserModule =
global::moduleEngine.module<WebBrowserModule>();
_webBrowserIsAvailable = webBrowserModule && webBrowserModule->isEnabled();
if (!_webBrowserIsAvailable) {
return;
}
_cefWebGuiEnabled.onChange([this]() {
startOrStopGui();
});
_guiUrl.onChange([this]() {
updateUrl();
});
_guiUrl = configuration.value<std::string>(GuiUrlInfo.identifier);
_cefWebGuiEnabled = _webBrowserIsAvailable &&
configuration.hasValue<bool>(EnabledInfo.identifier) &&
configuration.value<bool>(EnabledInfo.identifier);
_cefWebGuiVisible = _webBrowserIsAvailable &&
configuration.hasValue<bool>(VisibleInfo.identifier) &&
configuration.value<bool>(VisibleInfo.identifier);
global::callback::initializeGL.push_back([this]() {
startOrStopGui();
});
global::callback::draw2D.push_back([this](){
const bool isGuiWindow =
global::windowDelegate.hasGuiWindow() ?
global::windowDelegate.isGuiWindow() :
true;
const bool isMaster = global::windowDelegate.isMaster();
if (isGuiWindow && isMaster && _guiInstance) {
if (global::windowDelegate.windowHasResized()) {
_guiInstance->reshape(global::windowDelegate.currentWindowSize());
}
if (_cefWebGuiVisible) {
_guiInstance->draw();
}
}
});
global::callback::deinitializeGL.push_back([this]() {
_cefWebGuiEnabled = false;
startOrStopGui();
});
}