Fixed temperature category warning triggering too early

Cubitect · Jan 14, 2021 · 2718980 · 2718980
1 parent f229353
commit 2718980
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/aboutdialog.h b/aboutdialog.h
@@ -5,7 +5,7 @@
 
 #define VERS_MAJOR 1
 #define VERS_MINOR 2
-#define VERS_PATCH 1
+#define VERS_PATCH 2
 
 // returns +1 if newer, -1 if older  and 0 if equal
 inline int cmpVers(int major, int minor, int patch)

diff --git a/filterdialog.ui b/filterdialog.ui
@@ -249,7 +249,8 @@
         <string>Cancel</string>
        </property>
        <property name="icon">
-        <iconset theme="dialog-cancel"/>
+        <iconset theme="dialog-cancel">
+         <normaloff>.</normaloff>.</iconset>
        </property>
       </widget>
      </item>
@@ -259,7 +260,8 @@
         <string>Ok</string>
        </property>
        <property name="icon">
-        <iconset theme="dialog-ok"/>
+        <iconset theme="dialog-ok">
+         <normaloff>.</normaloff>.</iconset>
        </property>
       </widget>
      </item>
@@ -357,6 +359,24 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>comboBoxType</tabstop>
+  <tabstop>buttonOk</tabstop>
+  <tabstop>buttonCancel</tabstop>
+  <tabstop>textDescription</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>lineRadius</tabstop>
+  <tabstop>buttonArea</tabstop>
+  <tabstop>lineEditX1</tabstop>
+  <tabstop>lineEditZ1</tabstop>
+  <tabstop>lineEditX2</tabstop>
+  <tabstop>lineEditZ2</tabstop>
+  <tabstop>comboBoxRelative</tabstop>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>buttonUncheck</tabstop>
+  <tabstop>buttonCheck</tabstop>
+  <tabstop>scrollArea</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/search.cpp b/search.cpp
@@ -440,6 +440,12 @@ CandidateList getCandidates(int mc, const Condition *cond, int ccnt, int64_t buf
                         clist.scnt = 4;
                         clist.isiz = sizeof(*clist.items) + clist.scnt * sizeof(*clist.items->spos);
                         clist.mem = (char*) calloc(clist.bcnt, clist.isiz);
+                        if (!clist.mem)
+                        {
+                            if (dyn)
+                                free((void*)qb);
+                            break;
+                        }
 
                         Candidate *item = (Candidate*)(clist.mem);
 

diff --git a/searchthread.cpp b/searchthread.cpp
@@ -84,12 +84,13 @@ bool SearchThread::set(int type, int64_t start48, int mc, const QVector<Conditio
         }
         if (c.type == F_TEMPS)
         {
-            int w = c.x2 - c.x1;
-            int h = c.z2 - c.z1;
+            int w = c.x2 - c.x1 + 1;
+            int h = c.z2 - c.z1 + 1;
             if (w * h < c.count)
             {
                 QMessageBox::warning(NULL, "Warning", QString::asprintf(
-                        "Temperature category condition with ID [%02d] has too many restrictions for the area.", c.save));
+                        "Temperature category condition with ID [%02d] has too many restrictions (%d) for the area (%d x %d).",
+                        c.save, c.count, w, h));
                 return false;
             }
             if (c.count == 0)