X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2Fimageviewer.cpp;h=867fa61a48cf31ed540616ca8b03b4b5e630ee30;hb=7ec54f936be0ac8d7fade4df133c4b1009e5782a;hp=7b1e425f3e64ef2438d7d9c8e43ea5fbb6189e75;hpb=12a22803faa06a0db229b6dfb6130a0e8156ba31;p=apitrace

diff --git a/gui/imageviewer.cpp b/gui/imageviewer.cpp
index 7b1e425..867fa61 100644
--- a/gui/imageviewer.cpp
+++ b/gui/imageviewer.cpp
@@ -1,4 +1,8 @@
 #include "imageviewer.h"
+#include "pixelwidget.h"
+#include "apisurface.h"
+
+#include "image/image.hpp"
 
 #include <QDebug>
 #include <QDesktopWidget>
@@ -7,7 +11,8 @@
 #include <QScrollBar>
 
 ImageViewer::ImageViewer(QWidget *parent)
-    : QDialog(parent)
+    : QDialog(parent),
+      m_image(0)
 {
     setupUi(this);
 
@@ -19,6 +24,8 @@ ImageViewer::ImageViewer(QWidget *parent)
             SLOT(slotUpdate()));
     connect(opaqueCheckBox, SIGNAL(stateChanged(int)),
             SLOT(slotUpdate()));
+    connect(alphaCheckBox, SIGNAL(stateChanged(int)),
+            SLOT(slotUpdate()));
 
     QPixmap px(32, 32);
     QPainter p(&px);
@@ -32,80 +39,57 @@ ImageViewer::ImageViewer(QWidget *parent)
     pal.setBrush(QPalette::Base,
                  QBrush(px));
     scrollAreaWidgetContents->setPalette(pal);
+
+    m_pixelWidget = new PixelWidget(scrollAreaWidgetContents);
+    verticalLayout_2->addWidget(m_pixelWidget);
+
+    rectLabel->hide();
+    pixelLabel->hide();
+
+    connect(m_pixelWidget, SIGNAL(zoomChanged(int)),
+            zoomSpinBox, SLOT(setValue(int)));
+    connect(zoomSpinBox, SIGNAL(valueChanged(int)),
+            m_pixelWidget, SLOT(setZoom(int)));
+    connect(m_pixelWidget, SIGNAL(mousePosition(int, int)),
+            this, SLOT(showPixel(int, int)));
+    connect(m_pixelWidget, SIGNAL(gridGeometry(const QRect &)),
+            this, SLOT(showGrid(const QRect &)));
 }
 
-void ImageViewer::setImage(const QImage &image)
+ImageViewer::~ImageViewer()
 {
-    m_image = image;
-    m_temp = m_image;
-    QPixmap px = QPixmap::fromImage(m_temp);
-    imageLabel->setPixmap(px);
-    updateGeometry();
+    delete m_image;
 }
 
