Fix up the missing SkyBrowser functions for naming scheme

This commit is contained in:
Alexander Bock
2023-08-14 15:05:39 +02:00
parent 1b0b7e73f7
commit 153e71853e
3 changed files with 48 additions and 7 deletions

View File

@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
-- Select which commit hashes to use for the frontend and backend
local frontendHash = "44a3e3aa89f250b74ffc4b7f3a503a5149c0e8de"
local frontendHash = "1379c57e0876473573a67a381214a53fda53e516"
local frontend = asset.syncedResource({
Identifier = "WebGuiFrontend",

View File

@@ -529,7 +529,8 @@ scripting::LuaLibrary SkyBrowserModule::luaLibrary() const {
codegen::lua::StartSetup,
codegen::lua::InitializeBrowser,
codegen::lua::SendOutIdsToBrowsers,
codegen::lua::GetListOfImages,
codegen::lua::ListOfImages,
codegen::lua::ListOfImagesDeprecated,
codegen::lua::SetHoverCircle,
codegen::lua::MoveCircleToHoverImage,
codegen::lua::DisableHoverCircle,
@@ -538,7 +539,8 @@ scripting::LuaLibrary SkyBrowserModule::luaLibrary() const {
codegen::lua::RemoveSelectedImageInBrowser,
codegen::lua::AdjustCamera,
codegen::lua::SetSelectedBrowser,
codegen::lua::GetTargetData,
codegen::lua::TargetData,
codegen::lua::TargetDataDeprecated,
codegen::lua::CreateTargetBrowserPair,
codegen::lua::RemoveTargetBrowserPair,
codegen::lua::SetOpacityOfImageLayer,
@@ -557,7 +559,8 @@ scripting::LuaLibrary SkyBrowserModule::luaLibrary() const {
codegen::lua::ScrollOverBrowser,
codegen::lua::LoadingImageCollectionComplete,
codegen::lua::ShowAllTargetsAndBrowsers,
codegen::lua::GetWwtImageCollectionUrl,
codegen::lua::WwtImageCollectionUrl,
codegen::lua::WwtImageCollectionUrlDeprecated,
codegen::lua::StopAnimations,
codegen::lua::SetBorderRadius,
codegen::lua::ReloadDisplayCopyOnNode

View File

@@ -317,7 +317,7 @@ std::string prunedIdentifier(std::string identifier) {
/**
* Returns the AAS WorldWide Telescope image collection url.
*/
[[codegen::luawrap]] ghoul::Dictionary getWwtImageCollectionUrl() {
[[codegen::luawrap]] ghoul::Dictionary wwtImageCollectionUrl() {
using namespace openspace;
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
ghoul::Dictionary url;
@@ -325,13 +325,27 @@ std::string prunedIdentifier(std::string identifier) {
return url;
}
/**
* Deprecated in favor of 'wwtImageCollectionUrl'
*/
[[codegen::luawrap("getWwtImageCollectionUrl")]]
ghoul::Dictionary wwtImageCollectionUrlDeprecated()
{
LWARNINGC(
"Deprecation",
"'getWwtImageCollectionUrl' function is deprecated and should be replaced with "
"'wwtImageCollectionUrl'"
);
return wwtImageCollectionUrl();
}
/**
* Returns a list of all the loaded AAS WorldWide Telescope images that have been loaded.
* Each image has a name, thumbnail url, equatorial spherical coordinates RA and Dec,
* equatorial Cartesian coordinates, if the image has celestial coordinates, credits text,
* credits url and the identifier of the image which is a unique number.
*/
[[codegen::luawrap]] ghoul::Dictionary getListOfImages() {
[[codegen::luawrap]] ghoul::Dictionary listOfImages() {
using namespace openspace;
// Send image list to GUI
@@ -367,11 +381,24 @@ std::string prunedIdentifier(std::string identifier) {
return list;
}
/**
* Deprecated in favor of 'listOfExoplanets'
*/
[[codegen::luawrap("getListOfImages")]] ghoul::Dictionary listOfImagesDeprecated()
{
LWARNINGC(
"Deprecation",
"'getListOfImages' function is deprecated and should be replaced with "
"'listOfImages'"
);
return listOfImages();
}
/**
* Returns a table of data regarding the current view and the sky browsers and targets.
* returns a table of data regarding the current targets.
*/
[[codegen::luawrap]] ghoul::Dictionary getTargetData() {
[[codegen::luawrap]] ghoul::Dictionary targetData() {
using namespace openspace;
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
@@ -437,6 +464,17 @@ std::string prunedIdentifier(std::string identifier) {
return data;
}
/**
* Deprecated in favor of 'targetData'
*/
[[codegen::luawrap("getTargetData")]] ghoul::Dictionary targetDataDeprecated() {
LWARNINGC(
"Deprecation",
"'getTargetData' function is deprecated and should be replaced with 'targetData'"
);
return targetData();
}
/**
* Takes an identifier to a sky browser or sky target. Rotates the camera so that the
* target is placed in the center of the view.