From 5188de924f3418b757f4350f66c4077f0ab3df95 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Tue, 22 Nov 2016 11:09:43 -0800 Subject: [PATCH] allow for SnapshotReview dialog to be up during a change of href for all media capture --- interface/src/Application.cpp | 6 +++--- interface/src/Application.h | 2 +- .../src/scripting/WindowScriptingInterface.cpp | 4 ++-- interface/src/scripting/WindowScriptingInterface.h | 2 +- interface/src/ui/Snapshot.cpp | 14 +++++++++----- interface/src/ui/Snapshot.h | 2 +- scripts/system/snapshot.js | 10 +++++++--- 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 82007c4f06..a072615c03 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5450,10 +5450,10 @@ void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRa } }); } -void Application::shareSnapshot(const QString& path) { - postLambdaEvent([path] { +void Application::shareSnapshot(const QString& path, const QUrl& href) { + postLambdaEvent([path, href] { // not much to do here, everything is done in snapshot code... - Snapshot::uploadSnapshot(path); + Snapshot::uploadSnapshot(path, href); }); } diff --git a/interface/src/Application.h b/interface/src/Application.h index 8f8b42d66a..5ab94465cc 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -267,7 +267,7 @@ public: float getAverageSimsPerSecond() const { return _simCounter.rate(); } void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f); - void shareSnapshot(const QString& filename); + void shareSnapshot(const QString& filename, const QUrl& href = QUrl("")); model::SkyboxPointer getDefaultSkybox() const { return _defaultSkybox; } gpu::TexturePointer getDefaultSkyboxTexture() const { return _defaultSkyboxTexture; } diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp index 0cb574c1f6..765c9a8499 100644 --- a/interface/src/scripting/WindowScriptingInterface.cpp +++ b/interface/src/scripting/WindowScriptingInterface.cpp @@ -203,8 +203,8 @@ void WindowScriptingInterface::takeSnapshot(bool notify, bool includeAnimated, f qApp->takeSnapshot(notify, includeAnimated, aspectRatio); } -void WindowScriptingInterface::shareSnapshot(const QString& path) { - qApp->shareSnapshot(path); +void WindowScriptingInterface::shareSnapshot(const QString& path, const QUrl& href) { + qApp->shareSnapshot(path, href); } bool WindowScriptingInterface::isPhysicsEnabled() { diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h index 7246dc0927..2e552d44d1 100644 --- a/interface/src/scripting/WindowScriptingInterface.h +++ b/interface/src/scripting/WindowScriptingInterface.h @@ -53,7 +53,7 @@ public slots: void showAssetServer(const QString& upload = ""); void copyToClipboard(const QString& text); void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f); - void shareSnapshot(const QString& path); + void shareSnapshot(const QString& path, const QUrl& href = QUrl("")); bool isPhysicsEnabled(); signals: diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp index 5df0d4575b..45e2680032 100644 --- a/interface/src/ui/Snapshot.cpp +++ b/interface/src/ui/Snapshot.cpp @@ -151,13 +151,17 @@ QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary) { return imageTempFile; } -void Snapshot::uploadSnapshot(const QString& filename) { +void Snapshot::uploadSnapshot(const QString& filename, const QUrl& href) { const QString SNAPSHOT_UPLOAD_URL = "/api/v1/snapshots"; - // Alternatively to parseSnapshotData, we could pass the inWorldLocation through the call chain. This way is less disruptive to existing code. - SnapshotMetaData* snapshotData = Snapshot::parseSnapshotData(filename); - SnapshotUploader* uploader = new SnapshotUploader(snapshotData->getURL(), filename); - delete snapshotData; + SnapshotUploader* uploader; + if (href.isEmpty()) { + SnapshotMetaData* snapshotData = Snapshot::parseSnapshotData(filename); + uploader = new SnapshotUploader(snapshotData->getURL(), filename); + delete snapshotData; + } else { + uploader = new SnapshotUploader(href, filename); + } QFile* file = new QFile(filename); Q_ASSERT(file->exists()); diff --git a/interface/src/ui/Snapshot.h b/interface/src/ui/Snapshot.h index 2daed0e860..14e1bc2e9f 100644 --- a/interface/src/ui/Snapshot.h +++ b/interface/src/ui/Snapshot.h @@ -39,7 +39,7 @@ public: static SnapshotMetaData* parseSnapshotData(QString snapshotPath); static Setting::Handle snapshotsLocation; - static void uploadSnapshot(const QString& filename); + static void uploadSnapshot(const QString& filename, const QUrl& href = QUrl("")); private: static QFile* savedFileForSnapshot(QImage & image, bool isTemporary); }; diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js index f6ae6d153d..18015a479d 100644 --- a/scripts/system/snapshot.js +++ b/scripts/system/snapshot.js @@ -71,7 +71,7 @@ function confirmShare(data) { if (submessage.share) { print('sharing', submessage.localPath); outstanding++; - Window.shareSnapshot(submessage.localPath); + Window.shareSnapshot(submessage.localPath, submessage.href); } else { print('not sharing', submessage.localPath); } @@ -159,10 +159,14 @@ function resetButtons(pathStillSnapshot, pathAnimatedSnapshot, notify) { button.writeProperty("hoverState", 3); Window.snapshotTaken.disconnect(resetButtons); + // A Snapshot Review dialog might be left open indefinitely after taking the picture, + // during which time the user may have moved. So stash that info in the dialog so that + // it records the correct href. (We can also stash in .jpegs, but not .gifs.) + var href = location.href; // last element in data array tells dialog whether we can share or not confirmShare([ - { localPath: pathAnimatedSnapshot }, - { localPath: pathStillSnapshot }, + { localPath: pathAnimatedSnapshot, href: href }, + { localPath: pathStillSnapshot, href: href }, { canShare: !!isDomainOpen(location.domainId), openFeedAfterShare: shouldOpenFeedAfterShare()