Implemented save as png in sprite editor

src/editor/dialogs/editspritedialog.cpp

@@ -8,6 +8,7 @@
 #include "models/spritesmodel.h"
 #include "createspritedialog.h"
 #include "imageeditordialog.h"
+#include "imagehelpers.h"
 
 EditSpriteDialog::EditSpriteDialog(const std::vector<QPixmap> &pixmaps, const QString &spriteName, QWidget *parent) :
     QDialog{parent},
@@ -34,8 +35,12 @@ EditSpriteDialog::EditSpriteDialog(const std::vector<QPixmap> &pixmaps, const QS
     m_ui->listView->setModel(m_model.get());
 
     connect(m_ui->actionNew, &QAction::triggered, this, &EditSpriteDialog::newSprite);
+    connect(m_ui->actionSaveAsPngFile, &QAction::triggered, this, &EditSpriteDialog::saveAsPng);
 
     connect(m_ui->listView, &QAbstractItemView::activated, this, &EditSpriteDialog::activated);
+    connect(m_ui->listView->selectionModel(), &QItemSelectionModel::currentChanged,
+            this, &EditSpriteDialog::currentChanged);
+    currentChanged(m_ui->listView->currentIndex());
 }
 
 EditSpriteDialog::~EditSpriteDialog() = default;
@@ -99,6 +104,28 @@ void EditSpriteDialog::newSprite()
     }
 }
 
+void EditSpriteDialog::saveAsPng()
+{
+    auto index = m_ui->listView->currentIndex();
+    if (!index.isValid())
+        return;
+
+    if (index.row() < 0 || (size_t)index.row() >= m_pixmaps.size())
+    {
+        qWarning() << "invalid row" << index.row();
+        return;
+    }
+
+    const auto &pixmap = m_pixmaps[index.row()];
+    if (pixmap.isNull())
+    {
+        QMessageBox::warning(this, tr("Invalid sprite!"), tr("The sprite you tried to save is invalid!"));
+        return;
+    }
+
+    saveImage(this, pixmap.toImage());
+}
+
 void EditSpriteDialog::activated(const QModelIndex &index)
 {
     if (!index.isValid())
@@ -117,6 +144,11 @@ void EditSpriteDialog::activated(const QModelIndex &index)
     }
 }
 
+void EditSpriteDialog::currentChanged(const QModelIndex &index)
+{
+    m_ui->actionSaveAsPngFile->setEnabled(index.isValid());
+}
+
 void EditSpriteDialog::changed()
 {
     if (!m_unsavedChanges)

src/editor/dialogs/editspritedialog.h

@@ -25,7 +25,10 @@ public:
 
 private slots:
     void newSprite();
+    void saveAsPng();
+
     void activated(const QModelIndex &index);
+    void currentChanged(const QModelIndex &index);
 
     void changed();
 

src/editor/dialogs/imageeditordialog.cpp

@@ -7,6 +7,8 @@
 #include <QFontDialog>
 #include <QColorDialog>
 
+#include "imagehelpers.h"
+
 ImageEditorDialog::ImageEditorDialog(const QPixmap &pixmap, const QString &title, QWidget *parent) :
     QDialog{parent},
     m_ui{std::make_unique<Ui::ImageEditorDialog>()},
@@ -29,6 +31,9 @@ ImageEditorDialog::ImageEditorDialog(const QPixmap &pixmap, const QString &title
 
     m_ui->scrollArea->setBackgroundRole(QPalette::Dark);
 
+    connect(m_ui->actionSaveAsPngFile, &QAction::triggered,
+            this, &ImageEditorDialog::saveAsPng);
+
     connect(m_ui->pushButtonSelectFont, &QAbstractButton::pressed,
             this, &ImageEditorDialog::selectFont);
 
@@ -136,6 +141,11 @@ QPixmap ImageEditorDialog::pixmap() const
     return m_ui->canvas->pixmap();
 }
 
+const QImage &ImageEditorDialog::image() const
+{
+    return m_ui->canvas->image();
+}
+
 void ImageEditorDialog::accept()
 {
     // TODO
@@ -173,6 +183,18 @@ void ImageEditorDialog::reject()
     }
 }
 
