support PCX images

Author: pionere

CMakeLists.txt

@@ -68,6 +68,8 @@ set(PROJECT_SOURCES
         source/d1pal.h
         source/d1palhits.cpp
         source/d1palhits.h
+        source/d1pcx.cpp
+        source/d1pcx.h
         source/d1sol.cpp
         source/d1sol.h
         source/d1til.cpp

source/celview.cpp

@@ -12,6 +12,7 @@
 #include <QMimeData>
 
 #include "config.h"
+#include "d1pcx.h"
 #include "mainwindow.h"
 #include "progressdialog.h"
 #include "ui_celview.h"
@@ -183,13 +184,19 @@ CelView::~CelView()
     delete celScene;
 }
 
-void CelView::initialize(D1Gfx *g)
+void CelView::initialize(D1Pal *p, D1Gfx *g)
 {
+    this->pal = p;
     this->gfx = g;
 
     this->update();
 }
 
+void CelView::setPal(D1Pal *p)
+{
+    this->pal = p;
+}
+
 void CelView::update()
 {
     // Displaying CEL file path information
@@ -258,6 +265,19 @@ void CelView::insertImageFiles(IMAGE_FILE_MODE mode, const QStringList &imagefil
 
 void CelView::insertFrame(IMAGE_FILE_MODE mode, int index, const QString &imagefilePath)
 {
+    if (imagefilePath.toLower().endsWith(".pcx")) {
+        bool wasModified = this->gfx->isModified();
+        bool clipped, palMod;
+        D1GfxFrame *frame = this->gfx->insertFrame(index, &clipped);
+        if (!D1Pcx::load(*frame, imagefilePath, clipped, this->pal, this->gfx->getPalette(), &palMod)) {
+            this->gfx->removeFrame(index);
+            this->gfx->setModified(wasModified);
+        } else if (palMod) {
+            // update the palette
+            emit this->palModified();
+        }
+        return;
+    }
     QImageReader reader = QImageReader(imagefilePath);
     int numImages = 0;
 

source/celview.h

@@ -63,7 +63,9 @@ class CelView : public QWidget {
     explicit CelView(QWidget *parent = nullptr);
     ~CelView();
 
-    void initialize(D1Gfx *gfx);
+    void initialize(D1Pal *pal, D1Gfx *gfx);
+    void setPal(D1Pal *pal);
+
     int getCurrentFrameIndex();
     void framePixelClicked(unsigned x, unsigned y);
     void insertImageFiles(IMAGE_FILE_MODE mode, const QStringList &imagefilePaths, bool append);
@@ -77,6 +79,7 @@ class CelView : public QWidget {
 signals:
     void frameRefreshed();
     void pixelClicked(const D1GfxPixel &pixel);
+    void palModified();
 
 private:
     void update();
@@ -120,6 +123,7 @@ private slots:
     Ui::CelView *ui;
     CelScene *celScene;
 
+    D1Pal *pal;
     D1Gfx *gfx;
     int currentGroupIndex = 0;
     int currentFrameIndex = 0;

source/d1gfx.cpp

@@ -71,6 +71,19 @@ void D1GfxFrame::setFrameType(D1CEL_FRAME_TYPE type)
     this->frameType = type;
 }
 
+void D1GfxFrame::addPixelLine(QList<D1GfxPixel> &pixelLine)
+{
+    this->pixels.append(pixelLine);
+    this->height++;
+    /* if (this->width != pixelLine.size()) {
+        if (this->width != 0) {
+            dProgressErr() << QString("Mismatching lines.");
+        }*/
+    if (this->width == 0) {
+        this->width = pixelLine.size();
+    }
+}
+
 bool D1Gfx::isFrameSizeConstant()
 {
     if (this->frames.isEmpty()) {
@@ -119,20 +132,26 @@ QImage D1Gfx::getFrameImage(quint16 frameIndex)
     return image;
 }
 
-D1GfxFrame *D1Gfx::insertFrame(int idx, const QImage &image)
+D1GfxFrame *D1Gfx::insertFrame(int idx, bool *clipped)
 {
-    bool clipped;
-
     if (!this->frames.isEmpty()) {
-        clipped = this->frames[0].isClipped();
+        *clipped = this->frames[0].isClipped();
     } else {
-        clipped = this->type == D1CEL_TYPE::V2_MONO_GROUP || this->type == D1CEL_TYPE::V2_MULTIPLE_GROUPS;
+        *clipped = this->type == D1CEL_TYPE::V2_MONO_GROUP || this->type == D1CEL_TYPE::V2_MULTIPLE_GROUPS;
     }
 
-    D1GfxFrame frame;
-    D1ImageFrame::load(frame, image, clipped, this->palette);
-    this->frames.insert(idx, frame);
+    this->frames.insert(idx, D1GfxFrame());
     this->modified = true;
+    return &this->frames[idx];
+}
+
+D1GfxFrame *D1Gfx::insertFrame(int idx, const QImage &image)
+{
+    bool clipped;
+
+    D1GfxFrame *frame = this->insertFrame(idx, &clipped);
+    D1ImageFrame::load(*frame, image, clipped, this->palette);
+    // this->modified = true;
 
     if (this->groupFrameIndices.isEmpty()) {
         // create new group if this is the first frame
@@ -213,9 +232,9 @@ bool D1Gfx::isModified() const
     return this->modified;
 }
 
-void D1Gfx::setModified()
+void D1Gfx::setModified(bool modified)
 {
-    this->modified = true;
+    this->modified = modified;
 }
 
 bool D1Gfx::isUpscaled() const
@@ -234,6 +253,11 @@ QString D1Gfx::getFilePath() const
     return this->gfxFilePath;
 }
 
+D1Pal *D1Gfx::getPalette()
+{
+    return this->palette;
+}
+
 void D1Gfx::setPalette(D1Pal *pal)
 {
     this->palette = pal;
@@ -265,6 +289,12 @@ D1GfxFrame *D1Gfx::getFrame(int frameIndex) const
     return const_cast<D1GfxFrame *>(&this->frames[frameIndex]);
 }
 
+void D1Gfx::setFrame(int frameIndex, const D1GfxFrame &frame)
+{
+    this->frames[frameIndex] = frame;
+    this->modified = true;
+}
+
 int D1Gfx::getFrameWidth(int frameIndex) const
 {
     if (frameIndex < 0 || frameIndex >= this->frames.count())

source/d1gfx.h

@@ -42,6 +42,7 @@ class D1GfxFrame {
     friend class D1CelTileset;
     friend class D1CelTilesetFrame;
     friend class D1ImageFrame;
+    friend class D1Pcx;
     friend class Upscaler;
 
 public:
@@ -54,6 +55,7 @@ class D1GfxFrame {
     bool isClipped() const;
     D1CEL_FRAME_TYPE getFrameType() const;
     void setFrameType(D1CEL_FRAME_TYPE type);
+    void addPixelLine(QList<D1GfxPixel> &pixelLine);
 
 protected:
     int width = 0;
@@ -88,6 +90,7 @@ class D1Gfx : public QObject {
 
     bool isFrameSizeConstant();
     QImage getFrameImage(quint16 frameIndex);
+    D1GfxFrame *insertFrame(int frameIndex, bool *clipped);
     D1GfxFrame *insertFrame(int frameIndex, const QImage &image);
     D1GfxFrame *replaceFrame(int frameIndex, const QImage &image);
     void removeFrame(quint16 frameIndex);
@@ -99,12 +102,14 @@ class D1Gfx : public QObject {
     void setUpscaled(bool upscaled);
     QString getFilePath() const;
     bool isModified() const;
-    void setModified();
+    void setModified(bool modified = true);
+    D1Pal *getPalette();
     void setPalette(D1Pal *pal);
     int getGroupCount() const;
     QPair<quint16, quint16> getGroupFrameIndices(int groupIndex) const;
     int getFrameCount() const;
     D1GfxFrame *getFrame(int frameIndex) const;
+    void setFrame(int frameIndex, const D1GfxFrame &frame);
     int getFrameWidth(int frameIndex) const;
     int getFrameHeight(int frameIndex) const;
     bool setFrameType(int frameIndex, D1CEL_FRAME_TYPE frameType);

source/d1pal.cpp

@@ -7,6 +7,16 @@
 
 #include "config.h"
 
+D1Pal::D1Pal(const D1Pal &opal)
+    : QObject()
+{
+    this->palFilePath = opal.palFilePath;
+    this->modified = opal.modified;
+    this->undefinedColor = opal.undefinedColor;
+    this->currentCycleCounter = opal.currentCycleCounter;
+    this->updateColors(opal);
+}
+
 bool D1Pal::load(QString filePath)
 {
     QFile file = QFile(filePath);
@@ -170,6 +180,13 @@ void D1Pal::setColor(quint8 index, QColor color)
     this->modified = true;
 }
 
+void D1Pal::updateColors(const D1Pal &opal)
+{
+    for (int i = 0; i < D1PAL_COLORS; i++) {
+        this->colors[i] = opal.colors[i];
+    }
+}
+
 void D1Pal::cycleColors(D1PAL_CYCLE_TYPE type)
 {
     QColor celColor;

source/d1pal.h

@@ -24,6 +24,7 @@ class D1Pal : public QObject {
     static constexpr const char *DEFAULT_NAME = "_default.pal";
 
     D1Pal() = default;
+    D1Pal(const D1Pal &opal);
     ~D1Pal() = default;
 
     bool load(QString path);
@@ -39,6 +40,7 @@ class D1Pal : public QObject {
     QColor getColor(quint8 index);
     void setColor(quint8 index, QColor);
 
+    void updateColors(const D1Pal &opal);
     void cycleColors(D1PAL_CYCLE_TYPE type);
 
 private: