From 75c0a9950a3436ed322fa0e04923b5053c5a1dcc Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Tue, 6 Aug 2019 10:51:14 -0700 Subject: [PATCH 01/13] Format dates per national settings. --- oscar/Graphs/gXAxis.cpp | 6 ++++-- oscar/SleepLib/common.cpp | 30 +++++++++++++++++++++++++++++- oscar/SleepLib/common.h | 4 ++++ oscar/docs/release_notes.html | 4 +++- oscar/main.cpp | 2 ++ oscar/mainwindow.cpp | 2 +- oscar/overview.cpp | 2 +- oscar/statistics.cpp | 19 +++++++++++-------- 8 files changed, 55 insertions(+), 14 deletions(-) diff --git a/oscar/Graphs/gXAxis.cpp b/oscar/Graphs/gXAxis.cpp index 29a29d8d..7239da73 100644 --- a/oscar/Graphs/gXAxis.cpp +++ b/oscar/Graphs/gXAxis.cpp @@ -13,6 +13,7 @@ #include "Graphs/gXAxis.h" #include "SleepLib/profiles.h" +#include "SleepLib/common.h" #include "Graphs/glcommon.h" #include "Graphs/gGraph.h" #include "Graphs/gGraphView.h" @@ -303,7 +304,8 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion ®ion) //dt.toString("MMM dd"); // Doing it this way instead because it's MUUUUUUCH faster - tmpstr = QString("%1 %2").arg(months[date.month() - 1]).arg(date.day()); + tmpstr = QString(dayFirst?"%1 %2":"%2 %1").arg(date.day()).arg(months[date.month() - 1]); + //} else if (fitmode==0) { // tmpstr=QString("%1 %2:%3").arg(dow[d]).arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')); } else if (fitmode == 1) { // minute @@ -435,7 +437,7 @@ void gXAxisDay::paint(QPainter &painter, gGraph &graph, const QRegion ®ion) if ((lastx + barw) > (left + width + 1)) break; - QString tmpstr = QString("%1 %2").arg(months[date.month() - 1]).arg(date.day(), 2, 10, QChar('0')); + QString tmpstr = QString(dayFirst?"%2 %1":"%1 %2").arg(months[date.month() - 1]).arg(date.day(), 2, 10, QChar('0')); float x1 = lastx + xpos; //lines.append(QLine(lastx, top, lastx, top+6)); diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index 380ec5f3..78947c21 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -37,8 +37,36 @@ extern MainWindow * mainwin; -// Used by internal settings +QString MedDateFormat = "ddd MMM d yyyy"; // QT default value, which we override if we can +bool dayFirst = false; +// System locale and regional settings support only a "short" date (m/d/yyy) and a "long" +// date (day of week, month, day, year -- all spelled out fully). We get the formatting +// for the long format, shorten day and month name, and remove excess commas. +void SetDateFormat () { + QLocale sysLocale = QLocale::system(); + QString dfmt = sysLocale.dateFormat(); + qDebug() << "system locale date format" << dfmt; + + QString s = dfmt.replace("dddd", "ddd"); + if (!s.isEmpty()) s = s.replace("MMMM", "MMM"); + if (!s.isEmpty()) s = s.replace(",", ""); + if (!s.isEmpty()) { + QDate testDate (2018, 12, 31); + QString testresult = testDate.toString(s); + if (!testresult.isEmpty()) // make sure we can translate a date + MedDateFormat = s; // If we can, save the format for future use + } + + // Record whether month or day is first in the formatting + QString s2 = MedDateFormat; + s2 = s2.replace("ddd",""); + int monthidx = s2.indexOf("MMM"); + if (s2.indexOf("d") < monthidx) + dayFirst = true; + + qDebug() << "shortened date format" << MedDateFormat << "dayFirst" << dayFirst; +} const QString & gitRevision() { diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h index b2f1eb94..523d4757 100644 --- a/oscar/SleepLib/common.h +++ b/oscar/SleepLib/common.h @@ -27,6 +27,8 @@ const QString CSTR_GFX_ANGLE = "ANGLE"; const QString CSTR_GFX_OpenGL = "OpenGL"; const QString CSTR_GFX_BrokenGL = "LegacyGFX"; +extern QString MedDateFormat; +extern bool dayFirst; //! \brief Gets the first day of week from the system locale, to show in the calendars. Qt::DayOfWeek firstDayOfWeekFromLocale(); @@ -49,6 +51,8 @@ QStringList makeBuildInfo(QString relinfo, QString forcedEngine); QStringList getBuildInfo(); QStringList addBuildInfo (QString value); +void SetDateFormat (); + QByteArray gCompress(const QByteArray& data); QByteArray gUncompress(const QByteArray &data); diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index aaffeb05..6dc66e92 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -13,8 +13,10 @@ Which was written and copyright 2011-2018 © Mark Watkins
  • Portions of OSCAR are © 2019 by The OSCAR Team
  • [new] DreamStation BiPAP S/T and AVAPS ventilators (1030X and 1130X) are now supported. The settings aren't yet displayed correctly, but therapy events and graphs should now display properly.
  • [new] View/Reset Graphs organizes graphs in their original order
    • +
  • [fix] Format dates for the national region as reported by the operating system
  • [fix] Improve progress bar for statistics cache update
    • -
  • [fix] Correct calculation of seven-day AHI in Records tab of right sidebar
    • +
  • [fix] Correct calculations of seven-day AHI and leak rate on Welcome page
    • +
  • [fix] Clarify AHI and hours labels on Records tab of right sidebar
  • [fix] Correct import error resulting in invalid elapsed times and impossibly high AHI values

    • diff --git a/oscar/main.cpp b/oscar/main.cpp index 1d7b7c96..fd903259 100644 --- a/oscar/main.cpp +++ b/oscar/main.cpp @@ -346,6 +346,8 @@ int main(int argc, char *argv[]) { qDebug() << "OSCAR starting" << QDateTime::currentDateTime(); qDebug().noquote() << STR_AppName << VersionString << relinfo << "Built with Qt" << QT_VERSION_STR << __DATE__ << __TIME__; + SetDateFormat(); + //////////////////////////////////////////////////////////////////////////////////////////// // Language Selection //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index e4888edf..b420d57a 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -1221,7 +1221,7 @@ void MainWindow::updateFavourites() if (notes.size() > 0) { tmp += QString("%2
    ") .arg(date.toString(Qt::ISODate)) - .arg(date.toString()); + .arg(date.toString(MedDateFormat)); tmp += ""; diff --git a/oscar/overview.cpp b/oscar/overview.cpp index 3d8e1bb6..36c3a236 100644 --- a/oscar/overview.cpp +++ b/oscar/overview.cpp @@ -469,6 +469,7 @@ void Overview::on_rangeCombo_activated(int index) setRange(start, end); } + void Overview::setRange(QDate start, QDate end) { ui->dateEnd->blockSignals(true); @@ -481,7 +482,6 @@ void Overview::setRange(QDate start, QDate end) ui->dateStart->blockSignals(false); this->on_toolButton_clicked(); updateGraphCombo(); - } void Overview::on_graphCombo_activated(int index) diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index be659679..b8b96ee8 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -20,6 +20,7 @@ #include "mainwindow.h" #include "statistics.h" #include "CProgressBar.h" +#include "SleepLib/common.h" extern MainWindow *mainwin; @@ -613,7 +614,7 @@ QString Statistics::getUserInfo () { if (!p_profile->user->firstName().isEmpty()) { userinfo = tr("Name: %1, %2").arg(p_profile->user->lastName()).arg(p_profile->user->firstName()) + "
    "; if (!p_profile->user->DOB().isNull()) { - userinfo += tr("DOB: %1").arg(p_profile->user->DOB().toString()) + "
    "; + userinfo += tr("DOB: %1").arg(p_profile->user->DOB().toString(MedDateFormat)) + "
    "; } if (!p_profile->user->phone().isEmpty()) { userinfo += tr("Phone: %1").arg(p_profile->user->phone()) + "
    "; @@ -897,8 +898,10 @@ QString Statistics::GenerateMachineList() .arg(m->model() + (mn.isEmpty() ? "" : QString(" (") + mn + QString(")"))) .arg(m->serial()) - .arg(d1.toString(Qt::SystemLocaleShortDate)) - .arg(d2.toString(Qt::SystemLocaleShortDate)); + .arg(d1.toString(MedDateFormat)) + .arg(d2.toString(MedDateFormat)); +// .arg(d1.toString(Qt::SystemLocaleShortDate)) +// .arg(d2.toString(Qt::SystemLocaleShortDate)); } @@ -984,8 +987,8 @@ QString Statistics::GenerateRXChanges() double ahi = rdi ? (double(rx.rdi) / rx.hours) : (double(rx.ahi) /rx.hours); double fli = double(rx.count(CPAP_FlowLimit)) / rx. hours; - html += QString("%1").arg(rx.start.toString())+ - QString("%1").arg(rx.end.toString())+ + html += QString("%1").arg(rx.start.toString(MedDateFormat))+ + QString("%1").arg(rx.end.toString(MedDateFormat))+ QString("%1").arg(rx.days)+ QString("%1").arg(ahi, 0, 'f', 2)+ QString("%1").arg(fli, 0, 'f', 2)+ @@ -1174,14 +1177,14 @@ QString Statistics::GenerateCPAPUsage() arg(tr("%1 day of %2 Data on %3") .arg(value) .arg(machine) - .arg(last.toString())); + .arg(last.toString(MedDateFormat))); } else { html+=QString("%2\n").arg(periods.size()+1). arg(tr("%1 days of %2 Data, between %3 and %4") .arg(value) .arg(machine) - .arg(first.toString()) - .arg(last.toString())); + .arg(first.toString(MedDateFormat)) + .arg(last.toString(MedDateFormat))); } continue; } else if (row.calc == SC_SUBHEADING) { // subheading.. From 5cf6e14816914120ba728912ef4fe1af98e343d4 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Tue, 6 Aug 2019 12:33:48 -0700 Subject: [PATCH 02/13] Fix problems resulting in compiler warning messages --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 2 +- oscar/statistics.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index bf61cd3e..504d1b7b 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -5719,7 +5719,7 @@ PRS1DataChunk* PRS1DataChunk::ParseNext(QFile & f) int sessionid_base = (chunk->fileVersion == 2 ? 10 : 16); if (chunk->family == 3 && chunk->familyVersion >= 3) sessionid_base = 16; QString session_s = fi.fileName().section(".", 0, -2); - quint32 sid = session_s.toInt(&numeric, sessionid_base); + qint32 sid = session_s.toInt(&numeric, sessionid_base); if (!numeric || sid != chunk->sessionid) { qDebug() << chunk->m_path << chunk->sessionid; } diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 71810af8..4c0a7836 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -19,7 +19,7 @@ #include "mainwindow.h" #include "statistics.h" -#include "cprogressBar.h" +#include "cprogressbar.h" #include "SleepLib/common.h" extern MainWindow *mainwin; From 77ccd417a335427569b7266bc0c737a045b932ef Mon Sep 17 00:00:00 2001 From: harre Date: Tue, 6 Aug 2019 23:49:51 +0200 Subject: [PATCH 03/13] Fix deprecated-copy errors and made deprecated-declarations just a warning --- oscar/Graphs/MinutesAtPressure.h | 13 +-- oscar/SleepLib/common.h | 6 +- oscar/SleepLib/loader_plugins/resmed_loader.h | 81 +------------------ oscar/SleepLib/machine_common.h | 13 +-- oscar/SleepLib/schema.h | 7 +- oscar/oscar.pro | 5 ++ 6 files changed, 11 insertions(+), 114 deletions(-) diff --git a/oscar/Graphs/MinutesAtPressure.h b/oscar/Graphs/MinutesAtPressure.h index 8dceb6c3..d7420ddf 100644 --- a/oscar/Graphs/MinutesAtPressure.h +++ b/oscar/Graphs/MinutesAtPressure.h @@ -22,18 +22,7 @@ struct PressureInfo peaktime = peakevents = 0; min_pressure = max_pressure = 0; } - PressureInfo(PressureInfo ©) { - code = copy.code; - minx = copy.minx; - maxx = copy.maxx; - peaktime = copy.peaktime; - peakevents = copy.peakevents; - min_pressure = copy.min_pressure; - max_pressure = copy.max_pressure; - times = copy.times; - events = copy.events; - chans = copy.chans; - } + PressureInfo(PressureInfo ©) = default; PressureInfo(ChannelID code, qint64 minx, qint64 maxx) : code(code), minx(minx), maxx(maxx) { diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h index 523d4757..21a31c86 100644 --- a/oscar/SleepLib/common.h +++ b/oscar/SleepLib/common.h @@ -69,11 +69,7 @@ struct ValueCount { ValueCount( EventDataType val, qint64 cnt, double pp) :value(val), count(cnt), p(pp) {} - ValueCount(const ValueCount ©) { - value = copy.value; - count = copy.count; - p = copy.p; - } + ValueCount(const ValueCount ©) = default; EventDataType value; qint64 count; double p; diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.h b/oscar/SleepLib/loader_plugins/resmed_loader.h index bd7101a4..75d84821 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.h +++ b/oscar/SleepLib/loader_plugins/resmed_loader.h @@ -125,82 +125,8 @@ struct STRRecord date=QDate(); } - STRRecord(const STRRecord & copy) { - maskon = copy.maskon; - maskoff = copy.maskoff; - maskdur = copy.maskdur; - maskevents = copy.maskevents; - mode = copy.mode; - rms9_mode = copy.rms9_mode; - set_pressure = copy.set_pressure; - epap = copy.epap; - max_pressure = copy.max_pressure; - min_pressure = copy.min_pressure; - max_ps = copy.max_ps; - min_ps = copy.min_ps; - ps = copy.ps; - max_epap = copy.max_epap; - min_epap = copy.min_epap; - ipap = copy.ipap; - max_ipap = copy.max_ipap; - min_ipap = copy.min_ipap; - epr = copy.epr; - epr_level = copy.epr_level; - sessionid = copy.sessionid; - ahi = copy.ahi; - ai = copy.ai; - oai = copy.oai; - hi = copy.hi; - uai = copy.uai; - cai = copy.cai; - csr = copy.csr; + STRRecord(const STRRecord & copy) = default; - date = copy.date; - leak50 = copy.leak50; - leak95 = copy.leak95; - leakmax = copy.leakmax; - rr50 = copy.rr50; - rr95 = copy.rr95; - rrmax = copy.rrmax; - mv50 = copy.mv50; - mv95 = copy.mv95; - mvmax = copy.mvmax; - ie50 = copy.ie50; - ie95 = copy.ie95; - iemax = copy.iemax; - tv50 = copy.tv50; - tv95 = copy.tv95; - tvmax = copy.tvmax; - mp50 = copy.mp50; - mp95 = copy.mp95; - mpmax = copy.mpmax; - - - tgtepap50 = copy.tgtepap50; - tgtepap95 = copy.tgtepap95; - tgtepapmax = copy.tgtepapmax; - tgtipap50 = copy.tgtipap50; - tgtipap95 = copy.tgtipap95; - tgtipapmax = copy.tgtipapmax; - - s_EPREnable = copy.s_EPREnable; - s_EPR_ClinEnable = copy.s_EPREnable; - s_RampEnable = copy.s_RampEnable; - s_RampTime = copy.s_RampTime; - - s_SmartStart = copy.s_SmartStart; - s_PtAccess = copy.s_PtAccess; - s_ABFilter = copy.s_ABFilter; - s_Mask = copy.s_Mask; - - s_Tube = copy.s_Tube; - s_ClimateControl = copy.s_ClimateControl; - s_HumEnable = copy.s_HumEnable; - s_HumLevel = copy.s_HumLevel; - s_TempEnable = copy.s_TempEnable; - s_Temp = copy.s_Temp; - ramp_pressure = copy.ramp_pressure; - } QVector maskon; QVector maskoff; @@ -347,10 +273,7 @@ struct STRFile { filename(QString()), edf(nullptr) {} STRFile(QString name, ResMedEDFParser *str) : filename(name), edf(str) {} - STRFile(const STRFile & copy) { - filename = copy.filename; - edf = copy.edf; - } + STRFile(const STRFile & copy) = default; ~STRFile() { } diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h index cac60064..e815bddf 100644 --- a/oscar/SleepLib/machine_common.h +++ b/oscar/SleepLib/machine_common.h @@ -92,18 +92,7 @@ enum PRTimeModes { //:short struct MachineInfo { MachineInfo() { type = MT_UNKNOWN; version = 0; cap=0; } - MachineInfo(const MachineInfo & copy) { - type = copy.type; - loadername = copy.loadername; - brand = copy.brand; - model = copy.model; - modelnumber = copy.modelnumber; - serial = copy.serial; - series = copy.series; - version = copy.version; - lastimported = copy.lastimported; - cap = copy.cap; - } + MachineInfo(const MachineInfo & copy) = default; MachineInfo(MachineType type, quint32 cap, QString loadername, QString brand, QString model, QString modelnumber, QString serial, QString series, QDateTime lastimported, int version) : type(type), cap(cap), loadername(loadername), brand(brand), model(model), modelnumber(modelnumber), serial(serial), series(series), lastimported(lastimported), version(version) {} diff --git a/oscar/SleepLib/schema.h b/oscar/SleepLib/schema.h index d30597e5..a91eade2 100644 --- a/oscar/SleepLib/schema.h +++ b/oscar/SleepLib/schema.h @@ -36,12 +36,7 @@ public: color = Qt::black; type = Calc_Zero; } - ChannelCalc(const ChannelCalc & copy) { - code = copy.code; - color = copy.color; - enabled = copy.enabled; - type = copy.type; - } + ChannelCalc(const ChannelCalc & copy) = default; ChannelCalc(ChannelID code, ChannelCalcType type, QColor color, bool enabled): code(code), type(type), color(color), enabled(enabled) {} diff --git a/oscar/oscar.pro b/oscar/oscar.pro index fc103de8..5ba9b31e 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -455,6 +455,11 @@ DISTFILES += help/default.css \ QMAKE_CFLAGS += -Werror QMAKE_CXXFLAGS += -Werror +# Make deprecation warnings just warnings +QMAKE_CFLAGS += -Wno-error=deprecated-declarations +QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations + + # Create a debug GUI build by adding "CONFIG+=memdebug" to your qmake command memdebug { !win32 { # add memory checking on Linux and macOS debug builds From ceba1e81eb42c9871c76f92e4c3cbc2ac4b0aa16 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Thu, 8 Aug 2019 16:24:30 -0700 Subject: [PATCH 04/13] Make date in calendar on Daily page format per regional settings. --- oscar/SleepLib/machine_common.h | 3 ++- oscar/daily.cpp | 4 ++-- oscar/docs/release_notes.html | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h index cac60064..9043d42c 100644 --- a/oscar/SleepLib/machine_common.h +++ b/oscar/SleepLib/machine_common.h @@ -52,6 +52,7 @@ enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_PERC, ST_90P, ST_MIN, ST_ enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURNAL, MT_POSITION, MT_UNCATEGORIZED = 99}; //void InitMapsWithoutAwesomeInitializerLists(); +/***** NEVER USED --- // PAP Device Capabilities const quint32 CAP_Fixed = 0x0000001; // Constant PAP const quint32 CAP_Variable = 0x0000002; // Variable Base (EPAP) pressure @@ -69,7 +70,7 @@ const quint32 PAP_BiLevelAutoVariable = 0x0010; // Auto BiLevel with full r const quint32 PAP_ASV_Fixed = 0x0020; // ASV with fixed EPAP const quint32 PAP_ASV_Variable = 0x0040; // ASV with full ranging capabilities const quint32 PAP_SplitNight = 0x8000; // Split night capabilities - +*****/ /*! \enum CPAPMode diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 6be789db..ec368fe2 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -583,7 +583,7 @@ void Daily::ReloadGraphs() ui->calendar->setSelectedDate(d); ui->calendar->blockSignals(false); Load(d); - ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate)); + ui->calButton->setText(ui->calendar->selectedDate().toString(MedDateFormat)); graphView()->redraw(); // qDebug() << "Finished ReloadGraphs in Daily object"; // sleep(3); @@ -826,7 +826,7 @@ void Daily::on_ReloadDay() //GraphView->fadeIn(fadedir); GraphView->redraw(); - ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate)); + ui->calButton->setText(ui->calendar->selectedDate().toString(MedDateFormat)); ui->calendar->setFocus(Qt::ActiveWindowFocusReason); if (p_profile->general->unitSystem()==US_English) { diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index 6dc66e92..6b01d55d 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -6,6 +6,16 @@ Which was written and copyright 2011-2018 © Mark Watkins

    +

    +Changes and fixes in OSCAR AFTER v1.1.0-testing-3 +

      +
    • Portions of OSCAR are © 2019 by The OSCAR Team
      • +
    • [new]
      • +
    • [fix]
      • +
    • [fix] Calendar date now formatted per national settings
      • +
    +

    +

    Changes and fixes in OSCAR v1.1.0-testing-3
    NOTE: Translations have NOT yet been updated for these changes From 998eab61807d00e844f3c450bb163dcbc0c92442 Mon Sep 17 00:00:00 2001 From: harre Date: Fri, 9 Aug 2019 12:35:29 +0200 Subject: [PATCH 05/13] Another fix for deprecated-copy --- oscar/updateparser.h | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/oscar/updateparser.h b/oscar/updateparser.h index a086f8d8..eaa6b3a2 100644 --- a/oscar/updateparser.h +++ b/oscar/updateparser.h @@ -43,14 +43,7 @@ class Update */ struct Release { Release() {} - Release(const Release ©) { - version = copy.version; - codename = copy.version; - notes = copy.notes; - info_url = copy.info_url; - status = copy.status; - updates = copy.updates; - } + Release(const Release ©) = default; Release(QString ver, QString code, UpdateStatus stat) { version = ver; codename = code; status = stat; } QString version; @@ -94,26 +87,7 @@ class UpdateParser: public QXmlDefaultHandler class PackageUpdate { public: PackageUpdate() {} - PackageUpdate(const PackageUpdate & copy) { - // Seriously, why do I still have to do this crud by hand - // Where is the shortcut to save time here in the latest C++ extensions? - name = copy.name; - displayName = copy.displayName; - description = copy.description; - versionString = copy.versionString; - releaseDate = copy.releaseDate; - defaultInstall = copy.defaultInstall; - installScript = copy.installScript; - dependencies = copy.dependencies; - script = copy.script; - forcedInstall = copy.forcedInstall; - downloadArchives = copy.downloadArchives; - license = copy.license; - sha1 = copy.sha1; - compressedSize = copy.compressedSize; - uncompressedSize = copy.uncompressedSize; - os = copy.os; - } + PackageUpdate(const PackageUpdate & copy) = default; QString name; QString displayName; From fc3ec0d4857be78ba29f014d0860b67cee7fd5cd Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Fri, 9 Aug 2019 15:32:37 -0700 Subject: [PATCH 06/13] View/Reset Graphs now additionally enables all graphs and all event flags --- oscar/Graphs/gGraphView.cpp | 2 +- oscar/daily.cpp | 25 +++++++++++++++++++++++-- oscar/docs/release_notes.html | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp index 9ca8074e..0e057c9e 100644 --- a/oscar/Graphs/gGraphView.cpp +++ b/oscar/Graphs/gGraphView.cpp @@ -3239,7 +3239,6 @@ void gGraphView::keyPressEvent(QKeyEvent *event) //qDebug() << "Keypress??"; } - void gGraphView::setDay(Day *day) { @@ -3251,6 +3250,7 @@ void gGraphView::setDay(Day *day) ResetBounds(false); } + bool gGraphView::isEmpty() { bool res = true; diff --git a/oscar/daily.cpp b/oscar/daily.cpp index ec368fe2..fe58d54f 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -852,6 +852,28 @@ void Daily::ResetGraphLayout() void Daily::ResetGraphOrder() { GraphView->resetGraphOrder(true); + + // Enable all graphs (make them not hidden) + for (int i=0;igraphCombo->count();i++) { + // If disabled, emulate a click to enable the graph + if (!ui->graphCombo->itemData(i,Qt::UserRole).toBool()) { + qDebug() << "resetting graph" << i; + Daily::on_graphCombo_activated(i); + } + } + + // Mark all events as active + for (int i=0;ieventsCombo->count();i++) { + // If disabled, emulate a click to enable the event + ChannelID code = ui->eventsCombo->itemData(i, Qt::UserRole).toUInt(); + schema::Channel * chan = &schema::channel[code]; + if (!chan->enabled()) { + qDebug() << "resetting event" << i; + Daily::on_eventsCombo_activated(i); + } + } + + // Reset graph heights (and repaint) ResetGraphLayout(); } @@ -2416,6 +2438,7 @@ void Daily::on_graphCombo_activated(int index) GraphView->updateScale(); GraphView->redraw(); } + void Daily::updateCube() { //brick.. @@ -2495,7 +2518,6 @@ void Daily::updateGraphCombo() } ui->graphCombo->setCurrentIndex(0); - updateCube(); } @@ -2504,7 +2526,6 @@ void Daily::on_eventsCombo_activated(int index) if (index<0) return; - ChannelID code = ui->eventsCombo->itemData(index, Qt::UserRole).toUInt(); schema::Channel * chan = &schema::channel[code]; diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index 6b01d55d..bb52b713 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -11,7 +11,7 @@ Which was written and copyright 2011-2018 © Mark Watkins

    • Portions of OSCAR are © 2019 by The OSCAR Team
    • [new]
      • -
    • [fix]
      • +
    • [fix] View/Reset Graphs now enables all graphs and all event flags
    • [fix] Calendar date now formatted per national settings

    From 83a01fa203a0425c2b9c6825059766758011ff32 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Fri, 9 Aug 2019 22:54:00 -0700 Subject: [PATCH 07/13] Date bar on bottom of Daily graph now in local time when no line cursor displayed, and formatting updated --- oscar/Graphs/gGraphView.cpp | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp index 9ca8074e..cfc3b65c 100644 --- a/oscar/Graphs/gGraphView.cpp +++ b/oscar/Graphs/gGraphView.cpp @@ -1554,6 +1554,30 @@ void gGraphView::paintGL() QString gGraphView::getRangeString() { + QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx); + QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx); + + QDate std = st.date(); + QDate etd = et.date(); + // Format if Begin and End are on different days + if (std != etd) { + QString txt = st.toString(" d MMM [ HH:mm:ss") + " - " + et.toString("HH:mm:ss ] d MMM yyyy"); + return txt; + } + + qint64 diff = m_maxx - m_minx; + QString fmt; + + if (diff > 60000) { + fmt = "HH:mm:ss"; + } else { + fmt = "HH:mm:ss:zzz"; + } + QString txt = st.toString(QObject::tr("d MMM yyyy [ %1 - %2 ]").arg(fmt).arg(et.toString(fmt))) ; + + return txt; + +/***** WTF is this code trying to do? Replaced by above 8/9/2019 // a note about time zone usage here // even though this string will be displayed to the user // the graph is drawn using UTC times, so no conversion @@ -1566,7 +1590,7 @@ QString gGraphView::getRangeString() qint64 diff = m_maxx - m_minx; - if (diff > 86400000) { + if (diff > 86400000) { // 86400000 is one day, in milliseconds int days = ceil(double(m_maxx-m_minx) / 86400000.0); qint64 minx = floor(double(m_minx)/86400000.0); @@ -1584,12 +1608,11 @@ QString gGraphView::getRangeString() } else { fmt = "HH:mm:ss:zzz"; } - QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::UTC); - QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::UTC); QString txt = st.toString(QObject::tr("d MMM [ %1 - %2 ]").arg(fmt).arg(et.toString(fmt))) ; return txt; +*/ } void gGraphView::leaveEvent(QEvent * event) From cd30fd73ab2b0666b6804248d9388ac8e1bb8bbe Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Fri, 9 Aug 2019 23:00:17 -0700 Subject: [PATCH 08/13] Release notes for Daily page date bar change --- oscar/docs/release_notes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index bb52b713..eccd8655 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -10,7 +10,7 @@ Which was written and copyright 2011-2018 © Mark Watkins Changes and fixes in OSCAR AFTER v1.1.0-testing-3
    • Portions of OSCAR are © 2019 by The OSCAR Team
      • -
    • [new]
      • +
    • [fix] Date bar on bottom of Daily graph now in local time when no line cursor displayed, and formatting improved
    • [fix] View/Reset Graphs now enables all graphs and all event flags
    • [fix] Calendar date now formatted per national settings
    From edfbb692e9d19f7dbac6c5d59c6c483abaa9bf56 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Fri, 9 Aug 2019 23:14:32 -0700 Subject: [PATCH 09/13] Tweak format of date bar on Daily page slightly. --- oscar/Graphs/gGraphView.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp index 846d251a..68f06828 100644 --- a/oscar/Graphs/gGraphView.cpp +++ b/oscar/Graphs/gGraphView.cpp @@ -1559,12 +1559,14 @@ QString gGraphView::getRangeString() QDate std = st.date(); QDate etd = et.date(); + // Format if Begin and End are on different days if (std != etd) { QString txt = st.toString(" d MMM [ HH:mm:ss") + " - " + et.toString("HH:mm:ss ] d MMM yyyy"); return txt; } + // Range is within one (local) day qint64 diff = m_maxx - m_minx; QString fmt; From 3492323216ef8da57b72db68afb3abd5a216a010 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Mon, 12 Aug 2019 15:59:47 -0700 Subject: [PATCH 10/13] =?UTF-8?q?Change=20Romanian=20name=20to=20Rom=C3=A2?= =?UTF-8?q?ne=C8=99te,=20clarify=20which=20translation=20file=20qDebug=20s?= =?UTF-8?q?tatements=20refer=20to.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oscar/translation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oscar/translation.cpp b/oscar/translation.cpp index a377abe4..d8cb45c3 100644 --- a/oscar/translation.cpp +++ b/oscar/translation.cpp @@ -50,7 +50,7 @@ void initTranslations() langNames["en_UK"] = "English (UK)"; langNames["nl"] = "Nederlands"; langNames["pt_BR"] = "Portugues (BR)"; - langNames["ro"] = "Romanian"; + langNames["ro"] = "Românește"; langNames[DefaultLanguage]="English (US)"; @@ -176,7 +176,7 @@ void initTranslations() QString qtLang = language.left(2); if ( qtLang.compare("zh") == 0 ) qtLang.append("_CN"); - qDebug() << "Loading" << langname << "translation" << "qt_" + qtLang + ".qm" << "from" << qtLangPath.toLocal8Bit().data(); + qDebug() << "Loading" << langname << "QT translation" << "qt_" + qtLang + ".qm" << "from" << qtLangPath.toLocal8Bit().data(); QTranslator * qtranslator = new QTranslator(); if (!langfile.isEmpty() && !qtranslator->load("qt_" + qtLang + ".qm", qtLangPath)) { @@ -186,7 +186,7 @@ void initTranslations() qApp->installTranslator(qtranslator); // Install OSCAR translation files - qDebug() << "Loading" << langname << "translation" << langfile.toLocal8Bit().data() << "from" << langpath.toLocal8Bit().data(); + qDebug() << "Loading" << langname << "OSCAR translation" << langfile.toLocal8Bit().data() << "from" << langpath.toLocal8Bit().data(); QTranslator * translator = new QTranslator(); if (!langfile.isEmpty() && !translator->load(langfile, langpath)) { From e315baf6dfe1dcf2007cf3a86ba962ba5c6324da Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Mon, 12 Aug 2019 16:02:53 -0700 Subject: [PATCH 11/13] Test builds use settings key of oscar-test, branch builds oscar-branch, and release builds just oscar. Default data directory named similarly. --- oscar/SleepLib/common.cpp | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index 78947c21..9c0aebca 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -90,23 +90,35 @@ const QString getDeveloperDomain() const QString getAppName() { QString name = STR_AppName; - if ((GIT_BRANCH != "master") || - (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || - (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || - (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) { + + // Append branch if there is a branch specified + if (GIT_BRANCH != "master") { name += "-"+GIT_BRANCH; +// qDebug() << "getAppName, not master, name is" << name << "branch is" << GIT_BRANCH; } + + // Append "-test" if not release + else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || + (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) )) { + name += "-test"; +// qDebug() << "getAppName, not release, name is" << name << "release type is" << ReleaseStatus; + } + return name; } const QString getModifiedAppData() { QString appdata = STR_AppData; - if ((GIT_BRANCH != "master") || - (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || - (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || - (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) { + + // Append branch if there is a branch specified + if (GIT_BRANCH != "master") appdata += "-"+GIT_BRANCH; + + // Append "-test" if not release + else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || + (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) )) { + appdata += "-test"; } return appdata; } @@ -230,7 +242,7 @@ QStringList makeBuildInfo (QString relinfo, QString forcedEngine){ branch = QObject::tr("Branch:") + " " + GIT_BRANCH + ", "; } buildInfo << branch + (QObject::tr("Revision")) + " " + GIT_REVISION; - if (GIT_BRANCH != "master") + if (getAppName() != STR_AppName) // Report any non-standard app key buildInfo << (QObject::tr("App key:") + " " + getAppName()); buildInfo << QString(""); buildInfo << (QObject::tr("Operating system:") + " " + QSysInfo::prettyProductName()); From 8a98cf1400214b87c211e0983314b171da27bb05 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Mon, 12 Aug 2019 16:04:33 -0700 Subject: [PATCH 12/13] Windows installers now support Oscar, Oscar (test), Oscar 32-bit, and Oscar 32-bit (test). First two are 64-bit. --- Building/Windows/BuildInstall.iss | 44 +++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/Building/Windows/BuildInstall.iss b/Building/Windows/BuildInstall.iss index faa3b7fa..1bb99ff3 100644 --- a/Building/Windows/BuildInstall.iss +++ b/Building/Windows/BuildInstall.iss @@ -7,29 +7,45 @@ #define MyAppVersion MyMajorVersion+"."+MyMinorVersion+"."+MyRevision+"-"+MyReleaseStatus #if MyReleaseStatus == "r" -#define MyAppVersion MyAppVersion+MyBuildNumber + #define MyAppVersion MyAppVersion+MyBuildNumber #else -#define MyAppVersion MyAppVersion+"-"+MyBuildNumber + #define MyAppVersion MyAppVersion+"-"+MyBuildNumber #endif -#define MyAppName "OSCAR" #define MyAppPublisher "The OSCAR Team" #define MyAppExeName "OSCAR.exe" +#define MyAppName "OSCAR" [Setup] SetupLogging=yes ; NOTE: The value of AppId uniquely identifies this application. ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -; Now using separate AppID for Win32 and Win64 -- GTS 4/6/2019 +; Now using separate AppID for Win32 and Win64 and for test builds -- GTS 4/6/2019 #if MyPlatform == "Win64" ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 - AppId={{FC6F08E6-69BF-4469-ADE3-78199288D305} + #if MyReleaseStatus == "r" || MyReleaseStatus == "rc" + AppId={{FC6F08E6-69BF-4469-ADE3-78199288D305} + #define MyGroupName "OSCAR" + #define MyDirName "OSCAR" + #else + AppId={{C5E23210-4BC5-499D-A0E4-81192748D322} + #define MyGroupName "OSCAR (test)" + #define MyDirName "OSCAR-test" + #endif ; DefaultDirName={%PROGRAMFILES|{pf}}\OSCAR ; above doesn't work. Always returns x86 directory #else // 32-bit - AppId={{4F3EB81B-1866-4124-B388-5FB5DA34FFDD} + #if MyReleaseStatus == "r" || MyReleaseStatus == "rc" + AppId={{4F3EB81B-1866-4124-B388-5FB5DA34FFDD} + #define MyGroupName "OSCAR 32-bit" + #define MyDirName "OSCAR" + #else + AppId={{B0382AB3-ECB4-4F9D-ABB1-F6EF73D4E3DB} + #define MyGroupName "OSCAR 32-bit (test)" + #define MyDirName "OSCAR-test" + #endif ; DefaultDirName={%PROGRAMFILES(X86)|{pf}}\OSCAR #endif AppName={#MyAppName} @@ -38,20 +54,20 @@ AppVerName={#MyAppName} {#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix AppPublisher={#MyAppPublisher} AppCopyright=Copyright 2019 {#MyAppPublisher} ; **** AppCopyright=Copyright {GetDateTimeString('yyyy', #0, #0)} {%MyAppPublisher} -DefaultDirName={pf}\OSCAR -DefaultGroupName={#MyAppName} +DefaultDirName={pf}\{#MyDirName} +DefaultGroupName={#MyGroupName} OutputDir=.\Installer #if MyReleaseStatus == "r" -OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}{#MySuffix} + OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}{#MySuffix} #else -OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix} + OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix} #endif SetupIconFile=setup.ico Compression=lzma SolidCompression=yes VersionInfoCompany={#MyAppPublisher} VersionInfoProductName={#MyAppName} -UninstallDisplayName={#MyAppName} +UninstallDisplayName={#MyGroupName} UninstallDisplayIcon={app}\{#MyAppExeName} [Languages] @@ -89,9 +105,9 @@ Source: ".\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs cre ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] -Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon +Name: "{group}\{#MyGroupName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{group}\{cm:UninstallProgram,{#MyGroupName}}"; Filename: "{uninstallexe}" +Name: "{commondesktop}\{#MyGroupName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon ; Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon [Messages] From 4b67af970f35969ed7aa9c446e4d8d2f7e3c3e21 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Mon, 12 Aug 2019 16:26:35 -0700 Subject: [PATCH 13/13] Update release notes for recent changes. --- oscar/docs/release_notes.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index eccd8655..e60df6b2 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -10,6 +10,8 @@ Which was written and copyright 2011-2018 © Mark Watkins Changes and fixes in OSCAR AFTER v1.1.0-testing-3
    • Portions of OSCAR are © 2019 by The OSCAR Team
      • +
    • [new] Windows installers support Oscar, Oscar 32-bit, Oscar (test) and Oscar 32-bit (test)
      • +
    • [fix] Release builds use a Settings key of OSCAR, Test builds use OSCAR-test, and Branch builds use OSCAR-branch. Default data directories are similarly named.
    • [fix] Date bar on bottom of Daily graph now in local time when no line cursor displayed, and formatting improved
    • [fix] View/Reset Graphs now enables all graphs and all event flags
    • [fix] Calendar date now formatted per national settings