Skip to content

Commit 73bfd2b

Browse files
SimplyLizSimplyLiz
authored
Merge pull request #113 from CytopiaTeam/improvements
update zoneType and zoneDensity
2 parents 4fc4346 + 3daa45d commit 73bfd2b

5 files changed

Lines changed: 62 additions & 62 deletions

File tree

‎src/TileDataContainer.cxx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ QString TileDataContainer::loadFile(const QString& theFileName)
120120
stringArrayFromJson(tile.tags, obj.value("tags"));
121121
stringArrayFromJson(tile.biomes, obj.value("biomes"));
122122
stringArrayFromJson(tile.groundDecoration, obj.value("groundDecoration"));
123-
zonesFromJson(tile.zones, obj.value("zones"));
123+
zoneTypesFromJson(tile.zoneTypes, obj.value("zoneType"));
124124
stylesFromJson(tile, obj.value("style"));
125-
wealthFromJson(tile, obj.value("wealth"));
125+
zoneDensityFromJson(tile, obj.value("zoneDensity"));
126126

127127
tileSetDataFromJson(tile.tiles, obj.value("tiles"));
128128
tileSetDataFromJson(tile.shoreTiles, obj.value("shoreLine"));
@@ -179,11 +179,11 @@ void TileDataContainer::stringArrayFromJson(std::vector<std::string>& data, cons
179179
}
180180

181181

182-
void TileDataContainer::zonesFromJson(std::vector<Zones>& data, const QJsonValue& value)
182+
void TileDataContainer::zoneTypesFromJson(std::vector<ZoneType>& data, const QJsonValue& value)
183183
{
184-
for (const QJsonValue& zone : value.toArray())
184+
for (const QJsonValue& zoneType : value.toArray())
185185
{
186-
data.push_back(Zones::_from_string_nocase(zone.toString().toStdString().c_str()));
186+
data.push_back(ZoneType::_from_string_nocase(zoneType.toString().toStdString().c_str()));
187187
}
188188
}
189189

@@ -206,20 +206,20 @@ void TileDataContainer::stylesFromJson(TileData& data, const QJsonValue& value)
206206
}
207207
}
208208

209-
void TileDataContainer::wealthFromJson(TileData& data, const QJsonValue& value)
209+
void TileDataContainer::zoneDensityFromJson(TileData& data, const QJsonValue& value)
210210
{
211211
if (value.toArray().empty() && data.tileType == +TileType::RCI)
212212
{
213-
for (Wealth wealth : Wealth::_values())
213+
for (ZoneDensity zoneDensity : ZoneDensity::_values())
214214
{
215-
data.wealth.push_back(wealth);
215+
data.zoneDensity.push_back(zoneDensity);
216216
}
217217
}
218218
else
219219
{
220-
for (const QJsonValue& wealth : value.toArray())
220+
for (const QJsonValue& zoneDensity : value.toArray())
221221
{
222-
data.wealth.push_back(Wealth::_from_string_nocase(wealth.toString().toStdString().c_str()));
222+
data.zoneDensity.push_back(ZoneDensity::_from_string_nocase(zoneDensity.toString().toStdString().c_str()));
223223
}
224224
}
225225
}
@@ -272,8 +272,8 @@ bool TileDataContainer::saveFile()
272272
if (!tile.tags.empty()) { obj.insert("tags", stringArrayToJson(tile.tags)); }
273273
if (!tile.biomes.empty()) { obj.insert("biomes", stringArrayToJson(tile.biomes)); }
274274
if (!tile.style.empty()) { obj.insert("style", stylesToJson(tile.style)); }
275-
if (!tile.wealth.empty()) { obj.insert("wealth", wealthToJson(tile.wealth)); }
276-
if (!tile.zones.empty()) { obj.insert("zones", zonesToJson(tile.zones)); }
275+
if (!tile.zoneDensity.empty()) { obj.insert("zoneDensity", zoneDensityToJson(tile.zoneDensity)); }
276+
if (!tile.zoneTypes.empty()) { obj.insert("zoneType", zoneTypeToJson(tile.zoneTypes)); }
277277

