From 561e9d7f225691e2c5ccba2116444b358f70a679 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 21 Feb 2023 13:00:11 +0100 Subject: [PATCH] Provide GUI names for Property Owners --- modules/base/rendering/renderabletrail.cpp | 13 +++++-------- modules/globebrowsing/src/gdalwrapper.cpp | 2 +- modules/globebrowsing/src/memoryawaretilecache.cpp | 2 +- .../globebrowsing/src/tileprovider/tileprovider.cpp | 4 +++- modules/iswa/util/iswamanager.cpp | 2 +- .../util/projectioncomponent.cpp | 2 +- modules/touch/src/touchinteraction.cpp | 4 ++-- modules/touch/src/touchmarker.cpp | 2 +- modules/volume/transferfunctionhandler.cpp | 2 +- src/engine/openspaceengine.cpp | 2 +- src/interaction/interactionmonitor.cpp | 2 +- src/navigation/navigationhandler.cpp | 2 +- src/navigation/orbitalnavigator.cpp | 4 ++-- src/navigation/pathnavigator.cpp | 2 +- src/rendering/luaconsole.cpp | 2 +- src/rendering/renderengine.cpp | 2 +- src/scene/lightsource.cpp | 2 +- src/scene/timeframe.cpp | 2 +- src/util/timemanager.cpp | 2 +- 19 files changed, 27 insertions(+), 28 deletions(-) diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index 608709fb9c..40d3b3fe74 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -68,13 +68,6 @@ namespace { { "Points+Lines", RenderingModeLinesPoints } }; - static const openspace::properties::PropertyOwner::PropertyOwnerInfo AppearanceInfo = - { - "Appearance", - "Appearance", - "The appearance of the trail" - }; - constexpr openspace::properties::Property::PropertyInfo LineColorInfo = { "Color", "Color", @@ -162,7 +155,11 @@ documentation::Documentation RenderableTrail::Documentation() { } RenderableTrail::Appearance::Appearance() - : properties::PropertyOwner(AppearanceInfo) + : properties::PropertyOwner({ + "Appearance", + "Appearance", + "The appearance of the trail" + }) , lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f)) , useLineFade(EnableFadeInfo, true) , lineFade(FadeInfo, 1.f, 0.f, 30.f) diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp index 664f2bd59a..067eb535c8 100644 --- a/modules/globebrowsing/src/gdalwrapper.cpp +++ b/modules/globebrowsing/src/gdalwrapper.cpp @@ -89,7 +89,7 @@ bool GdalWrapper::logGdalErrors() const { } GdalWrapper::GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize) - : PropertyOwner({ "GdalWrapper" }) + : PropertyOwner({ "GdalWrapper", "Gdal Wrapper" }) , _logGdalErrors(LogGdalErrorInfo, false) , _gdalMaximumCacheSize( GdalMaximumCacheInfo, diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp index 24d7872aee..37af6a38e5 100644 --- a/modules/globebrowsing/src/memoryawaretilecache.cpp +++ b/modules/globebrowsing/src/memoryawaretilecache.cpp @@ -260,7 +260,7 @@ size_t MemoryAwareTileCache::TextureContainer::size() const { // MemoryAwareTileCache::MemoryAwareTileCache(int tileCacheSize) - : PropertyOwner({ "TileCache" }) + : PropertyOwner({ "TileCache", "Tile Cache" }) , _numTextureBytesAllocatedOnCPU(0) , _cpuAllocatedTileData(CpuAllocatedDataInfo, tileCacheSize, 128, 16384, 1) , _gpuAllocatedTileData(GpuAllocatedDataInfo, tileCacheSize, 128, 16384, 1) diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp index abdb8c77b2..4cc1ecb54a 100644 --- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp @@ -118,7 +118,9 @@ void TileProvider::deinitializeDefaultTile() { DefaultTileTexture = nullptr; } -TileProvider::TileProvider() : properties::PropertyOwner({ "TileProvider" }) {} +TileProvider::TileProvider() + : properties::PropertyOwner({ "TileProvider", "Tile Provider"}) +{} void TileProvider::initialize() { ZoneScoped diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index f5f8a720a1..d0532ac2f5 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -97,7 +97,7 @@ namespace openspace { IswaManager* IswaManager::_instance = nullptr; IswaManager::IswaManager() - : properties::PropertyOwner({ "IswaManager" }) + : properties::PropertyOwner({ "IswaManager", "Iswa Manager" }) , _baseUrl("https://iswa-demo-server.herokuapp.com/") { _type[CygnetType::Texture] = "Texture"; diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp index 0ead926521..d12e1d9aac 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.cpp +++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp @@ -166,7 +166,7 @@ documentation::Documentation ProjectionComponent::Documentation() { } ProjectionComponent::ProjectionComponent() - : properties::PropertyOwner({ "ProjectionComponent" }) + : properties::PropertyOwner({ "ProjectionComponent", "Projection Component" }) , _performProjection(ProjectionInfo, true) , _clearAllProjections(ClearProjectionInfo, false) , _projectionFading(FadingInfo, 1.f, 0.f, 1.f) diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 63fb656faa..2f6283bbe1 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -240,7 +240,7 @@ namespace { namespace openspace { TouchInteraction::TouchInteraction() - : properties::PropertyOwner({ "TouchInteraction" }) + : properties::PropertyOwner({ "TouchInteraction", "Touch Interaction" }) , _unitTest(UnitTestInfo, false) , _disableZoom(DisableZoomInfo, false) , _disableRoll(DisableRollInfo, false) @@ -1148,7 +1148,7 @@ double FrameTimeAverage::averageFrameTime() const { #ifdef TOUCH_DEBUG_PROPERTIES TouchInteraction::DebugProperties::DebugProperties() - : properties::PropertyOwner({ "TouchDebugProperties" }) + : properties::PropertyOwner({ "TouchDebugProperties", "Touch Debug Properties"}) , interactionMode( { "interactionMode", "Current interaction mode", "" }, "Unknown" diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp index 8d6329a4a8..cde53a73ad 100644 --- a/modules/touch/src/touchmarker.cpp +++ b/modules/touch/src/touchmarker.cpp @@ -67,7 +67,7 @@ namespace { namespace openspace { TouchMarker::TouchMarker() - : properties::PropertyOwner({ "TouchMarker" }) + : properties::PropertyOwner({ "TouchMarker", "Touch Marker" }) , _visible(VisibilityInfo, true) , _radiusSize(RadiusInfo, 30.f, 0.f, 100.f) , _opacity(OpacityInfo, 0.8f, 0.f, 1.f) diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp index 0e39e9de22..12878a6e83 100644 --- a/modules/volume/transferfunctionhandler.cpp +++ b/modules/volume/transferfunctionhandler.cpp @@ -63,7 +63,7 @@ namespace { namespace openspace::volume { TransferFunctionHandler::TransferFunctionHandler(const properties::StringProperty& prop) - : properties::PropertyOwner({ "TransferFunctionHandler" }) + : properties::PropertyOwner({ "TransferFunctionHandler", "Tranfer Function Handler" }) , _transferFunctionPath(prop) , _dataUnit(DataUnitInfo) , _minValue(MinValueInfo) diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 85d834ce86..c83585f4c5 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -147,7 +147,7 @@ namespace openspace { class Scene; OpenSpaceEngine::OpenSpaceEngine() - : properties::PropertyOwner({ "OpenSpaceEngine" }) + : properties::PropertyOwner({ "OpenSpaceEngine", "OpenSpace Engine" }) , _printEvents(PrintEventsInfo, false) , _visibility(VisibilityInfo) , _showHiddenSceneGraphNodes(ShowHiddenSceneInfo, false) diff --git a/src/interaction/interactionmonitor.cpp b/src/interaction/interactionmonitor.cpp index 0e92ad4860..0fedd45769 100644 --- a/src/interaction/interactionmonitor.cpp +++ b/src/interaction/interactionmonitor.cpp @@ -46,7 +46,7 @@ namespace { namespace openspace::interaction { InteractionMonitor::InteractionMonitor() - : properties::PropertyOwner({ "InteractionMonitor" }) + : properties::PropertyOwner({ "InteractionMonitor", "Interaction Monitor" }) , _isInActiveState(IsInActiveStateInfo, false) , _idleTime(IdleTimeInfo, 120.f, 0.f, 300.f) { diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp index d99b34f0c3..eda88cf974 100644 --- a/src/navigation/navigationhandler.cpp +++ b/src/navigation/navigationhandler.cpp @@ -89,7 +89,7 @@ namespace { namespace openspace::interaction { NavigationHandler::NavigationHandler() - : properties::PropertyOwner({ "NavigationHandler" }) + : properties::PropertyOwner({ "NavigationHandler", "Navigation Handler" }) , _disableKeybindings(DisableKeybindingsInfo, false) , _disableMouseInputs(DisableMouseInputInfo, false) , _disableJoystickInputs(DisableJoystickInputInfo, false) diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp index fa6e0ec4af..308faab6a6 100644 --- a/src/navigation/orbitalnavigator.cpp +++ b/src/navigation/orbitalnavigator.cpp @@ -291,7 +291,7 @@ OrbitalNavigator::Friction::Friction() } OrbitalNavigator::IdleBehavior::IdleBehavior() - : properties::PropertyOwner({ "IdleBehavior" }) + : properties::PropertyOwner({ "IdleBehavior", "Idle Behavior" }) , apply(ApplyIdleBehaviorInfo, false) , shouldTriggerWhenIdle(ShouldTriggerIdleBehaviorWhenIdleInfo, false) , idleWaitTime(IdleWaitTimeInfo, 5.f, 0.f, 3600.f) @@ -326,7 +326,7 @@ OrbitalNavigator::IdleBehavior::IdleBehavior() } OrbitalNavigator::OrbitalNavigator() - : properties::PropertyOwner({ "OrbitalNavigator" }) + : properties::PropertyOwner({ "OrbitalNavigator", "Orbital Navigator" }) , _anchor(AnchorInfo) , _aim(AimInfo) , _retargetAnchor(RetargetAnchorInfo) diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp index b1ffcb6f01..b8a6bd2fbe 100644 --- a/src/navigation/pathnavigator.cpp +++ b/src/navigation/pathnavigator.cpp @@ -118,7 +118,7 @@ namespace { namespace openspace::interaction { PathNavigator::PathNavigator() - : properties::PropertyOwner({ "PathNavigator" }) + : properties::PropertyOwner({ "PathNavigator", "Path Navigator" }) , _defaultPathType( DefaultCurveOptionInfo, properties::OptionProperty::DisplayType::Dropdown diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp index 307c28dba3..be93a7c9b0 100644 --- a/src/rendering/luaconsole.cpp +++ b/src/rendering/luaconsole.cpp @@ -128,7 +128,7 @@ namespace { namespace openspace { LuaConsole::LuaConsole() - : properties::PropertyOwner({ "LuaConsole" }) + : properties::PropertyOwner({ "LuaConsole", "Lua Console" }) , _isVisible(VisibleInfo, false) , _remoteScripting(RemoveScriptingInfo, false) , _backgroundColor( diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 231240b0f1..39766cfe1b 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -270,7 +270,7 @@ namespace { namespace openspace { RenderEngine::RenderEngine() - : properties::PropertyOwner({ "RenderEngine" }) + : properties::PropertyOwner({ "RenderEngine", "Render Engine" }) , _showOverlayOnClients(ShowOverlayClientsInfo, false) , _showLog(ShowLogInfo, true) , _verticalLogOffset(VerticalLogOffsetInfo, 0.f, 0.f, 1.f) diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp index bf36b3cbda..b20dd801c2 100644 --- a/src/scene/lightsource.cpp +++ b/src/scene/lightsource.cpp @@ -80,7 +80,7 @@ std::unique_ptr LightSource::createFromDictionary( } LightSource::LightSource() - : properties::PropertyOwner({ "LightSource" }) + : properties::PropertyOwner({ "LightSource", "Light Source" }) , _enabled(EnabledInfo, true) { addProperty(_enabled); diff --git a/src/scene/timeframe.cpp b/src/scene/timeframe.cpp index 00f8b0cb07..0b8d97554e 100644 --- a/src/scene/timeframe.cpp +++ b/src/scene/timeframe.cpp @@ -60,7 +60,7 @@ ghoul::mm_unique_ptr TimeFrame::createFromDictionary( return ghoul::mm_unique_ptr(result); } -TimeFrame::TimeFrame() : properties::PropertyOwner({ "TimeFrame" }) {} +TimeFrame::TimeFrame() : properties::PropertyOwner({ "TimeFrame", "Time Frame" }) {} bool TimeFrame::initialize() { return true; diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp index 1aafa8977d..cb72baf30b 100644 --- a/src/util/timemanager.cpp +++ b/src/util/timemanager.cpp @@ -82,7 +82,7 @@ namespace openspace { using datamessagestructures::TimeKeyframe; TimeManager::TimeManager() - : properties::PropertyOwner({ "TimeManager" }) + : properties::PropertyOwner({ "TimeManager", "Time Manager" }) , _defaultTimeInterpolationDuration(DefaultTimeInterpolationDurationInfo, 2.f, 0.f,