support PCX images II.

pionere · Jan 26, 2023 · fc9f78f · fc9f78f
1 parent a0d69aa
commit fc9f78f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 13 deletions.
diff --git a/source/celview.cpp b/source/celview.cpp
@@ -305,6 +305,26 @@ void CelView::insertFrame(IMAGE_FILE_MODE mode, int index, const QString &imagef
 
 void CelView::replaceCurrentFrame(const QString &imagefilePath)
 {
+    if (imagefilePath.toLower().endsWith(".pcx")) {
+        bool clipped = this->gfx->getFrame(this->currentFrameIndex)->isClipped(), palMod;
+        D1GfxFrame frame;
+        bool success = D1Pcx::load(frame, imagefilePath, clipped, this->pal, this->gfx->getPalette(), &palMod);
+        if (!success) {
+            dProgressFail() << tr("Failed to load file: %1.").arg(imagefilePath);
+            return;
+        }
+        this->gfx->setFrame(this->currentFrameIndex, frame);
+
+        if (palMod) {
+            // update the palette
+            emit this->palModified();
+        }
+        // update the view
+        this->update();
+        this->displayFrame();
+        return;
+    }
+
     QImage image = QImage(imagefilePath);
 
     if (image.isNull()) {

diff --git a/source/d1gfx.cpp b/source/d1gfx.cpp
@@ -141,17 +141,6 @@ D1GfxFrame *D1Gfx::insertFrame(int idx, bool *clipped)
     }
 
     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
@@ -170,6 +159,19 @@ D1GfxFrame *D1Gfx::insertFrame(int idx, const QImage &image)
             this->groupFrameIndices[i].second++;
         }
     }
+
+    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;
+
     return &this->frames[idx];
 }
 

diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp
@@ -961,8 +961,8 @@ static QString imageNameFilter()
         }
     }
     // add PCX support
-    allSupportedFormats.append(".pcx");
-    allSupportedFormats.append(".PCX");
+    allSupportedFormats.append("*.pcx");
+    allSupportedFormats.append("*.PCX");
 
     QString allSupportedFormatsFilter = QApplication::tr("Image files (%1)").arg(allSupportedFormats.join(' '));
     return allSupportedFormatsFilter;