Merge branch 'dev' of https://github.com/huderlem/porymap into local-id

include/ui/mapimageexporter.h

@@ -1,10 +1,9 @@
 #ifndef MAPIMAGEEXPORTER_H
 #define MAPIMAGEEXPORTER_H
 
-#include "map.h"
-#include "editor.h"
+#include "project.h"
 
-#include <QDialog>
+class QGifImage;
 
 namespace Ui {
 class MapImageExporter;
@@ -17,21 +16,17 @@ enum ImageExporterMode {
 };
 
 struct ImageExporterSettings {
-    bool showObjects = false;
-    bool showWarps = false;
-    bool showBGs = false;
-    bool showTriggers = false;
-    bool showHealLocations = false;
-    bool showUpConnections = false;
-    bool showDownConnections = false;
-    bool showLeftConnections = false;
-    bool showRightConnections = false;
+    QSet<Event::Group> showEvents;
+    QSet<QString> showConnections;
     bool showGrid = false;
     bool showBorder = false;
     bool showCollision = false;
-    bool previewActualSize = false;
+    bool disablePreviewScaling = false;
+    bool disablePreviewUpdates = false;
     int timelapseSkipAmount = 1;
     int timelapseDelayMs = 200;
+    // Not exposed as a setting in the UI atm (our color input widget has no alpha channel).
+    QColor fillColor = Qt::transparent;
 };
 
 class MapImageExporter : public QDialog
@@ -39,32 +34,58 @@ class MapImageExporter : public QDialog
     Q_OBJECT
 
 public:
-    explicit MapImageExporter(QWidget *parent, Editor *editor, ImageExporterMode mode);
+    explicit MapImageExporter(QWidget *parent, Project *project, Map *map, ImageExporterMode mode = ImageExporterMode::Normal)
+                        : MapImageExporter(parent, project, map, map->layout(), mode) {};
+    explicit MapImageExporter(QWidget *parent, Project *project, Layout *layout, ImageExporterMode mode = ImageExporterMode::Normal)
+                        : MapImageExporter(parent, project, nullptr, layout, mode) {};
     ~MapImageExporter();
 
+    ImageExporterMode mode() const { return m_mode; }
+
+    void setMap(Map *map);
+    void setLayout(Layout *layout);
+
 private:
+    explicit MapImageExporter(QWidget *parent, Project *project, Map *map, Layout *layout, ImageExporterMode mode);
+
     Ui::MapImageExporter *ui;
-
-    Layout *m_layout = nullptr;
+    Project *m_project = nullptr;
     Map *m_map = nullptr;
-    Editor *m_editor = nullptr;
+    Layout *m_layout = nullptr;
     QGraphicsScene *m_scene = nullptr;
-
-    QPixmap m_preview;
+    QGifImage *m_timelapseGifImage = nullptr;
+    QBuffer *m_timelapseBuffer = nullptr;
+    QMovie *m_timelapseMovie = nullptr;
+    QGraphicsPixmapItem *m_preview = nullptr;
 
     ImageExporterSettings m_settings;
     ImageExporterMode m_mode = ImageExporterMode::Normal;
+    ImageExporterMode m_originalMode;
 
-    void updatePreview();
+    void setModeSpecificUi();
+    void setSelectionText(const QString &text);
+    void updateMapSelection();
+    void resetSettings();
+    QString getTitle(ImageExporterMode mode);
+    QString getDescription(ImageExporterMode mode);
+    void updatePreview(bool forceUpdate = false);
     void scalePreview();
-    void updateShowBorderState();
+    bool eventsEnabled();
+    void setEventGroupEnabled(Event::Group group, bool enable);
+    bool connectionsEnabled();
+    void setConnectionDirectionEnabled(const QString &dir, bool enable);
     void saveImage();
-    QPixmap getStitchedImage(QProgressDialog *progress, bool includeBorder);
+    QGifImage* createTimelapseGifImage(QProgressDialog *progress);
+    QPixmap getStitchedImage(QProgressDialog *progress);
     QPixmap getFormattedMapPixmap();
-    QPixmap getFormattedMapPixmap(Map *map, bool ignoreBorder = false);
-    QPixmap getFormattedLayoutPixmap(Layout *layout, bool ignoreBorder = false, bool ignoreGrid = false);
-    void paintGrid(QPixmap *pixmap, bool ignoreBorder = false);
-    bool historyItemAppliesToFrame(const QUndoCommand *command);
+    void paintBorder(QPainter *painter, Layout *layout);
+    void paintCollision(QPainter *painter, Layout *layout);
+    void paintConnections(QPainter *painter, const Map *map);
+    void paintEvents(QPainter *painter, const Map *map);
+    void paintGrid(QPainter *painter, const Layout *layout = nullptr);
+    QMargins getMargins(const Map *map);
+    QPixmap getExpandedPixmap(const QPixmap &pixmap, const QSize &targetSize, const QColor &fillColor);
+    bool currentHistoryAppliesToFrame(QUndoStack *historyStack);
 
 protected:
     virtual void showEvent(QShowEvent *) override;
@@ -84,15 +105,16 @@ private slots:
     void on_checkBox_ConnectionRight_stateChanged(int state);
     void on_checkBox_AllConnections_stateChanged(int state);
 
-    void on_checkBox_Elevation_stateChanged(int state);
+    void on_checkBox_Collision_stateChanged(int state);
     void on_checkBox_Grid_stateChanged(int state);
     void on_checkBox_Border_stateChanged(int state);
 
     void on_pushButton_Reset_pressed();
-    void on_spinBox_TimelapseDelay_valueChanged(int delayMs);
-    void on_spinBox_FrameSkip_valueChanged(int skip);
+    void on_spinBox_TimelapseDelay_editingFinished();
+    void on_spinBox_FrameSkip_editingFinished();
 
-    void on_checkBox_ActualSize_stateChanged(int state);
+    void on_checkBox_DisablePreviewScaling_stateChanged(int state);
+    void on_checkBox_DisablePreviewUpdates_stateChanged(int state);
 };
 
 #endif // MAPIMAGEEXPORTER_H