mirror of
https://github.com/huderlem/porymap.git
synced 2026-11-19 01:28:57 -06:00
Prompt for new map connections
This commit is contained in:
@@ -752,6 +752,7 @@ void Editor::displayConnection(MapConnection* connection) {
|
||||
ConnectionPixmapItem *pixmapItem = new ConnectionPixmapItem(pixmap, connection, pos.x(), pos.y());
|
||||
pixmapItem->render();
|
||||
scene->addItem(pixmapItem);
|
||||
maskNonVisibleConnectionTiles();
|
||||
|
||||
// Create item for the list panel
|
||||
ConnectionsListItem *listItem = new ConnectionsListItem(ui->scrollAreaContents_ConnectionsList, pixmapItem->connection, project->mapNames);
|
||||
@@ -812,32 +813,6 @@ void Editor::displayConnection(MapConnection* connection) {
|
||||
connection_items.append(pixmapItem);
|
||||
}
|
||||
|
||||
|
||||
void Editor::addNewConnection() {
|
||||
// Find direction with least number of connections.
|
||||
QMap<QString, int> directionCounts;
|
||||
for (MapConnection* connection : map->connections) {
|
||||
directionCounts[connection->direction()]++;
|
||||
}
|
||||
QString minDirection = "up";
|
||||
int minCount = INT_MAX;
|
||||
for (QString direction : MapConnection::cardinalDirections) {
|
||||
if (directionCounts[direction] < minCount) {
|
||||
minDirection = direction;
|
||||
minCount = directionCounts[direction];
|
||||
}
|
||||
}
|
||||
|
||||
// Prefer not to connect the map to itself (we have to if it's the only map).
|
||||
QString defaultMapName = project->mapNames.first();
|
||||
if (defaultMapName == map->name && project->mapNames.length() > 1) {
|
||||
defaultMapName = project->mapNames.at(1);
|
||||
}
|
||||
|
||||
addConnection(new MapConnection(minDirection, map->name, defaultMapName));
|
||||
setSelectedConnection(connection_items.last());
|
||||
}
|
||||
|
||||
void Editor::addConnection(MapConnection * connection, bool addMirror) {
|
||||
if (!connection)
|
||||
return;
|
||||
@@ -1056,6 +1031,10 @@ void Editor::setSelectedConnectionFromMap(QString mapName) {
|
||||
}
|
||||
}
|
||||
|
||||
void Editor::selectLastConnection() {
|
||||
setSelectedConnection(connection_items.last());
|
||||
}
|
||||
|
||||
void Editor::onMapConnectionDoubleClicked(MapConnection* connection) {
|
||||
emit openConnectedMap(connection->targetMapName(), connection->hostMapName());
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "prefab.h"
|
||||
#include "montabwidget.h"
|
||||
#include "imageexport.h"
|
||||
#include "newmapconnectiondialog.h"
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QClipboard>
|
||||
@@ -2649,8 +2650,11 @@ void MainWindow::showExportMapImageWindow(ImageExporterMode mode) {
|
||||
|
||||
void MainWindow::on_pushButton_AddConnection_clicked()
|
||||
{
|
||||
// TODO: Bring up a prompt for information?
|
||||
editor->addNewConnection();
|
||||
auto dialog = new NewMapConnectionDialog(this, this->editor->map, this->editor->project->mapNames);
|
||||
if(dialog->exec() == QDialog::Accepted) {
|
||||
this->editor->addConnection(dialog->result);
|
||||
this->editor->selectLastConnection();
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::on_pushButton_NewWildMonGroup_clicked() {
|
||||
|
||||
62
src/ui/newmapconnectiondialog.cpp
Normal file
62
src/ui/newmapconnectiondialog.cpp
Normal file
@@ -0,0 +1,62 @@
|
||||
#include "newmapconnectiondialog.h"
|
||||
#include "ui_newmapconnectiondialog.h"
|
||||
|
||||
NewMapConnectionDialog::NewMapConnectionDialog(QWidget *parent, Map* map, const QStringList &mapNames) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::NewMapConnectionDialog)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
setAttribute(Qt::WA_DeleteOnClose);
|
||||
|
||||
this->map = map;
|
||||
this->result = nullptr;
|
||||
|
||||
ui->comboBox_Direction->setEditable(false);
|
||||
ui->comboBox_Direction->setMinimumContentsLength(0);
|
||||
ui->comboBox_Direction->addItems(MapConnection::cardinalDirections);
|
||||
|
||||
ui->comboBox_Map->setMinimumContentsLength(6);
|
||||
ui->comboBox_Map->addItems(mapNames);
|
||||
|
||||
// Choose default direction
|
||||
QMap<QString, int> directionCounts;
|
||||
for (auto connection : map->connections) {
|
||||
directionCounts[connection->direction()]++;
|
||||
}
|
||||
QString defaultDirection;
|
||||
int minCount = INT_MAX;
|
||||
for (auto direction : MapConnection::cardinalDirections) {
|
||||
if (directionCounts[direction] < minCount) {
|
||||
defaultDirection = direction;
|
||||
minCount = directionCounts[direction];
|
||||
}
|
||||
}
|
||||
ui->comboBox_Direction->setTextItem(defaultDirection);
|
||||
|
||||
// Choose default map
|
||||
QString defaultMapName;
|
||||
if (mapNames.isEmpty()) {
|
||||
defaultMapName = QString();
|
||||
} else if (mapNames.first() == map->name && mapNames.length() > 1) {
|
||||
// Prefer not to connect the map to itself
|
||||
defaultMapName = mapNames.at(1);
|
||||
} else {
|
||||
defaultMapName = mapNames.first();
|
||||
}
|
||||
ui->comboBox_Map->setTextItem(defaultMapName);
|
||||
}
|
||||
|
||||
NewMapConnectionDialog::~NewMapConnectionDialog()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void NewMapConnectionDialog::accept() {
|
||||
QString direction = ui->comboBox_Direction->currentText();
|
||||
QString hostMapName = this->map ? this->map->name : QString();
|
||||
QString targetMapName = ui->comboBox_Map->currentText();
|
||||
|
||||
this->result = new MapConnection(direction, this->map->name, targetMapName);
|
||||
|
||||
QDialog::accept();
|
||||
}
|
||||
Reference in New Issue
Block a user