Merge lp:~phablet-team/gallery-app/avoid-thumbnailers-from-viewer into lp:gallery-app

[Ugo Riboni]

Directly downscale the images for the viewer instead of asking the thumbnailer to do it (which it would do incorrectly)

Directly downscale the images for the viewer instead of asking the thumbnailer to do it (which it would do incorrectly)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1130
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1092/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/80
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/412/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/165
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17222
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/461/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1092/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/gallery-app/avoid-thumbnailers-from-viewer]

1131. By Ugo Riboni on 2015-01-20

Use the post-edit reload mechanism built into the photo editor instead of manually doing it from qml

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1131
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1093/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/21
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/81
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/415/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/721
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/167
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17245
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/469/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1093/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/gallery-app/avoid-thumbnailers-from-viewer]

1132. By Ugo Riboni on 2015-01-20

Save the exif thumbnail after editing the image

[Arthur Mello (artmello)]

I just tested this branch with r204. The issue related with opening pictures does not happen anymore. Rotation (with undo and back to original) seems to work as expected.

But I think there are some issues with crop:
- On a first crop on an image, when we return to the picture we can still see the original image on the background with the loading spin until the cropped image is loaded. Besides that the first crop works;
- On subsequent crops on the same image there are some strange behaviors. The image displayed is the original one and not the result of the previous crop. The blue rectangle does not always have the size of the previous crop over the original image, on some cases it was smaller than the previously cropped area. Sometimes I was able to increase the cropped area over the previous one but sometimes that was not possible. Besides that, the results of the cropped area seems ok and the thumbnail seems to be updated as expected.

review: Needs Fixing

[Arthur Mello (artmello)]

Ok, so I tested the current trunk version of gallery on the same image release and the crop issues are all there. It does not seem to be introduced by this MR.

But I was not able to reproduce the original image on the background with the loading spin while the result of a crop is generated. Not sure if that is a desired behavior.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1132
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1094/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/22
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/82
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/419/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/168
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17254
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/474/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1094/rebuild

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

The crop issues (for crops after the first) are long standing.
They have been fixed in the external photo editor, which uses a different logic for crop entirely.
I would not bother with them and work on pushing the new editor ASAP after RTM

[Arthur Mello (artmello)]

Since neither of the issues are regression this MR does fix the problem and the code lgtm.

review: Approve

=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml	2014-12-17 00:34:42 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml	2015-01-20 20:19:07 +0000
@@ -191,11 +191,6 @@
             }
 
             onClicked: viewerWrapper.toggleHeaderVisibility()
-
-            Connections {
-                target: model.mediaSource
-                onDataChanged: media.reload()
-            }
         }
 
         // Don't allow flicking while the chrome is actively displaying a popup

=== modified file 'rc/qml/MediaViewer/SingleMediaViewer.qml'
--- rc/qml/MediaViewer/SingleMediaViewer.qml	2014-10-09 16:08:50 +0000
+++ rc/qml/MediaViewer/SingleMediaViewer.qml	2015-01-20 20:19:07 +0000
@@ -56,22 +56,6 @@
         }
     }
 
-    function reload() {
-        if (!viewer.isVideo) {
-            var src = image.source
-            image.asynchronous = false
-            image.source = ""
-            image.asynchronous = true
-            image.source = src;
-
-            src = highResolutionImage.source
-            highResolutionImage.asynchronous = false
-            highResolutionImage.source = ""
-            highResolutionImage.asynchronous = true
-            highResolutionImage.source = src
-        }
-    }
-
     function reset() {
         if (viewer.isVideo) {
             if (video.item) {
@@ -151,7 +135,7 @@
                     anchors.fill: parent
                     asynchronous: true
                     cache: false
-                    source: mediaSource.galleryPreviewPath
+                    source: mediaSource.galleryPath
                     sourceSize {
                         width: viewer.maxDimension
                         height: viewer.maxDimension

=== modified file 'src/medialoader/photo-metadata.cpp'
--- src/medialoader/photo-metadata.cpp	2014-12-17 12:20:38 +0000
+++ src/medialoader/photo-metadata.cpp	2015-01-20 20:19:07 +0000
@@ -259,6 +259,17 @@
     }
 }
 
+void PhotoMetadata::updateThumbnail(QImage image)
+{
+    QImage scaled = image.scaled(image.width() / THUMBNAIL_SCALE,
+                                 image.height() / THUMBNAIL_SCALE);
+    QBuffer jpeg;
+    jpeg.open(QIODevice::WriteOnly);
+    scaled.save(&jpeg, "jpeg");
+    Exiv2::ExifThumb thumb(m_image->exifData());
+    thumb.setJpegThumbnail((Exiv2::byte*) jpeg.data().constData(), jpeg.size());
+}
+
 /*!
  * \brief PhotoMetadata::save
  * \return

=== modified file 'src/medialoader/photo-metadata.h'
--- src/medialoader/photo-metadata.h	2014-10-24 18:25:32 +0000
+++ src/medialoader/photo-metadata.h	2015-01-20 20:19:07 +0000
@@ -29,9 +29,13 @@
 #include <QString>
 #include <QSet>
 #include <QTransform>
+#include <QImage>
+#include <QBuffer>
 
 #include <exiv2/exiv2.hpp>
 
+#define THUMBNAIL_SCALE 8.5
+
 /*!
  * \brief The PhotoMetadata class
  */
@@ -50,6 +54,7 @@
 
     void setOrientation(Orientation orientation);
     void setDateTimeDigitized(const QDateTime& digitized);
+    void updateThumbnail(QImage image);
 
     bool save() const;
 

=== modified file 'src/photo/photo-edit-thread.cpp'
--- src/photo/photo-edit-thread.cpp	2013-07-26 15:43:53 +0000
+++ src/photo/photo-edit-thread.cpp	2015-01-20 20:19:07 +0000
@@ -143,8 +143,10 @@
         image = image.transformed(metadata->orientationTransform().inverted());
 
     bool saved = image.save(m_photo->file().filePath(),  m_photo->fileFormat().toStdString().c_str(), 90);
-    if (saved && m_photo->fileFormatHasMetadata())
+    if (saved && m_photo->fileFormatHasMetadata()) {
+        metadata->updateThumbnail(image);
         saved = metadata->save();
+    }
     if (!saved)
         qWarning() << "Error saving edited" << m_photo->file().filePath();