Adds "Reduce to fit" scaling option to mythgallery scaling. The scaling options

now include:
 - scale to fit
 - scale to fill
 - reduce to fit.

Reduce to fit is the same as scale to fit with the exception that it will never
scale up a small picture.

Scaling options can be cycled while viewing a picture by hitting the 
"FULLSCREEN" command (by default W key)

Applied a reworked version of the patch from #5897.

Thanks to Boleslaw Ciesielski <bolek-mythtv@curl.com> for the patch.

closes #5897



git-svn-id: http://svn.mythtv.org/svn/trunk@25659 7dbf422c-18fa-0310-86e9-fd20926502f2

Author: Beirdo

mythplugins/mythgallery/mythgallery/galleryutil.cpp

@@ -450,7 +450,7 @@ bool GalleryUtil::Rename(const QString &currDir, const QString &oldName,
     return false;
 }
 
-QSize GalleryUtil::ScaleToDest(const QSize &src, const QSize &dest, bool scaleMax)
+QSize GalleryUtil::ScaleToDest(const QSize &src, const QSize &dest, ScaleMax scaleMax)
 {
     QSize sz = src;
 
@@ -462,10 +462,12 @@ QSize GalleryUtil::ScaleToDest(const QSize &src, const QSize &dest, bool scaleMa
     if ((sz.width() > 0) && (sz.height() > 0))
         imageAspect = (double)sz.width() / (double)sz.height();
 
-    int scaleWidth;
-    int scaleHeight;
-    if (scaleMax)
+    int scaleWidth = sz.width();
+    int scaleHeight = sz.height();
+
+    switch (scaleMax)
     {
+    case kScaleToFill:
         // scale-max to dest width for most images
         scaleWidth = dest.width();
         scaleHeight = (int)((float)dest.width() * pixelAspect / imageAspect);
@@ -475,9 +477,15 @@ QSize GalleryUtil::ScaleToDest(const QSize &src, const QSize &dest, bool scaleMa
             scaleWidth = (int)((float)dest.height() * imageAspect / pixelAspect);
             scaleHeight = dest.height();
         }
-    }
-    else
-    {
+        break;
+
+    case kReduceToFit:
+        // Reduce to fit (but never enlarge)
+        if (scaleWidth <= dest.width() && scaleHeight <= dest.height())
+            break;
+        // Fall through
+
+    case kScaleToFit:
         // scale-min to dest height for most images
         scaleWidth = (int)((float)dest.height() * imageAspect / pixelAspect);
         scaleHeight = dest.height();
@@ -487,9 +495,14 @@ QSize GalleryUtil::ScaleToDest(const QSize &src, const QSize &dest, bool scaleMa
             scaleWidth = dest.width();
             scaleHeight = (int)((float)dest.width() * pixelAspect / imageAspect);
         }
+        break;
+
+    default:
+        break;
     }
 
-    sz.scale(scaleWidth, scaleHeight, Qt::IgnoreAspectRatio);
+    if (scaleWidth != sz.width() || scaleHeight != sz.height())
+        sz.scale(scaleWidth, scaleHeight, Qt::KeepAspectRatio);
     return sz;
 }
 

mythplugins/mythgallery/mythgallery/galleryutil.h

@@ -24,6 +24,13 @@
 
 #include "iconview.h"
 
+typedef enum {
+  kScaleToFit,
+  kScaleToFill,
+  kReduceToFit,
+  kScaleMaxCount        // must be last
+} ScaleMax;
+
 class GalleryUtil
 {
  public:
@@ -41,7 +48,7 @@ class GalleryUtil
                               int sortorder, bool recurse,
                               ThumbHash *itemHash, ThumbGenerator *thumbGen);
 
-    static QSize ScaleToDest(const QSize &sz, const QSize &dest, bool scaleMax);
+    static QSize ScaleToDest(const QSize &sz, const QSize &dest, ScaleMax scaleMax);
 
     static bool CopyMove(const QFileInfo &src, QFileInfo &dst, bool move)
         { if (move) return Move(src, dst); else return Copy(src, dst); }

mythplugins/mythgallery/mythgallery/glsingleview.cpp

@@ -76,7 +76,7 @@ GLSingleView::GLSingleView(ThumbList itemList, int *pos, int slideShow,
       // General
       m_source_x(0.0f),
       m_source_y(0.0f),
-      m_scaleMax(false),
+      m_scaleMax(kScaleToFit),
 
       // Texture variables (for display and effects)
       m_texMaxDim(512),
@@ -97,7 +97,7 @@ GLSingleView::GLSingleView(ThumbList itemList, int *pos, int slideShow,
       m_effect_cube_yrot(0.0f),
       m_effect_cube_zrot(0.0f)
 {
-    m_scaleMax = (gCoreContext->GetNumSetting("GalleryScaleMax", 0) > 0);
+    m_scaleMax = (ScaleMax) gCoreContext->GetNumSetting("GalleryScaleMax", 0);
 
     m_slideshow_timer = new QTimer(this);
     RegisterEffects();
@@ -140,7 +140,7 @@ GLSingleView::GLSingleView(ThumbList itemList, int *pos, int slideShow,
 GLSingleView::~GLSingleView()
 {
     // save the current m_scaleMax setting so we can restore it later
-    gCoreContext->SaveSetting("GalleryScaleMax", (m_scaleMax ? "1" : "0"));
+    gCoreContext->SaveSetting("GalleryScaleMax", m_scaleMax);
     CleanUp();
 }
 
@@ -458,7 +458,7 @@ void GLSingleView::keyPressEvent(QKeyEvent *e)
         }
         else if (action == "FULLSCREEN")
         {
-            m_scaleMax = !m_scaleMax;
+            m_scaleMax = (ScaleMax) ((m_scaleMax + 1) % kScaleMaxCount);
             m_source_x = 0;
             m_source_y = 0;
             SetZoom(1.0f);

mythplugins/mythgallery/mythgallery/glsingleview.h

@@ -107,7 +107,7 @@ class GLSingleView : public QGLWidget, public ImageView
     // General
     float         m_source_x;
     float         m_source_y;
-    bool          m_scaleMax;
+    ScaleMax      m_scaleMax;
 
     // Texture variables (for display and effects)
     int           m_texMaxDim;

mythplugins/mythgallery/mythgallery/gltexture.cpp

@@ -84,7 +84,7 @@ void GLTexture::MakeQuad(float alpha, float scale)
     glEnd();
 }
 
-void GLTexture::ScaleTo(const QSize &dest, bool scaleMax)
+void GLTexture::ScaleTo(const QSize &dest, ScaleMax scaleMax)
 {
     QSize sz = GalleryUtil::ScaleToDest(GetSize(), dest, scaleMax);
     if ((sz.width()   > 0) && (sz.height()   > 0) &&

mythplugins/mythgallery/mythgallery/gltexture.h

@@ -27,6 +27,9 @@
 #include <QtOpenGL>
 #include <QSize>
 
+// MythGallery headers
+#include "galleryutil.h"
+
 class ThumbItem;
 
 class GLTexture
@@ -50,7 +53,7 @@ class GLTexture
         { width = sz.width(); height = sz.height(); }
     void SetScale(float x, float y)
         { cx = x; cy = y; }
-    void ScaleTo(const QSize &dest, bool scaleMax);
+    void ScaleTo(const QSize &dest, ScaleMax scaleMax);
     void SetAngle(int newangle) { angle = newangle; }
 
     // Gets

mythplugins/mythgallery/mythgallery/singleview.cpp

@@ -59,7 +59,7 @@ SingleView::SingleView(
       m_pixmap(NULL),
       m_angle(0),
       m_source_loc(0,0),
-      m_scaleMax(false),
+      m_scaleMax(kScaleToFit),
 
       // Info variables
       m_info_pixmap(NULL),
@@ -91,7 +91,7 @@ SingleView::SingleView(
       m_effect_milti_circle_out_points(4),
       m_effect_circle_out_points(4)
 {
-    m_scaleMax = (gCoreContext->GetNumSetting("GalleryScaleMax", 0) > 0);
+    m_scaleMax = (ScaleMax) gCoreContext->GetNumSetting("GalleryScaleMax", 0);
 
     m_slideshow_timer = new QTimer(this);
     RegisterEffects();
@@ -173,7 +173,7 @@ SingleView::~SingleView()
     }
 
     // save the current m_scaleMax setting so we can restore it later
-    gCoreContext->SaveSetting("GalleryScaleMax", (m_scaleMax ? "1" : "0"));
+    gCoreContext->SaveSetting("GalleryScaleMax", m_scaleMax);
 }
 
 void SingleView::paintEvent(QPaintEvent *)
@@ -514,7 +514,7 @@ void SingleView::keyPressEvent(QKeyEvent *e)
         }
         else if (action == "FULLSCREEN")
         {
-            m_scaleMax = !m_scaleMax;
+            m_scaleMax = (ScaleMax) ((m_scaleMax + 1) % kScaleMaxCount);
             m_source_loc = QPoint(0, 0);
             SetZoom(1.0f);
         }

mythplugins/mythgallery/mythgallery/singleview.h

@@ -36,6 +36,7 @@ using namespace std;
 // MythTV plugin headers
 #include <mythdialogs.h>
 
+#include "galleryutil.h"
 #include "imageview.h"
 #include "iconview.h"
 #include "sequence.h"
@@ -109,7 +110,7 @@ class SingleView : public MythDialog, public ImageView
     QImage        m_image;
     int           m_angle;
     QPoint        m_source_loc;
-    bool          m_scaleMax;
+    ScaleMax      m_scaleMax;
 
     // Info variables
     QPixmap      *m_info_pixmap;