atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix map dimension checks in new map window

Browse source
This commit is contained in:
garakmon 2020-05-16 21:19:36 -04:00 committed by huderlem
parent c0ad1216d2
commit 482d3cd8fb
3 changed files with 120 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
forms/newmappopup.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>410</width> <width>410</width>
<height>508</height> <height>621</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -87,14 +87,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_NewMap_Height"> <widget class="QLabel" name="label_NewMap_Height">
<property name="text"> <property name="text">
<string>Map Height</string> <string>Map Height</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="4" column="1">
<widget class="QSpinBox" name="spinBox_NewMap_Height"> <widget class="QSpinBox" name="spinBox_NewMap_Height">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Height (in blocks) of the new map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Height (in blocks) of the new map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -104,14 +104,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_NewMap_BorderWidth"> <widget class="QLabel" name="label_NewMap_BorderWidth">
<property name="text"> <property name="text">
<string>Border Width</string> <string>Border Width</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="5" column="1">
<widget class="QSpinBox" name="spinBox_NewMap_BorderWidth"> <widget class="QSpinBox" name="spinBox_NewMap_BorderWidth">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Width (in blocks) of the new map's border.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Width (in blocks) of the new map's border.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -121,14 +121,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_NewMap_BorderHeight"> <widget class="QLabel" name="label_NewMap_BorderHeight">
<property name="text"> <property name="text">
<string>Border Height</string> <string>Border Height</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="6" column="1">
<widget class="QSpinBox" name="spinBox_NewMap_BorderHeight"> <widget class="QSpinBox" name="spinBox_NewMap_BorderHeight">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Height (in blocks) of the new map's border.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Height (in blocks) of the new map's border.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -138,14 +138,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_NewMap_Primary_Tileset"> <widget class="QLabel" name="label_NewMap_Primary_Tileset">
<property name="text"> <property name="text">
<string>Primary Tileset</string> <string>Primary Tileset</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="7" column="1">
<widget class="NoScrollComboBox" name="comboBox_NewMap_Primary_Tileset"> <widget class="NoScrollComboBox" name="comboBox_NewMap_Primary_Tileset">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The primary tileset for the new map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The primary tileset for the new map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -155,14 +155,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="8" column="0">
<widget class="QLabel" name="label_NewMap_Secondary_Tileset"> <widget class="QLabel" name="label_NewMap_Secondary_Tileset">
<property name="text"> <property name="text">
<string>Secondary Tileset</string> <string>Secondary Tileset</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="8" column="1">
<widget class="NoScrollComboBox" name="comboBox_NewMap_Secondary_Tileset"> <widget class="NoScrollComboBox" name="comboBox_NewMap_Secondary_Tileset">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The secondary tileset for the new map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The secondary tileset for the new map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -172,14 +172,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="9" column="0">
<widget class="QLabel" name="label_NewMap_Type"> <widget class="QLabel" name="label_NewMap_Type">
<property name="text"> <property name="text">
<string>Type</string> <string>Type</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="9" column="1">
<widget class="NoScrollComboBox" name="comboBox_NewMap_Type"> <widget class="NoScrollComboBox" name="comboBox_NewMap_Type">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -189,14 +189,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="10" column="0">
<widget class="QLabel" name="label_NewMap_Location"> <widget class="QLabel" name="label_NewMap_Location">
<property name="text"> <property name="text">
<string>Location</string> <string>Location</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="10" column="1">
<widget class="NoScrollComboBox" name="comboBox_NewMap_Location"> <widget class="NoScrollComboBox" name="comboBox_NewMap_Location">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The section of the region map which the map is grouped under. This also determines the name of the map that is displayed when the player enters it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The section of the region map which the map is grouped under. This also determines the name of the map that is displayed when the player enters it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -206,14 +206,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="11" column="0">
<widget class="QLabel" name="label_NewMap_Flyable"> <widget class="QLabel" name="label_NewMap_Flyable">
<property name="text"> <property name="text">
<string>Can Fly To</string> <string>Can Fly To</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1"> <item row="11" column="1">
<widget class="QCheckBox" name="checkBox_NewMap_Flyable"> <widget class="QCheckBox" name="checkBox_NewMap_Flyable">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether to add a heal location to the new map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether to add a heal location to the new map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -223,56 +223,56 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0"> <item row="12" column="0">
<widget class="QLabel" name="label_NewMap_Allow_Running"> <widget class="QLabel" name="label_NewMap_Allow_Running">
<property name="text"> <property name="text">
<string>Allow Running</string> <string>Allow Running</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="12" column="1">
<widget class="QLabel" name="label_NewMap_Allow_Biking">
<property name="text">
<string>Allow Biking</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_NewMap_Allow_Escape_Rope">
<property name="text">
<string>Allow Escape Rope</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QCheckBox" name="checkBox_NewMap_Allow_Running"> <widget class="QCheckBox" name="checkBox_NewMap_Allow_Running">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="13" column="0">
<widget class="QLabel" name="label_NewMap_Allow_Biking">
<property name="text">
<string>Allow Biking</string>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QCheckBox" name="checkBox_NewMap_Allow_Biking"> <widget class="QCheckBox" name="checkBox_NewMap_Allow_Biking">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="14" column="0">
<widget class="QLabel" name="label_NewMap_Allow_Escape_Rope">
<property name="text">
<string>Allow Escape Rope</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QCheckBox" name="checkBox_NewMap_Allow_Escape_Rope"> <widget class="QCheckBox" name="checkBox_NewMap_Allow_Escape_Rope">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0"> <item row="15" column="0">
<widget class="QLabel" name="label_NewMap_Floor_Number"> <widget class="QLabel" name="label_NewMap_Floor_Number">
<property name="text"> <property name="text">
<string>Floor Number</string> <string>Floor Number</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="15" column="1">
<widget class="QSpinBox" name="spinBox_NewMap_Floor_Number"> <widget class="QSpinBox" name="spinBox_NewMap_Floor_Number">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Floor number to be used for maps with elevators.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Floor number to be used for maps with elevators.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -285,13 +285,60 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<widget class="QPushButton" name="pushButton_NewMap_Accept"> <widget class="QPushButton" name="pushButton_NewMap_Accept">
<property name="text"> <property name="text">
<string>Accept</string> <string>Accept</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QFrame" name="frame_NewMap_Warning">
<property name="enabled">
<bool>true</bool>
</property>
<property name="visible">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="toolButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>!</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_NewMap_WarningMessage">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
@ -300,7 +347,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>410</width> <width>410</width>
<height>21</height> <height>22</height>
</rect> </rect>
</property> </property>
</widget> </widget>

