Fixed random crashes due to QImage corruption.

[virtualjaguar] / src / gui / imagedelegate.cpp

diff --git a/src/gui/imagedelegate.cpp b/src/gui/imagedelegate.cpp
index d148c2c12c76db30b006f13d8875c3f926fb6ae6..e9069dad698ab4057cdc99e0f13e3ce5a4d60b7e 100644 (file)
--- a/src/gui/imagedelegate.cpp
+++ b/src/gui/imagedelegate.cpp
@@ -17,10 +17,19 @@
 #include "imagedelegate.h"
 
 #include "filedb.h"
+#include "filelistmodel.h"
 
+//ImageDelegate::ImageDelegate(QObject * parent): QAbstractItemDelegate(parent)//, pixelSize(12)
+//{
+//}
 
-ImageDelegate::ImageDelegate(QObject * parent): QAbstractItemDelegate(parent), pixelSize(12)
+ImageDelegate::ImageDelegate()
 {
+       QImage cartImg(":/res/cart-blank.png");
+       QPainter painter(&cartImg);
+       painter.drawPixmap(23, 87, QPixmap(":/res/label-blank.png"));
+       painter.end();
+       cartSmall = cartImg.scaled(488/4, 395/4, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 }
 
 /*
@@ -74,13 +83,37 @@ The foreground of the item (the circle representing a pixel) must be rendered us
 //     painter->drawPixmap(option.rect.x()+8, option.rect.y()+8, 200, 94, QPixmap(":/res/labels/rayman.jpg"));
 //     painter->drawPixmap(option.rect.x()+13, option.rect.y()+51, 433/2, 203/2, QPixmap(":/res/labels/rayman.jpg"));
 //     painter->drawPixmap(option.rect.x(), option.rect.y(), 488/2, 395/2, QPixmap(":/res/cart-blank.png"));
-       painter->drawPixmap(option.rect.x(), option.rect.y(), 488/4, 395/4, QPixmap(":/res/cart-blank.png"));
+
+
+       // This is crappy. We really should have a properly scaled image ready to go so we
+       // don't get Qt's default ugly looking fast scaling...
+#warning "!!! FIX !!! Need to create properly scaled down cart/label images!"
+//     unsigned long i = index.model()->data(index, Qt::DisplayRole).toUInt();
+#if 0
        unsigned long i = index.model()->data(index, Qt::DisplayRole).toUInt();
+       QString filename = index.model()->data(index, Qt::EditRole).toString();
+       QImage label = index.model()->data(index, Qt::DecorationRole).value<QImage>();
+#else
+       unsigned long i = index.model()->data(index, FLM_INDEX).toUInt();
+       QString filename = index.model()->data(index, FLM_FILENAME).toString();
+       QImage label = index.model()->data(index, FLM_LABEL).value<QImage>();
+#endif
 
-       if (romList[i].file[0] == 0)
+#if 0
+       if (role == Qt::DecorationRole)
+               return list.at(index.row()).label;
+       else if (role == Qt::DisplayRole)
+               return (uint)list.at(index.row()).dbIndex;
+       else if (role == Qt::EditRole)
+               return list.at(index.row()).filename;
+#endif
+
+//     if (romList[i].file[0] == 0)
+       if (label.isNull())
        {
 //     painter->drawPixmap(option.rect.x()+14, option.rect.y()+50, 433/2, 203/2, QPixmap(":/res/label-blank.png"));
-               painter->drawPixmap(option.rect.x()+7, option.rect.y()+25, 433/4, 203/4, QPixmap(":/res/label-blank.png"));
+//             painter->drawPixmap(option.rect.x()+7, option.rect.y()+25, 433/4, 203/4, QPixmap(":/res/label-blank.png"));
+               painter->drawImage(option.rect.x() + 2, option.rect.y() + 2, cartSmall);
 //Need to query the model for the data we're supposed to draw here...
 //     painter->drawText(17, 73, QString(romList[i].name));
 //     painter->setPen(Qt::white);
@@ -90,10 +123,15 @@ The foreground of the item (the circle representing a pixel) must be rendered us
        }
        else
        {
+#if 0
                QString filename(romList[i].file);
                filename.prepend("./label/");
                QImage img(filename);
                painter->drawImage(QRect(option.rect.x()+7, option.rect.y()+25, 433/4, 203/4), img);
+#else
+               painter->drawPixmap(option.rect.x() + 2, option.rect.y() + 2, 488/4, 395/4, QPixmap(":/res/cart-blank.png"));
+               painter->drawImage(QRect(option.rect.x()+2+7, option.rect.y()+2+25, 433/4, 203/4), label);
+#endif
        }
 //26x100
 #endif
@@ -117,7 +155,7 @@ QSize ImageDelegate::sizeHint(const QStyleOptionViewItem & /* option */, const Q
 //     return QSize(100, 47);
 //     return QSize(216, 110);
 //     return QSize(488/2, 395/2);
-       return QSize(488/4, 395/4);
+       return QSize((488/4) + 4, (395/4) + 4);
 }
 
 /*