Separate MapImageExporter from Editor

include/core/map.h

@@ -89,7 +89,7 @@ public:
     bool hasEvent(Event *) const;
 
     void deleteConnections();
-    QList<MapConnection*> getConnections() const;
+    QList<MapConnection*> getConnections() const { return m_connections; }
     void removeConnection(MapConnection *);
     void addConnection(MapConnection *);
     void loadConnection(MapConnection *);

include/core/mapconnection.h

@@ -26,13 +26,19 @@ public:
     QString direction() const { return m_direction; }
     void setDirection(const QString &direction, bool mirror = true);
 
+    bool isCardinal() const { return isCardinal(m_direction); }
+    bool isHorizontal() const { return isHorizontal(m_direction); }
+    bool isVertical() const { return isVertical(m_direction); }
+    bool isDiving() const { return isDiving(m_direction); }
+
     int offset() const { return m_offset; }
     void setOffset(int offset, bool mirror = true);
 
     MapConnection* findMirror();
     MapConnection* createMirror();
 
-    QPixmap getPixmap();
+    QPixmap render() const;
+    QPoint relativePos(bool clipped = false) const;
 
     static QPointer<Project> project;
     static const QMap<QString, QString> oppositeDirections;

include/core/maplayout.h

@@ -95,6 +95,8 @@ public:
     int getHeight() const { return height; }
     int getBorderWidth() const { return border_width; }
     int getBorderHeight() const { return border_height; }
+    int getBorderDrawWidth() const;
+    int getBorderDrawHeight() const;
 
     bool isWithinBounds(int x, int y);
     bool isWithinBorderBounds(int x, int y);
@@ -140,6 +142,8 @@ private:
     void setNewDimensionsBlockdata(int newWidth, int newHeight);
     void setNewBorderDimensionsBlockdata(int newWidth, int newHeight);
 
+    static int getBorderDrawDistance(int dimension, qreal minimum);
+
 signals:
     void layoutChanged(Layout *layout);
     //void modified();

include/editor.h

@@ -175,8 +175,6 @@ public:
 
     void eventsView_onMousePress(QMouseEvent *event);
 
-    int getBorderDrawDistance(int dimension);
-
     bool selectingEvent = false;
 
     void deleteSelectedEvents();

include/ui/mapimageexporter.h

@@ -1,10 +1,7 @@
 #ifndef MAPIMAGEEXPORTER_H
 #define MAPIMAGEEXPORTER_H
 
-#include "map.h"
-#include "editor.h"
-
-#include <QDialog>
+#include "project.h"
 
 namespace Ui {
 class MapImageExporter;
@@ -39,15 +36,21 @@ class MapImageExporter : public QDialog
     Q_OBJECT
 
 public:
-    explicit MapImageExporter(QWidget *parent, Editor *editor, ImageExporterMode mode);
+    explicit MapImageExporter(QWidget *parent, Project *project, Layout *layout, ImageExporterMode mode = ImageExporterMode::Normal)
+                        : MapImageExporter(parent, project, nullptr, layout, mode) {};
+    explicit MapImageExporter(QWidget *parent, Project *project, Map *map, ImageExporterMode mode = ImageExporterMode::Normal)
+                        : MapImageExporter(parent, project, map, map->layout(), mode) {};
     ~MapImageExporter();
 
-private:
-    Ui::MapImageExporter *ui;
+    ImageExporterMode mode() const { return m_mode; }
 
-    Layout *m_layout = nullptr;
+private:
+    explicit MapImageExporter(QWidget *parent, Project *project, Map *map, Layout *layout, ImageExporterMode mode);
+
+    Ui::MapImageExporter *ui;
+    Project *m_project = nullptr;
     Map *m_map = nullptr;
-    Editor *m_editor = nullptr;
+    Layout *m_layout = nullptr;
     QGraphicsScene *m_scene = nullptr;
 
     QPixmap m_preview;
@@ -55,6 +58,8 @@ private:
     ImageExporterSettings m_settings;
     ImageExporterMode m_mode = ImageExporterMode::Normal;
 
+    QString getTitle(ImageExporterMode mode);
+    QString getDescription(ImageExporterMode mode);
     void updatePreview();
     void scalePreview();
     void updateShowBorderState();
@@ -65,6 +70,7 @@ private:
     QPixmap getFormattedLayoutPixmap(Layout *layout, bool ignoreBorder = false, bool ignoreGrid = false);
     void paintGrid(QPixmap *pixmap, bool ignoreBorder = false);
     bool historyItemAppliesToFrame(const QUndoCommand *command);
+    void updateMapSelection(const QString &text);
 
 protected:
     virtual void showEvent(QShowEvent *) override;