-static inline int clamp(int x)
+void ImageViewer::setBase64Data(const QByteArray &base64)
 {
-    if (x <= 0) {
-        return 0;
-    }
-    if (x > 255) {
-        return 255;
-    }
-    return x;
+    delete m_image;
+    m_image = ApiSurface::imageFromBase64(base64);
+    m_convertedImage = ApiSurface::qimageFromRawImage(m_image);
+    m_pixelWidget->setSurface(m_convertedImage);
+    updateGeometry();
 }
 
 void ImageViewer::slotUpdate()
 {
-    m_temp = m_image.mirrored(false, flipCheckBox->isChecked());
+    m_convertedImage =
+        m_convertedImage.mirrored(false, flipCheckBox->isChecked());
 
     double lowerValue = lowerSpinBox->value();
     double upperValue = upperSpinBox->value();
 
     bool opaque = opaqueCheckBox->isChecked();
+    bool alpha  = alphaCheckBox->isChecked();
 
-    if (lowerValue != 0.0 || upperValue != 1.0 || opaque) {
-        /*
-         * Rescale the image.
-         *
-         * XXX: This would be much more useful if done with the full precision
-         * of the original image
-         */
-
-        int offset = - lowerValue * 255;
-        int scale = 256 / (upperValue - lowerValue);
-
-        m_temp = m_temp.convertToFormat(QImage::Format_ARGB32);
-
-        if (0) {
-            qDebug()
-                << "offset = " << offset << "\n"
-                << "scale = " << scale << "\n";
-        }
-
-        int width = m_temp.width();
-        int height = m_temp.height();
-
-        int aMask = opaque ? 0xff : 0;
-
-        for (int y = 0; y < height; ++y) {
-            QRgb *scanline = (QRgb *)m_temp.scanLine(y);
-            for (int x = 0; x < width; ++x) {
-                QRgb pixel = scanline[x];
-                int r = qRed(pixel);
-                int g = qGreen(pixel);
-                int b = qBlue(pixel);
-                int a = qAlpha(pixel);
-                r = clamp(((r + offset) * scale) >> 8);
-                g = clamp(((g + offset) * scale) >> 8);
-                b = clamp(((b + offset) * scale) >> 8);
-                a |= aMask;
-                scanline[x] = qRgba(r, g, b, a);
-            }
-        }
+    m_convertedImage = ApiSurface::qimageFromRawImage(m_image,
+                                                      lowerValue, upperValue,
+                                                      opaque, alpha);
+
+    if (flipCheckBox->isChecked()) {
+        m_convertedImage = m_convertedImage.mirrored(false, true);
     }
 
-    QPixmap px = QPixmap::fromImage(m_temp);
-    imageLabel->setPixmap(px);
+    m_pixelWidget->setSurface(m_convertedImage);
 
     updateGeometry();
 }
@@ -118,11 +102,11 @@ QSize ImageViewer::sizeHint() const
                 scrollArea->verticalScrollBar()->width() : 0;
     int hScrollHeight = scrollArea->horizontalScrollBar() ?
                 scrollArea->horizontalScrollBar()->height() : 0;
-    QSize optimalWindowSize(m_image.width() + vScrollWidth,
-                            m_image.height() + hScrollHeight);
+    QSize optimalWindowSize(m_convertedImage.width() + vScrollWidth,
+                            m_convertedImage.height() + hScrollHeight);
 
     QRect screenRect = QApplication::desktop()->availableGeometry();
-    const float maxPercentOfDesktopSpace = 0.8;
+    const float maxPercentOfDesktopSpace = 0.8f;
     QSize maxAvailableSize(maxPercentOfDesktopSpace * screenRect.width(),
                            maxPercentOfDesktopSpace * screenRect.height());
 
@@ -130,4 +114,70 @@ QSize ImageViewer::sizeHint() const
                  qMin(optimalWindowSize.height(), maxAvailableSize.height()));
 }
 
+void ImageViewer::resizeEvent(QResizeEvent *e)
+{
+    QWidget::resizeEvent(e);
+}
+
+template <class T>
+QString createPixelLabel(image::Image *img, int x, int y)
+{
+    QString pixelLabel;
+    unsigned char *pixelLocation = 0;
+    T *pixel;
+
+    pixelLocation = img->pixels + img->stride() * y;
+    pixelLocation += x * img->bytesPerPixel;
+    pixel = ((T*)pixelLocation);
+
+    pixelLabel += QLatin1String("[");
+    pixelLabel += QString::fromLatin1("%1").arg(pixel[0]);
+
+    for (int channel = 1; channel < img->channels; ++channel) {
+        pixelLabel += QString::fromLatin1(", %1").arg(pixel[channel]);
+    }
+    pixelLabel += QLatin1String("]");
+
+    return pixelLabel;
+}
+
+void ImageViewer::showPixel(int x, int y)
+{
+    xSpinBox->setValue(x);
+    ySpinBox->setValue(y);
+
+    if (!m_image)
+        return;
+
+    QString label = tr("Pixel: ");
+
+    /* If the image is flipped, substitute y to match */
+    if (flipCheckBox->isChecked()) {
+        y = m_convertedImage.height() - y - 1;
+    }
+
+    if (m_image->channelType == image::TYPE_UNORM8) {
+        label += createPixelLabel<unsigned char>(m_image, x, y);
+    } else {
+        label += createPixelLabel<float>(m_image, x, y);
+    }
+
+    pixelLabel->setText(label);
+    pixelLabel->show();
+}
+
+void ImageViewer::showGrid(const QRect &rect)
+{
+    if (rect.isEmpty()) {
+        rectLabel->hide();
+        return;
+    }
+    rectLabel->setText(tr("Grid: [%1, %2, %3, %4]")
+                       .arg(rect.x())
+                       .arg(rect.y())
+                       .arg(rect.width())
+                       .arg(rect.height()));
+    rectLabel->show();
+}
+
 #include "imageviewer.moc"