Merge pull request highperformancecoder#215 from Suthiro/bugfix

Bugfix
Sawiq · Apr 17, 2021 · 0fed08b · 0fed08b
2 parents faf0b7a + abcbd5a
commit 0fed08b
Show file tree

Hide file tree

Showing 17 changed files with 64,635 additions and 93,326 deletions.
diff --git a/libscidavis/src/Matrix.cpp b/libscidavis/src/Matrix.cpp
@@ -413,10 +413,10 @@ bool Matrix::recalculate()
     saveCellsToMemory();
     double dx = fabs(xEnd() - xStart()) / (double)(numRows() - 1);
     double dy = fabs(yEnd() - yStart()) / (double)(numCols() - 1);
-    std::pair<double, bool> invalidValue(std::numeric_limits<double>::quiet_NaN(), false);
+    std::pair<double, bool> unsetValue(std::numeric_limits<double>::quiet_NaN(), false);
     std::vector<std::vector<std::pair<double, bool>>> calculatedValues(
             endRow - startRow + 1,
-            std::vector<std::pair<double, bool>>(endCol - startCol + 1, invalidValue));
+            std::vector<std::pair<double, bool>>(endCol - startCol + 1, unsetValue));
     for (int row = startRow; row <= endRow; row++)
         for (int col = startCol; col <= endCol; col++) {
             if (!isCellSelected(row, col))

diff --git a/libscidavis/src/future/core/datatypes/String2DateTimeFilter.cpp b/libscidavis/src/future/core/datatypes/String2DateTimeFilter.cpp
@@ -32,7 +32,7 @@
 #include "lib/XmlStreamReader.h"
 #include <QXmlStreamWriter>
 
-const char *String2DateTimeFilter::date_formats[] = {
+const QStringList String2DateTimeFilter::date_formats = {
     "yyyy-M-d", // ISO 8601 w/ and w/o leading zeros
     "yyyy/M/d",
     "d/M/yyyy", // European style day/month order (this order seems to be used in more countries
@@ -41,11 +41,11 @@ const char *String2DateTimeFilter::date_formats[] = {
     "d.M.yyyy", // German style
     "d.M.yy", "M/yyyy",
     "d.M.", // German form w/o year
-    "yyyyMMdd", 0
+    "yyyyMMdd"
 };
 
-const char *String2DateTimeFilter::time_formats[] = {
-    "h", "h ap", "h:mm", "h:mm ap", "h:mm:ss", "h:mm:ss.zzz", "h:mm:ss:zzz", "mm:ss.zzz", "hmmss", 0
+const QStringList String2DateTimeFilter::time_formats = {
+    "h", "h ap", "h:mm", "h:mm ap", "h:mm:ss", "h:mm:ss.zzz", "h:mm:ss:zzz", "mm:ss.zzz", "hmmss"
 };
 
 QDateTime String2DateTimeFilter::dateTimeAt(int row) const
@@ -88,14 +88,14 @@ QDateTime String2DateTimeFilter::dateTimeAt(int row) const
         time_string = date_string;
 
     // try to find a valid date
-    for (const char **format = date_formats; *format != 0; format++) {
-        date_result = QDate::fromString(date_string, *format);
+    for (const auto& format : date_formats) {
+        date_result = QDate::fromString(date_string, format);
         if (date_result.isValid())
             break;
     }
     // try to find a valid time
-    for (const char **format = time_formats; *format != 0; format++) {
-        time_result = QTime::fromString(time_string, *format);
+    for (const auto& format : time_formats) {
+        time_result = QTime::fromString(time_string, format);
         if (time_result.isValid())
             break;
     }

diff --git a/libscidavis/src/future/core/datatypes/String2DateTimeFilter.h b/libscidavis/src/future/core/datatypes/String2DateTimeFilter.h
@@ -78,8 +78,8 @@ class String2DateTimeFilter : public AbstractSimpleFilter
     //! The format string.
     QString d_format;
 
-    static const char *date_formats[];
-    static const char *time_formats[];
+    static const QStringList date_formats;
+    static const QStringList time_formats;
 
 public:
     virtual QDateTime dateTimeAt(int row) const;

diff --git a/libscidavis/src/future/table/TableView.cpp b/libscidavis/src/future/table/TableView.cpp
@@ -728,9 +728,16 @@ void TableView::applyType()
                 break;
             }
             col->setColumnMode(new_mode, converter);
-            DateTime2StringFilter *filter =
-                    static_cast<DateTime2StringFilter *>(col->outputFilter());
-            filter->setFormat(format);
+            {
+                auto filter = dynamic_cast<DateTime2StringFilter *>(col->outputFilter());
+                if (nullptr != filter)
+                    filter->setFormat(format);
+            }
+            {
+                auto filter = dynamic_cast<String2DateTimeFilter *>(col->inputFilter());
+                if (nullptr != filter)
+                    filter->setFormat(format);
+            }
             col->endMacro();
         }
         break;

diff --git a/scidavis/translations/scidavis_cs-alt.ts b/scidavis/translations/scidavis_cs-alt.ts
diff --git a/scidavis/translations/scidavis_cs.ts b/scidavis/translations/scidavis_cs.ts
diff --git a/scidavis/translations/scidavis_de.ts b/scidavis/translations/scidavis_de.ts
diff --git a/scidavis/translations/scidavis_es.ts b/scidavis/translations/scidavis_es.ts
diff --git a/scidavis/translations/scidavis_fr.ts b/scidavis/translations/scidavis_fr.ts
diff --git a/scidavis/translations/scidavis_ja.ts b/scidavis/translations/scidavis_ja.ts
diff --git a/scidavis/translations/scidavis_pl.ts b/scidavis/translations/scidavis_pl.ts
diff --git a/scidavis/translations/scidavis_pt-br.ts b/scidavis/translations/scidavis_pt-br.ts
diff --git a/scidavis/translations/scidavis_ru.ts b/scidavis/translations/scidavis_ru.ts
diff --git a/scidavis/translations/scidavis_sv.ts b/scidavis/translations/scidavis_sv.ts
diff --git a/scidavis/translations/scidavis_zh-cn.ts b/scidavis/translations/scidavis_zh-cn.ts
diff --git a/scidavis/translations/scidavis_zh-tw.ts b/scidavis/translations/scidavis_zh-tw.ts
diff --git a/update_translations.sh b/update_translations.sh
@@ -8,6 +8,6 @@ cp scidavis/translations/*.ts scidavis/oldtranslations/
 # run lupdate to generate new files
 lupdate -noobsolete scidavis.pro
 # run python script to merge translated lines from old translations into new
-python translation_updater.py scidavis/oldtranslations scidavis/translations
+python3 translation_updater.py scidavis/oldtranslations scidavis/translations
 # remove temporary directory
 rm -rf scidavis/oldtranslations