diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h index 520f9d79c6..b136807862 100644 --- a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h +++ b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h @@ -53,6 +53,7 @@ public: void uncheckWebGuiOption(); int projectionSelectedIndex(); int qualitySelectedIndex(); + int qualitySelectedValue(); float fovH(); float fovV(); float heightOffset(); @@ -68,6 +69,8 @@ public: std::string QualityTypeNames[10] = {"Low (256)", "Medium (512)", "High (1K)", "1.5K (1536)", "2K (2048)", "4K (4096)", "8K (8192)", "16K (16384)", "32K (32768)", "64K (65536)"}; + int QualityValues[10] = {256, 512, 1024, 1536, 2048, 4096, 8192, 16384, + 32768, 65536}; private slots: void onSizeXChanged(const QString& newText); diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/filesupport.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/filesupport.cpp index 32010e82dc..7976490d78 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/filesupport.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/filesupport.cpp @@ -151,7 +151,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection = sgct::config::SpoutOutputProjection::Mapping::Equirectangular; break; } - projection.quality = winControl->qualitySelectedIndex(); + projection.quality = winControl->qualitySelectedValue(); projection.mappingSpoutName = "OpenSpace"; viewport.projection = std::move(projection); } @@ -160,7 +160,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection case WindowControl::ProjectionIndeces::Fisheye: { sgct::config::FisheyeProjection projection; - projection.quality = winControl->qualitySelectedIndex(); + projection.quality = winControl->qualitySelectedValue(); viewport.projection = std::move(projection); } break; @@ -168,7 +168,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection case WindowControl::ProjectionIndeces::Spherical_Mirror: { sgct::config::SphericalMirrorProjection projection; - projection.quality = winControl->qualitySelectedIndex(); + projection.quality = winControl->qualitySelectedValue(); viewport.projection = std::move(projection); } break; @@ -176,7 +176,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection case WindowControl::ProjectionIndeces::Cylindrical: { sgct::config::CylindricalProjection projection; - projection.quality = winControl->qualitySelectedIndex(); + projection.quality = winControl->qualitySelectedValue(); projection.heightOffset = winControl->heightOffset(); viewport.projection = std::move(projection); } @@ -185,7 +185,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection case WindowControl::ProjectionIndeces::Equirectangular: { sgct::config::EquirectangularProjection projection; - projection.quality = winControl->qualitySelectedIndex(); + projection.quality = winControl->qualitySelectedValue(); viewport.projection = std::move(projection); } break; diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp index d5990092b0..29e044feab 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp @@ -468,6 +468,10 @@ int WindowControl::qualitySelectedIndex() { return _comboQuality->currentIndex(); } +int WindowControl::qualitySelectedValue() { + return QualityValues[_comboQuality->currentIndex()]; +} + float WindowControl::fovH() { return _lineFovH->text().toFloat(); } diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index ee93d3e894..bdab900632 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit ee93d3e894e515b33f0df1c55efb706f3433c0cf +Subproject commit bdab9006323747a6af7e0c1f407810c51e72db80