From 9cfda4db2f54a24e2d51d57367a0374a7b30c184 Mon Sep 17 00:00:00 2001 From: Gene Payne Date: Mon, 7 Aug 2023 12:50:06 -0600 Subject: [PATCH] Fixed the name in the meta section of each config --- apps/OpenSpace/ext/launcher/src/launcherwindow.cpp | 2 +- config/equirectangular_gui.json | 2 +- config/fullscreen1080.json | 2 +- config/gui_projector.json | 2 +- config/single_fisheye.json | 2 +- config/single_fisheye_gui.json | 2 +- config/single_gui.json | 2 +- config/single_gui_spout.json | 2 +- config/single_gui_with_graphics.json | 2 +- config/single_sbs_stereo.json | 2 +- config/single_two_win.json | 2 +- config/spherical_mirror.json | 2 +- config/spherical_mirror_gui.json | 2 +- config/spout_output_cubemap.json | 4 ++-- config/spout_output_equirectangular.json | 4 ++-- config/spout_output_fisheye.json | 4 ++-- config/spout_output_flat.json | 4 ++-- config/two_nodes.json | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp index 7bb25f7e61..f1352e7444 100644 --- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp +++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp @@ -552,7 +552,7 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en } box.addItem(QString::fromStdString(p.path().filename().string())); - //Add tooltip + // Add tooltip if (isJson) { sgct::config::Meta meta = sgct::readMeta(p.path().string(), true); if (!meta.description.empty()) { diff --git a/config/equirectangular_gui.json b/config/equirectangular_gui.json index 7d3d2dc303..425c78a509 100644 --- a/config/equirectangular_gui.json +++ b/config/equirectangular_gui.json @@ -59,7 +59,7 @@ "author": "OpenSpace Team", "description": "Two windows: Primary 1280x720 window with equirectangular projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.", "license": "MIT License", - "name": "Single", + "name": "Equirectangular + GUI", "version": "1.0" } } diff --git a/config/fullscreen1080.json b/config/fullscreen1080.json index 6b8afbcd3e..6d8cfa7987 100644 --- a/config/fullscreen1080.json +++ b/config/fullscreen1080.json @@ -48,7 +48,7 @@ "author": "OpenSpace Team", "description": "A single 1920x1080 fullscreen window with planar projection rendering. The display will automatically be set to 1920x1080, regardless of native resolution.", "license": "MIT License", - "name": "Single", + "name": "Fullscreen 1080", "version": "1.0" } } diff --git a/config/gui_projector.json b/config/gui_projector.json index c4affe89fd..2ae6a35593 100644 --- a/config/gui_projector.json +++ b/config/gui_projector.json @@ -64,7 +64,7 @@ "author": "OpenSpace Team", "description": "Two windows for a side-by-side dual-monitor configuration, where the right-side monitor can be considered a projector. Primary 1920x1080 window with menu and text overlays minus rendering, and a secondary 1920x1080 fullscreen window with planar projection rendering without menu or text overlays.", "license": "MIT License", - "name": "Single", + "name": "Side Projector + GUI", "version": "1.0" } } diff --git a/config/single_fisheye.json b/config/single_fisheye.json index 1309a8e623..941cf221e2 100644 --- a/config/single_fisheye.json +++ b/config/single_fisheye.json @@ -38,7 +38,7 @@ "author": "OpenSpace Team", "description": "A single 1024x1024 window with fisheye projection rendering.", "license": "MIT License", - "name": "Single", + "name": "Fisheye", "version": "1.0" } } diff --git a/config/single_fisheye_gui.json b/config/single_fisheye_gui.json index ef67552cbd..862ec78611 100644 --- a/config/single_fisheye_gui.json +++ b/config/single_fisheye_gui.json @@ -62,7 +62,7 @@ "author": "OpenSpace Team", "description": "Two windows: Primary 1024x1024 window with menu and text overlays minus rendering, and a secondary 1024x1024 window with fisheye projection rendering without menu and text overlays.", "license": "MIT License", - "name": "Single", + "name": "Fisheye + GUI", "version": "1.0" } diff --git a/config/single_gui.json b/config/single_gui.json index 6d67ed64f9..87c997d0ef 100644 --- a/config/single_gui.json +++ b/config/single_gui.json @@ -71,7 +71,7 @@ "author": "OpenSpace Team", "description": "Two windows: Primary 1280x720 window with planar projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.", "license": "MIT License", - "name": "Single", + "name": "Single + GUI", "version": "1.0" } } diff --git a/config/single_gui_spout.json b/config/single_gui_spout.json index 5f54282976..bfd91f6a65 100644 --- a/config/single_gui_spout.json +++ b/config/single_gui_spout.json @@ -68,7 +68,7 @@ "author": "OpenSpace Team", "description": "Two windows: Primary 1280x720 window with Spout output (name 'OpenSpace') planar projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.", "license": "MIT License", - "name": "Single", + "name": "Planar Spout + GUI", "version": "1.0" } } diff --git a/config/single_gui_with_graphics.json b/config/single_gui_with_graphics.json index 31d1b630ab..950207760d 100644 --- a/config/single_gui_with_graphics.json +++ b/config/single_gui_with_graphics.json @@ -72,7 +72,7 @@ "author": "OpenSpace Team", "description": "Two windows: Primary 1280x720 window with planar projection rendering without menu or text overlays, and a secondary with menu and text overlays plus rendering from the primary.", "license": "MIT License", - "name": "Single", + "name": "Planar + GUI", "version": "1.0" } } diff --git a/config/single_sbs_stereo.json b/config/single_sbs_stereo.json index e1fa34337b..b3e32c1e1b 100644 --- a/config/single_sbs_stereo.json +++ b/config/single_sbs_stereo.json @@ -47,7 +47,7 @@ "author": "OpenSpace Team", "description": "A single 1280x720 window containing side-by-side stereo planar projection rendering views.", "license": "MIT License", - "name": "Single", + "name": "Side-by-Side Stereo", "version": "1.0" } } diff --git a/config/single_two_win.json b/config/single_two_win.json index 6d35594ef0..9eabfd6977 100644 --- a/config/single_two_win.json +++ b/config/single_two_win.json @@ -60,7 +60,7 @@ "author": "OpenSpace Team", "description": "Two 1280x720 windows each with identical planar projection rendering. Only the primary window has menu controls, but both have text overlays.", "license": "MIT License", - "name": "Single", + "name": "Twin Planar", "version": "1.0" } diff --git a/config/spherical_mirror.json b/config/spherical_mirror.json index a422b34d35..5b2361f192 100644 --- a/config/spherical_mirror.json +++ b/config/spherical_mirror.json @@ -41,7 +41,7 @@ "author": "OpenSpace Team", "description": "A single 1280x720 window with spherical projection rendering at 2048x2048 resolution.", "license": "MIT License", - "name": "Single", + "name": "Spherical Mirror", "version": "1.0" } } diff --git a/config/spherical_mirror_gui.json b/config/spherical_mirror_gui.json index e96ba89936..08a0e8be9b 100644 --- a/config/spherical_mirror_gui.json +++ b/config/spherical_mirror_gui.json @@ -66,7 +66,7 @@ "author": "OpenSpace Team", "description": "Two windows: Primary 1280x720 window with menu and text overlays minus rendering, and a secondary 1280x720 window at 2048x2048 resolution with spherical mirror projection rendering without the menu or text overlays.", "license": "MIT License", - "name": "Single", + "name": "Spherical Mirror + GUI", "version": "1.0" } } diff --git a/config/spout_output_cubemap.json b/config/spout_output_cubemap.json index a8c2621064..83cfcdd35d 100644 --- a/config/spout_output_cubemap.json +++ b/config/spout_output_cubemap.json @@ -59,9 +59,9 @@ ], "meta": { "author": "OpenSpace Team", - "description": "A single 1024x1024 window with spout output cubemap projection rendering.", + "description": "A single 1024x1024 window with Spout output cubemap projection rendering.", "license": "MIT License", - "name": "Single", + "name": "Cubemap Spout", "version": "1.0" } } diff --git a/config/spout_output_equirectangular.json b/config/spout_output_equirectangular.json index 39de1154a2..1cf7436a75 100644 --- a/config/spout_output_equirectangular.json +++ b/config/spout_output_equirectangular.json @@ -59,9 +59,9 @@ ], "meta": { "author": "OpenSpace Team", - "description": "A single 1024x1024 window with spout output equirectangular projection rendering.", + "description": "A single 1024x1024 window with Spout output equirectangular projection rendering.", "license": "MIT License", - "name": "Single", + "name": "Equirectangular Spout", "version": "1.0" } } diff --git a/config/spout_output_fisheye.json b/config/spout_output_fisheye.json index f95628bd50..584bf5b8f9 100644 --- a/config/spout_output_fisheye.json +++ b/config/spout_output_fisheye.json @@ -59,9 +59,9 @@ ], "meta": { "author": "OpenSpace Team", - "description": "A single 1024x1024 window with spout output fisheye projection rendering.", + "description": "A single 1024x1024 window with Spout output fisheye projection rendering.", "license": "MIT License", - "name": "Single", + "name": "Fisheye Spout", "version": "1.0" } } diff --git a/config/spout_output_flat.json b/config/spout_output_flat.json index c7c8ff2d06..9a953b616a 100644 --- a/config/spout_output_flat.json +++ b/config/spout_output_flat.json @@ -58,9 +58,9 @@ ], "meta": { "author": "OpenSpace Team", - "description": "A single 1024x1024 window with spout output planar/flat projection rendering at 1920x1080 resolution.", + "description": "A single 1024x1024 window with Spout output planar/flat projection rendering at 1920x1080 resolution.", "license": "MIT License", - "name": "Single", + "name": "Planar Spout", "version": "1.0" } } diff --git a/config/two_nodes.json b/config/two_nodes.json index 9bb4f8cf13..637bc27dea 100644 --- a/config/two_nodes.json +++ b/config/two_nodes.json @@ -65,7 +65,7 @@ "author": "OpenSpace Team", "description": "Two individual nodes, each with a 1280x720 window with planar projection rendering.", "license": "MIT License", - "name": "Single", + "name": "Two Nodes", "version": "1.0" } }