chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make date in calendar on Daily page format per regional settings.

Browse Source
This commit is contained in:
Seeker4 2019-08-08 16:24:30 -07:00
parent 5cf6e14816
commit ceba1e81eb
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oscar/SleepLib/machine_common.h
View File

@ -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

4
oscar/daily.cpp
View File

@ -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) {

10
oscar/docs/release_notes.html
View File

@ -6,6 +6,16 @@
Which was written and copyright 2011-2018 &copy; Mark Watkins
</p>
<p>
<b>Changes and fixes in OSCAR <u>AFTER</u> v1.1.0-testing-3</b>
<ul>
<li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
<li>[new] </li>
<li>[fix] </li>
<li>[fix] Calendar date now formatted per national settings</li>
</ul>
</p>
<p>
<b>Changes and fixes in OSCAR v1.1.0-testing-3</b>
<br/><b>NOTE: Translations have NOT yet been updated for these changes</b>