2
include/ui/newmappopup.h
View file

@ -23,6 +23,7 @@ public:
QString layoutId; QString layoutId;
void init(int, int, QString, QString); void init(int, int, QString, QString);
void useLayout(QString); void useLayout(QString);
void connectSignals();
signals: signals:
void applied(); void applied();
@ -31,6 +32,7 @@ private:
Ui::NewMapPopup *ui; Ui::NewMapPopup *ui;
Project *project; Project *project;
void setDefaultValues(int, QString); void setDefaultValues(int, QString);
bool checkNewMapDimensions();
private slots: private slots:
void on_pushButton_NewMap_Accept_clicked(); void on_pushButton_NewMap_Accept_clicked();

32
src/ui/newmappopup.cpp
View file

@ -38,6 +38,34 @@ void NewMapPopup::init(int type, int group, QString sec, QString layoutId) {
setDefaultValues(group, QString()); setDefaultValues(group, QString());
break; break;
} }
connectSignals();
}
bool NewMapPopup::checkNewMapDimensions() {
int numMetatiles = project->getMapDataSize(ui->spinBox_NewMap_Width->value(), ui->spinBox_NewMap_Height->value());
int maxMetatiles = project->getMaxMapDataSize();
if (numMetatiles > maxMetatiles) {
ui->frame_NewMap_Warning->setVisible(true);
ui->label_NewMap_WarningMessage->setText("WARNING: The specified map dimensions are too large.");
return false;
}
else {
ui->frame_NewMap_Warning->setVisible(false);
ui->label_NewMap_WarningMessage->clear();
return true;
}
};
void NewMapPopup::connectSignals() {
ui->spinBox_NewMap_Width->setMinimum(1);
ui->spinBox_NewMap_Height->setMinimum(1);
ui->spinBox_NewMap_Width->setMaximum(project->getMaxMapWidth());
ui->spinBox_NewMap_Height->setMaximum(project->getMaxMapHeight());
//ui->icon_NewMap_WarningIcon->setPixmap();
connect(ui->spinBox_NewMap_Width, QOverload<int>::of(&QSpinBox::valueChanged), [=](int){checkNewMapDimensions();});
connect(ui->spinBox_NewMap_Height, QOverload<int>::of(&QSpinBox::valueChanged), [=](int){checkNewMapDimensions();});
} }
void NewMapPopup::useLayout(QString layoutId) { void NewMapPopup::useLayout(QString layoutId) {
@ -138,6 +166,10 @@ void NewMapPopup::on_lineEdit_NewMap_Name_textChanged(const QString &text) {
} }
void NewMapPopup::on_pushButton_NewMap_Accept_clicked() { void NewMapPopup::on_pushButton_NewMap_Accept_clicked() {
if (!checkNewMapDimensions()) {
// ignore when map dimensions are invalid
return;
}
Map *newMap = new Map; Map *newMap = new Map;
MapLayout *layout; MapLayout *layout;