+void ImageEditorDialog::saveAsPng()
+{
+    const auto &image = m_ui->canvas->image();
+    if (image.isNull())
+    {
+        QMessageBox::warning(this, tr("Invalid sprite!"), tr("The sprite you tried to save is invalid!"));
+        return;
+    }
+
+    saveImage(this, image);
+}
+
 void ImageEditorDialog::changed()
 {
     if (!m_unsavedChanges)

src/editor/dialogs/imageeditordialog.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QDialog>
-#include <QPixmap>
 #include <QString>
 
 #include <memory>
@@ -9,6 +8,8 @@
 #include "widgets/drawingcanvaswidget.h"
 
 class QLabel;
+class QPixmap;
+class QImage;
 namespace Ui { class ImageEditorDialog; }
 
 class ImageEditorDialog : public QDialog
@@ -20,11 +21,13 @@ public:
     ~ImageEditorDialog();
 
     QPixmap pixmap() const;
+    const QImage &image() const;
 
     void accept() override;
     void reject() override;
 
 private slots:
+    void saveAsPng();
     void changed();
     void selectFont();
     void selectLeftButtonColor();

src/editor/dialogs/spritepropertiesdialog.cpp

@@ -11,6 +11,7 @@
 #include "editspritedialog.h"
 #include "maskpropertiesdialog.h"
 #include "mainwindow.h"
+#include "imagehelpers.h"
 
 SpritePropertiesDialog::SpritePropertiesDialog(Sprite &sprite, ProjectTreeModel &projectModel, MainWindow &mainWindow) :
     QDialog{&mainWindow},
@@ -157,22 +158,7 @@ void SpritePropertiesDialog::saveSprite()
         return;
     }
 
-    const auto path = QFileDialog::getSaveFileName(this, tr("Save a Sprite Image..."), m_sprite.name + ".png",
-                                                   QStringLiteral("%0 (*.png);;%1 (*.bmp);;%2 (*.tiff);;%3 (*.jpg *.jpeg);;%4 (*)")
-                                                       .arg(tr("PNG Files"))
-                                                       .arg(tr("BMP Files"))
-                                                       .arg(tr("TIFF Files"))
-                                                       .arg(tr("JPEG Files"))
-                                                       .arg(tr("All Files"))
-                                                   );
-    if (path.isEmpty())
-        return;
-
-    if (!m_pixmaps.front().save(path))
-    {
-        QMessageBox::warning(this, tr("Could not save Sprite!"), tr("Could not save Sprite!"));
-        return;
-    }
+    saveImage(this, m_pixmaps.front().toImage());
 }
 
 void SpritePropertiesDialog::editSprite()

src/editor/widgets/drawingcanvaswidget.cpp

@@ -88,7 +88,10 @@ void DrawingCanvasWidget::mousePressEvent(QMouseEvent *event)
 {
     QWidget::mousePressEvent(event);
 
-    auto zoomdPos = event->pos() / m_zoom;
+    QPoint zoomdPos(
+        std::round(event->pos().x() / m_zoom),
+        std::round(event->pos().y() / m_zoom)
+    );
     auto left = event->button() == Qt::LeftButton;
 
     switch (event->button())
@@ -160,7 +163,10 @@ void DrawingCanvasWidget::mouseMoveEvent(QMouseEvent *event)
 {
     QWidget::mouseMoveEvent(event);
 
-    auto zoomdPos = event->pos() / m_zoom;
+    QPoint zoomdPos(
+        std::round(event->pos().x() / m_zoom),
+        std::round(event->pos().y() / m_zoom)
+    );
     emit cursorMoved(zoomdPos);
 
     if (m_currentlyDrawing)

src/editor/widgets/drawingcanvaswidget.h

@@ -37,6 +37,8 @@ public:
     Mode mode() const { return m_mode; }
     void setMode(Mode mode);
 
+    const QImage &image() const { return m_image; }
+
     QPixmap pixmap() const;
     void setPixmap(const QPixmap &pixmap);