Changes for 3.3.0

added biome noise visualization for beta 1.7 climates (#212)
added keyboard controls to navigate the map (#217)
added desert wells map option and finders (#218)
added trail ruins map option and finders
added amethyst geode map option
added indicator for igloos with basement
added command line option --reset-all to clear the sessions and settings
added visibility toggles for structures that can be used to de-clutter the toolbar
updated structure icons, replacing several amidst icons that had non-standard sizes
changed UI so multiple conditions can be enabled/disabled at once (#216)
changed warning message for small areas to be more informative (#220)
changed compiler flags for debug builds
changed the toolbar position to its anchor is resored upon restart
changed preferences dialog to be non-blocking
fixed missing y-level option for locate biome center finders (#221)
fixed incorrect stronghold positions for 1.6- (#228)
fixed secondary spawn pass for 1.18+ (#219)

.gitignore

@@ -1,3 +1,4 @@
 cubiomes-viewer.pro.user
 build
 src/libwinsane/*.o
+**/.directory

cubiomes-viewer.pro

@@ -12,13 +12,13 @@ QT += core widgets
 
 CHARSET                 = -finput-charset=UTF-8 -fexec-charset=UTF-8
 QMAKE_CFLAGS            = $$CHARSET -fwrapv -DSTRUCT_CONFIG_OVERRIDE=1
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -std=gnu++11
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -std=gnu++11 -Wno-deprecated-copy
 QMAKE_CXXFLAGS_RELEASE  *= -O3
 
 win32: {
     CONFIG += static_gnu
 
-    # thanks to nullprogram for dealing with the Windows UTF-16 nonsense
+    # thank you nullprogram for dealing with the Windows UTF-16 nonsense
     LIBWINSANE          = $$PWD/src/libwinsane
     libwinsane.target   = libwinsane
     libwinsane.output   = $$LIBWINSANE/libwinsane.o
@@ -33,12 +33,15 @@ static_gnu: {
     LIBS += -static -static-libgcc -static-libstdc++
 }
 
-# compile cubiomes
-release: {
-    CUTARGET = release
-} else: { # may need the release target to be disabled: qmake CONFIG-=release
+CONFIG(debug, debug|release): {
     CUTARGET = debug
+    QMAKE_CFLAGS += -fsanitize=undefined
+    LIBS += -lubsan -ldl
+} else {
+    CUTARGET = release
 }
+
+# compile cubiomes
 CUPATH              = $$PWD/cubiomes
 QMAKE_PRE_LINK      += $(MAKE) -C $$CUPATH -f $$CUPATH/makefile CFLAGS=\"$$QMAKE_CFLAGS\" $$CUTARGET
 QMAKE_CLEAN         += $$CUPATH/*.o $$CUPATH/libcubiomes.a
@@ -85,6 +88,7 @@ SOURCES += \
         src/biomecolordialog.cpp \
         src/collapsible.cpp \
         src/conditiondialog.cpp \
+        src/config.cpp \
         src/configdialog.cpp \
         src/extgendialog.cpp \
         src/exportdialog.cpp \
@@ -147,6 +151,7 @@ HEADERS += \
         src/biomecolordialog.h \
         src/collapsible.h \
         src/conditiondialog.h \
+        src/config.h \
         src/configdialog.h \
         src/extgendialog.h \
         src/exportdialog.h \
@@ -169,7 +174,6 @@ HEADERS += \
         src/tabstructures.h \
         src/tabtriggers.h \
         src/mainwindow.h \
-        src/settings.h \
         src/structuredialog.h \
         src/world.h
 

rc/icons.qrc

@@ -72,5 +72,13 @@
         <file>icons/check_include_d.png</file>
         <file>icons/check_unchecked.png</file>
         <file>icons/height.png</file>
+        <file>icons/trail.png</file>
+        <file>icons/missing.png</file>
+        <file>icons/well.png</file>
+        <file>icons/well_d.png</file>
+        <file>icons/trail_d.png</file>
+        <file>icons/geode_d.png</file>
+        <file>icons/geode.png</file>
+        <file>icons/igloo_basement.png</file>
     </qresource>
 </RCC>

src/aboutdialog.h

@@ -5,8 +5,8 @@
 #include <QString>
 
 #define VERS_MAJOR 3
-#define VERS_MINOR 2
-#define VERS_PATCH 1   // negative patch number designates a development version
+#define VERS_MINOR 3
+#define VERS_PATCH -1   // negative patch number designates a development version
 
 // returns +1 if newer, -1 if older  and 0 if equal
 inline int cmpVers(int major, int minor, int patch)

src/biomecolordialog.cpp

@@ -2,7 +2,7 @@
 #include "ui_biomecolordialog.h"
 
 #include "cutil.h"
-#include "settings.h"
+#include "config.h"
 
 #include <QPixmap>
 #include <QPainter>

src/conditiondialog.cpp

@@ -122,7 +122,7 @@ ConditionDialog::ConditionDialog(FormConditions *parent, Config *config, int mcv
     ui->lineRadius->setValidator(uintval);
 
     ui->lineBiomeSize->setValidator(new QIntValidator(1, INT_MAX, this));
-    ui->lineTollerance->setValidator(new QIntValidator(0, 255, this));
+    ui->lineTolerance->setValidator(new QIntValidator(0, 255, this));
 
     ui->comboY->lineEdit()->setValidator(new QIntValidator(-64, 320, this));
 
@@ -293,7 +293,6 @@ ConditionDialog::ConditionDialog(FormConditions *parent, Config *config, int mcv
     ui->checkSkipRef->setChecked(false);
     ui->radioSquare->setChecked(true);
     ui->checkRadius->setChecked(false);
-    ui->lineBiomeSize->setText("");
     onCheckStartChanged(false);
     on_comboClimatePara_currentIndexChanged(0);
 
@@ -352,7 +351,10 @@ ConditionDialog::ConditionDialog(FormConditions *parent, Config *config, int mcv
             if (ui->comboY->itemText(i).section(' ', 0, 0).toInt() == cond.y)
                 break;
         if (i >= n)
+        {
             ui->comboY->addItem(QString::number(cond.y));
+            ui->comboY2->addItem(QString::number(cond.y));
+        }
         ui->comboY->setCurrentIndex(i);
 
         if (cond.x1 == cond.z1 && cond.x1 == -cond.x2 && cond.x1 == -cond.z2)
@@ -400,8 +402,8 @@ ConditionDialog::ConditionDialog(FormConditions *parent, Config *config, int mcv
             }
         }
 
-        ui->lineBiomeSize->setText(QString::number(cond.biomeSize));
-        ui->lineTollerance->setText(QString::number(cond.tol));
+        ui->lineBiomeSize->setText(QString::number(cond.biomeSize ? cond.biomeSize : 1));
+        ui->lineTolerance->setText(QString::number(cond.tol));
 
         auto totristate = [](uint16_t st, uint16_t msk) {
             return (st & msk) ? (st & Condition::VAR_NOT) ? Qt::Checked : Qt::PartiallyChecked : Qt::Unchecked;
@@ -795,7 +797,10 @@ int ConditionDialog::warnIfBad(Condition cond)
         int h = cond.z2 - cond.z1 + 1;
         if ((unsigned int)(w * h) < cond.count * cond.biomeSize)
         {
-            QString text = tr("Area is too small for the required biome size.");
+            QString text = tr(
+                "The biome locator checks for %1 instances of size %2 each, "
+                "which cannot be satisfied by an area of size %3%4%5 = %6.")
+                .arg(cond.count).arg(cond.biomeSize).arg(w).arg(QChar(0xD7)).arg(h).arg(w * h);
             QMessageBox::warning(this, tr("Area Insufficient"), text, QMessageBox::Ok);
             return QMessageBox::Cancel;
         }
@@ -964,6 +969,8 @@ void ConditionDialog::on_buttonOk_clicked()
     else
         c.rmax = 0;
 
+    c.y = ui->comboY->currentText().section(' ', 0, 0).toInt();
+
     if (ui->stackedWidget->currentWidget() == ui->pageBiomes)
     {
         c.biomeToFind = c.biomeToFindM = 0;
@@ -993,7 +1000,7 @@ void ConditionDialog::on_buttonOk_clicked()
     {
         c.biomeId = ui->comboMatchBiome->currentData().toInt();
         c.biomeSize = ui->lineBiomeSize->text().toInt();
-        c.tol = ui->lineTollerance->text().toInt();
+        c.tol = ui->lineTolerance->text().toInt();
     }
     if (ui->stackedWidget->currentWidget() == ui->pageMinMax)
     {
@@ -1016,8 +1023,6 @@ void ConditionDialog::on_buttonOk_clicked()
         }
     }
 
-    c.y = ui->comboY->currentText().section(' ', 0, 0).toInt();
-
     c.flags = 0;
     if (ui->checkApprox->isChecked())
         c.flags |= Condition::FLG_APPROX;
@@ -1450,3 +1455,16 @@ void ConditionDialog::on_comboClimatePara_currentIndexChanged(int)
     ui->comboOctaves->addItems(items);
 }
 
+
+void ConditionDialog::on_comboY_currentTextChanged(const QString &text)
+{
+    if (ui->comboY2->currentText() != text)
+        ui->comboY2->setCurrentText(text);
+}
+void ConditionDialog::on_comboY2_currentTextChanged(const QString &text)
+{
+    if (ui->comboY->currentText() != text)
+        ui->comboY->setCurrentText(text);
+}
+
+

src/conditiondialog.h

@@ -175,6 +175,9 @@ private slots:
 
     void on_comboClimatePara_currentIndexChanged(int index);
 
+    void on_comboY_currentTextChanged(const QString &text);
+    void on_comboY2_currentTextChanged(const QString &text);
+
 private:
     Ui::ConditionDialog *ui;
     QTextEdit *textDescription;