From 6bfb1f64758db8b3c604d89cfa3a3e0867221f07 Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Sat, 9 Jul 2022 08:08:01 +0200 Subject: [PATCH] Changed screenshot format to PNG --- interface/src/Application.cpp | 2 +- interface/src/ui/Snapshot.cpp | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ed0c6822bd..a60f2b4bdf 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -306,7 +306,7 @@ static const uint32_t MAX_CONCURRENT_RESOURCE_DOWNLOADS = 4; // we will never drop below the 'min' value static const int MIN_PROCESSING_THREAD_POOL_SIZE = 2; -static const QString SNAPSHOT_EXTENSION = ".jpg"; +static const QString SNAPSHOT_EXTENSION = ".png"; static const QString JPG_EXTENSION = ".jpg"; static const QString PNG_EXTENSION = ".png"; static const QString SVO_EXTENSION = ".svo"; diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp index 2002d02f37..e736ed9430 100644 --- a/interface/src/ui/Snapshot.cpp +++ b/interface/src/ui/Snapshot.cpp @@ -42,9 +42,9 @@ #include "Snapshot.h" #include "SnapshotUploader.h" -// filename format: overte-snap-by-%username%-on-%date%_%time%_@-%location%.jpg +// filename format: overte-snap-by-%username%-on-%date%_%time%_@-%location%.png // %1 <= username, %2 <= date and time, %3 <= current location -const QString FILENAME_PATH_FORMAT = "overte-snap-by-%1-on-%2.jpg"; +const QString FILENAME_PATH_FORMAT = "overte-snap-by-%1-on-%2.png"; const QString DATETIME_FORMAT = "yyyy-MM-dd_hh-mm-ss"; const QString SNAPSHOTS_DIRECTORY = "Snapshots"; const QString URL = "overte_url"; @@ -385,11 +385,19 @@ QFile* Snapshot::savedFileForSnapshot(QImage& shot, imageQuality = 50; } } else { - filename = userSelectedFilename + ".jpg"; + filename = userSelectedFilename + ".png"; + imageQuality = 50; } } else { filename = FILENAME_PATH_FORMAT.arg(username, now.toString(DATETIME_FORMAT)); + QFileInfo snapshotFileInfo(filename); + QString filenameSuffix = snapshotFileInfo.suffix(); + filenameSuffix = filenameSuffix.toLower(); + if (filenameSuffix == "png") { + imageQuality = 50; + } } + if (!isTemporary) { // If user has requested specific path then use it, else use the application value