278278
obj.insert("tileType", QString::fromUtf8(tile.tileType._to_string()));
279279

@@ -338,13 +338,13 @@ QJsonArray TileDataContainer::stringArrayToJson(const std::vector<std::string>&
338338
return result;
339339
}
340340

341-
QJsonArray TileDataContainer::zonesToJson(const std::vector<Zones>& data)
341+
QJsonArray TileDataContainer::zoneTypeToJson(const std::vector<ZoneType>& data)
342342
{
343343
QJsonArray result;
344344

345-
for (const Zones zone : data)
345+
for (const ZoneType zoneType : data)
346346
{
347-
result.append(QString::fromUtf8(zone._to_string()));
347+
result.append(QString::fromUtf8(zoneType._to_string()));
348348
}
349349

350350
return result;
@@ -362,13 +362,13 @@ QJsonArray TileDataContainer::stylesToJson(const std::vector<Style>& data)
362362
return result;
363363
}
364364

365-
QJsonArray TileDataContainer::wealthToJson(const std::vector<Wealth>& data)
365+
QJsonArray TileDataContainer::zoneDensityToJson(const std::vector<ZoneDensity>& data)
366366
{
367367
QJsonArray result;
368368

369-
for (const Wealth wealth : data)
369+
for (const ZoneDensity zoneDensity : data)
370370
{
371-
result.append(QString::fromUtf8(wealth._to_string()));
371+
result.append(QString::fromUtf8(zoneDensity._to_string()));
372372
}
373373

374374
return result;

‎src/TileDataContainer.hxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ private:
3434
void groundDecorationFromJson(TileData& data, const QJsonValue& value);
3535
void tileSetDataFromJson(TileSetData& data, const QJsonValue& value);
3636
void requiredTilesFromJson(TileSize& data, const QJsonValue& value);
37-
void zonesFromJson(std::vector<Zones>& data, const QJsonValue& value);
37+
void zoneTypesFromJson(std::vector<ZoneType>& data, const QJsonValue& value);
3838
void stylesFromJson(TileData& data, const QJsonValue& value);
39-
void wealthFromJson(TileData& data, const QJsonValue& value);
39+
void zoneDensityFromJson(TileData& data, const QJsonValue& value);
4040
void tileTypeFromJson(TileType& tileType, const QJsonValue& value);
4141
QJsonObject tileSetDataToJson(const TileSetData& data);
4242
QJsonObject requiredTilesToJson(const TileSize& data);
4343
QJsonArray stringArrayToJson(const std::vector<std::string>& data);
44-
QJsonArray zonesToJson(const std::vector<Zones>& data);
44+
QJsonArray zoneTypeToJson(const std::vector<ZoneType>& data);
4545
QJsonArray stylesToJson(const std::vector<Style>& data);
46-
QJsonArray wealthToJson(const std::vector<Wealth>& data);
46+
QJsonArray zoneDensityToJson(const std::vector<ZoneDensity>& data);
4747

4848
private:
4949
QString fileName;

‎src/TileDataUI.cxx‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ TileDataUI::TileDataUI()
8181

8282
createActions();
8383

84-
QSettings settings("JimmySnails", "Cytopia");
84+
QSettings settings("SimplyLiz", "Cytopia");
8585
restoreGeometry(settings.value("main/geometry").toByteArray());
8686
restoreState(settings.value("main/windowState").toByteArray());
8787
splitter->restoreState(settings.value("main/splitter").toByteArray());
@@ -718,9 +718,9 @@ void TileDataUI::writeToTileData(TileData& tile)
718718
tile.RequiredTiles.height = static_cast<unsigned int>(ui.requiredTilesHeight->value());
719719
tile.RequiredTiles.width = static_cast<unsigned int>(ui.requiredTilesWidth->value());
720720

721-
tile.zones = ZonesEnumVectorFromButtons();
721+
tile.zoneTypes = ZonesEnumVectorFromButtons();
722722
tile.style = StyleEnumVectorFromButtons();
723-
tile.wealth = WealthEnumVectorFromButtons();
723+
tile.zoneDensity = WealthEnumVectorFromButtons();
724724
tile.tileType = TileType::_from_index(ui.TileTypeComboBox->currentIndex());
725725

726726
commaSeperatedStringToVector(ui.tags->text().toStdString(), tile.tags, ",");
@@ -771,9 +771,9 @@ void TileDataUI::readFromTileData(const TileData& tile)
771771
fillTileSetDataWidget(shoreTileSet, tile.shoreTiles);
772772
fillTileSetDataWidget(slopeSet, tile.slopeTiles);
773773

774-
toggleActiveZoneButtons(tile.zones);
774+
toggleActiveZoneButtons(tile.zoneTypes);
775775
toggleActiveStyleButtons(tile.style);
776-
toggleActiveWealthButtons(tile.wealth);
776+
toggleActiveWealthButtons(tile.zoneDensity);
777777
ui.TileTypeComboBox->setCurrentIndex(tile.tileType._to_index());
778778

779779
// add little preview image
@@ -786,40 +786,40 @@ void TileDataUI::readFromTileData(const TileData& tile)
786786

787787
//------------------------ Zones -------------------------------------------------
788788

789-
std::string TileDataUI::ZonesEnumVectorToString(const std::vector<Zones>& data)
789+
std::string TileDataUI::ZonesEnumVectorToString(const std::vector<ZoneType>& data)
790790
{
791-
std::vector<std::string> zones;
791+
std::vector<std::string> zoneTypes;
792792

793-
for (const Zones zone : data)
793+
for (const ZoneType zone : data)
794794
{
795-
zones.push_back(zone._to_string());
795+
zoneTypes.push_back(zone._to_string());
796796
}
797-
return commaSeperateVector(zones);
797+
return commaSeperateVector(zoneTypes);
798798
}
799799

800-
std::vector<Zones> TileDataUI::ZonesEnumVectorFromString(QString zones)
800+
std::vector<ZoneType> TileDataUI::ZonesEnumVectorFromString(QString zoneType)
801801
{
802802
std::vector<std::string> zoneNames;
803-
commaSeperatedStringToVector(zones.toStdString(), zoneNames);
804-
std::vector<Zones> result;
803+
commaSeperatedStringToVector(zoneType.toStdString(), zoneNames);
804+
std::vector<ZoneType> result;
805805
for (const std::string& zoneName : zoneNames)
806806
{
807-
result.push_back(Zones::_from_string_nocase(zoneName.c_str()));
807+
result.push_back(ZoneType::_from_string_nocase(zoneName.c_str()));
808808
}
809809
return result;
810810
}
811811

812-
std::vector<Zones> TileDataUI::ZonesEnumVectorFromButtons()
812+
std::vector<ZoneType> TileDataUI::ZonesEnumVectorFromButtons()
813813
{
814-
std::vector<Zones> result;
814+
std::vector<ZoneType> result;
815815

816816
for (int i = 0; i < ui.zoneButtonsHorizontalLayout->count(); i++)
817817
{
818818
QPushButton* myButton = dynamic_cast<QPushButton*>(ui.zoneButtonsHorizontalLayout->itemAt(i)->widget());
819819

820820
if (myButton->isChecked())
821821
{
822-
result.push_back(Zones::_from_string_nocase(myButton->objectName().toStdString().c_str()));
822+
result.push_back(ZoneType::_from_string_nocase(myButton->objectName().toStdString().c_str()));
823823
}
824824
}
825825
return result;
@@ -828,7 +828,7 @@ std::vector<Zones> TileDataUI::ZonesEnumVectorFromButtons()
828828
void TileDataUI::createZoneButtons()
829829
{
830830
// Iterate over all Enum values as strings
831-
for (const auto zone : Zones::_names())
831+
for (const auto zone : ZoneType::_names())
832832
{
833833
QPushButton* button = new QPushButton(QString::fromStdString(zone));
834834
button->setCheckable(true);
@@ -837,7 +837,7 @@ void TileDataUI::createZoneButtons()
837837
}
838838
}
839839

840-
void TileDataUI::toggleActiveZoneButtons(const std::vector<Zones>& data)
840+
void TileDataUI::toggleActiveZoneButtons(const std::vector<ZoneType>& data)
841841
{
842842
// iterate over all buttons
843843
for (int i = 0; i < ui.zoneButtonsHorizontalLayout->count(); i++)
@@ -846,9 +846,9 @@ void TileDataUI::toggleActiveZoneButtons(const std::vector<Zones>& data)
846846
QPushButton* myButton = dynamic_cast<QPushButton*>(ui.zoneButtonsHorizontalLayout->itemAt(i)->widget());
847847
myButton->setChecked(false); // reset button
848848
// iterate over all active zones for this tile
849-
for (const Zones& zone : data)
849+
for (const ZoneType& zoneType : data)
850850
{
851-
if (myButton->objectName().toStdString().find(zone._to_string()) != std::string::npos)
851+
if (myButton->objectName().toStdString().find(zoneType._to_string()) != std::string::npos)
852852
{
853853
// if it matches, check the button
854854
myButton->setChecked(true);
@@ -860,11 +860,11 @@ void TileDataUI::toggleActiveZoneButtons(const std::vector<Zones>& data)
860860
void TileDataUI::createWealthButtons()
861861
{
862862
// Iterate over all Enum values as strings
863-
for (const auto wealth : Wealth::_names())
863+
for (const auto zoneDensity : ZoneDensity::_names())
864864
{
865-
QPushButton* button = new QPushButton(QString::fromStdString(wealth));
865+
QPushButton* button = new QPushButton(QString::fromStdString(zoneDensity));
866866
button->setCheckable(true);
867-
button->setObjectName(QString::fromStdString(wealth));
867+
button->setObjectName(QString::fromStdString(zoneDensity));
868868
ui.wealthButtonsHorizontalLayout->addWidget(button);
869869
}
870870
}
@@ -878,7 +878,7 @@ void TileDataUI::fillTileTypeDropdown()
878878
}
879879
}
880880

881-
void TileDataUI::toggleActiveWealthButtons(const std::vector<Wealth>& data)
881+
void TileDataUI::toggleActiveWealthButtons(const std::vector<ZoneDensity>& data)
882882
{
883883
// iterate over all buttons
884884
for (int i = 0; i < ui.wealthButtonsHorizontalLayout->count(); i++)
@@ -887,9 +887,9 @@ void TileDataUI::toggleActiveWealthButtons(const std::vector<Wealth>& data)
887887
QPushButton* myButton = dynamic_cast<QPushButton*>(ui.wealthButtonsHorizontalLayout->itemAt(i)->widget());
888888
myButton->setChecked(false); // reset button
889889
// iterate over all active wealth for this tile
890-
for (const Wealth& wealth : data)
890+
for (const ZoneDensity& zoneDensity : data)
891891
{
892-
if (myButton->objectName().toStdString().find(wealth._to_string()) != std::string::npos)
892+
if (myButton->objectName().toStdString().find(zoneDensity._to_string()) != std::string::npos)
893893
{
894894
// if it matches, check the button
895895
myButton->setChecked(true);
@@ -946,17 +946,17 @@ std::vector<Style> TileDataUI::StyleEnumVectorFromButtons()
946946
return result;
947947
}
948948

949-
std::vector<Wealth> TileDataUI::WealthEnumVectorFromButtons()
949+
std::vector<ZoneDensity> TileDataUI::WealthEnumVectorFromButtons()
950950
{
951-
std::vector<Wealth> result;
951+
std::vector<ZoneDensity> result;
952952

953953
for (int i = 0; i < ui.wealthButtonsHorizontalLayout->count(); i++)
954954
{
955955
QPushButton* myButton = dynamic_cast<QPushButton*>(ui.wealthButtonsHorizontalLayout->itemAt(i)->widget());
956956

957957
if (myButton->isChecked())
958958
{
959-
result.push_back(Wealth::_from_string_nocase(myButton->objectName().toStdString().c_str()));
959+
result.push_back(ZoneDensity::_from_string_nocase(myButton->objectName().toStdString().c_str()));
960960
}
961961
}
962962
return result;

‎src/TileDataUI.hxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ private: // methods
4343
void createStyleButtons(); /// dynamically create Buttons for assignable styles from the Style enum
4444
void createWealthButtons(); /// dynamically create Buttons for assignable walth classes from the Wealth enum
4545
void fillTileTypeDropdown(); /// dynamically create Buttons forall available TileTypes
46-
void toggleActiveZoneButtons(const std::vector<Zones>& data); /// when an item is loaded, check all zones button that are assigned in the json
46+
void toggleActiveZoneButtons(const std::vector<ZoneType>& data); /// when an item is loaded, check all zones button that are assigned in the json
4747
void toggleActiveStyleButtons(const std::vector<Style>& data); /// when an item is loaded, check all style button that are assigned in the json
48-
void toggleActiveWealthButtons(const std::vector<Wealth>& data); /// when an item is loaded, check all wealth button that are assigned in the json
48+
void toggleActiveWealthButtons(const std::vector<ZoneDensity>& data); /// when an item is loaded, check all wealth button that are assigned in the json
4949
QPixmap preparePixMap(const Ui_TileSetDataUi& ui);
5050

5151
QTreeWidgetItem* newTreeRootItem(const TileData& tile);
@@ -54,11 +54,11 @@ private: // methods
5454
void ensureUniqueId(TileData& tile);
5555
void writeToTileData(TileData& tile);
5656
void readFromTileData(const TileData& tile);
57-
std::vector<Zones> ZonesEnumVectorFromString(QString zones);
58-
std::vector<Zones> ZonesEnumVectorFromButtons();
57+
std::vector<ZoneType> ZonesEnumVectorFromString(QString zones);
58+
std::vector<ZoneType> ZonesEnumVectorFromButtons();
5959
std::vector<Style> StyleEnumVectorFromButtons();
60-
std::vector<Wealth> WealthEnumVectorFromButtons();
61-
std::string ZonesEnumVectorToString(const std::vector<Zones>& data);
60+
std::vector<ZoneDensity> WealthEnumVectorFromButtons();
61+
std::string ZonesEnumVectorToString(const std::vector<ZoneType>& data);
6262
void fillTileSetDataWidget(const Ui_TileSetDataUi& ui, const TileSetData& data);
6363
void readTileSetDataWidget(const Ui_TileSetDataUi& ui, TileSetData& data);
6464
QJsonObject tileSetDataToJson(const TileSetData& data);

‎src/TileDataUI.ui‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<rect>
88
<x>0</x>
99
<y>0</y>
10-
<width>1033</width>
10+
<width>1233</width>
1111
<height>851</height>
1212
</rect>
1313
</property>
@@ -421,7 +421,7 @@
421421
<string>Restrict this building to a zone type</string>
422422
</property>
423423
<property name="text">
424-
<string>Zones</string>
424+
<string>ZoneTypes</string>
425425
</property>
426426
</widget>
427427
</item>
@@ -554,10 +554,10 @@
554554
<item row="5" column="0">
555555
<widget class="QLabel" name="label_20">
556556
<property name="toolTip">
557-
<string>Restrict this building to a certain wealth level. </string>
557+
<string>Restrict this building to a certain zoneDensity level. </string>
558558
</property>
559559
<property name="text">
560-
<string>Wealth</string>
560+
<string>ZoneDensity</string>
561561
</property>
562562
</widget>
563563
</item>

0 commit comments

Comments
 (0)