Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8410 from davidkelly/dk/snapshotDetails

Browse source 
Minor update to add details
This commit is contained in:
Howard Stearns 2016-08-10 15:17:22 -07:00 committed by GitHub
commit 4273056c86
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/ui/Snapshot.cpp
View file

@ -182,7 +182,9 @@ void SnapshotUploader::uploadSuccess(QNetworkReply& reply) {
QJsonParseError jsonError; QJsonParseError jsonError;
auto doc = QJsonDocument::fromJson(contents, &jsonError); auto doc = QJsonDocument::fromJson(contents, &jsonError);
if (jsonError.error == QJsonParseError::NoError) { if (jsonError.error == QJsonParseError::NoError) {
QString thumbnailUrl = doc.object().value("thumbnail_url").toString(); auto dataObject = doc.object().value("data").toObject();
QString thumbnailUrl = dataObject.value("thumbnail_url").toString();
QString imageUrl = dataObject.value("image_url").toString();
auto addressManager = DependencyManager::get<AddressManager>(); auto addressManager = DependencyManager::get<AddressManager>();
QString placeName = addressManager->getPlaceName(); QString placeName = addressManager->getPlaceName();
if (placeName.isEmpty()) { if (placeName.isEmpty()) {
@ -193,6 +195,9 @@ void SnapshotUploader::uploadSuccess(QNetworkReply& reply) {
// create json post data // create json post data
QJsonObject rootObject; QJsonObject rootObject;
QJsonObject userStoryObject; QJsonObject userStoryObject;
QJsonObject detailsObject;
detailsObject.insert("image_url", imageUrl);
userStoryObject.insert("details", detailsObject);
userStoryObject.insert("thumbnail_url", thumbnailUrl); userStoryObject.insert("thumbnail_url", thumbnailUrl);
userStoryObject.insert("place_name", placeName); userStoryObject.insert("place_name", placeName);
userStoryObject.insert("path", currentPath); userStoryObject.insert("path", currentPath);

1
libraries/networking/src/AddressManager.h
View file

@ -38,6 +38,7 @@ class AddressManager : public QObject, public Dependency {
Q_PROPERTY(QString protocol READ getProtocol) Q_PROPERTY(QString protocol READ getProtocol)
Q_PROPERTY(QString hostname READ getHost) Q_PROPERTY(QString hostname READ getHost)
Q_PROPERTY(QString pathname READ currentPath) Q_PROPERTY(QString pathname READ currentPath)
Q_PROPERTY(QString placename READ getPlaceName)
public: public:
Q_INVOKABLE QString protocolVersion(); Q_INVOKABLE QString protocolVersion();
using PositionGetter = std::function<glm::vec3()>; using PositionGetter = std::function<glm::vec3()>;