add map section swap feature and smooth zooming

This commit is contained in:
garak
2019-02-16 17:56:44 -05:00
parent 38cb97793d
commit 3cef77a174
7 changed files with 132 additions and 77 deletions

View File

@@ -48,7 +48,7 @@ public:
~RegionMap() {};
Project *project;
Project *project = nullptr;
QVector<RegionMapSquare> map_squares;
History<RegionMapHistoryItem*> history;
@@ -70,6 +70,7 @@ public:
void resize(int width, int height);
void resetSquare(int index);
void replaceSectionId(unsigned oldId, unsigned newId);
int width();
int height();

View File

@@ -59,12 +59,7 @@ private:
bool regionMapFirstDraw = true;
double scaleUpFactor = 2.0;
double scaleDownFactor = 1.0 / scaleUpFactor;
int scaleRegionMapTiles = 1;
int scaleRegionMapImage = 1;
int scaleCityMapTiles = 1;
int scaleCityMapImage = 1;
double initialScale = 30.0;
QGraphicsScene *scene_region_map_image = nullptr;
QGraphicsScene *scene_city_map_image = nullptr;
@@ -97,6 +92,7 @@ private slots:
void on_action_RegionMap_Undo_triggered();
void on_action_RegionMap_Redo_triggered();
void on_action_RegionMap_Resize_triggered();
void on_action_Swap_triggered();
void on_action_RegionMap_Generate_triggered();
void on_tabWidget_Region_Map_currentChanged(int);
void on_pushButton_RM_Options_delete_clicked();