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

Revert "Spelling fixes, SummaryChart day counts, misc crud"

Browse Source 
This reverts commit 899b38737a.
This commit is contained in:
Mark Watkins 2011-09-24 13:59:23 +10:00
parent 899b38737a
commit 26e96a3166
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Graphs/gSummaryChart.cpp
View File

@ -281,15 +281,13 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
//if (!tmp) continue;
if (m_type[j]==ST_MAX) {
if (tmp>totalvalues[j]) totalvalues[j]=tmp;
totalcounts[j]=1;
} else if (m_type[j]==ST_MIN) {
if (tmp<totalvalues[j]) totalvalues[j]=tmp;
totalcounts[j]=1;
} else {
totalvalues[j]+=tmp;
totalcounts[j]++;
}
//if (tmp)
if (tmp)
totalcounts[j]++;
tmp-=miny;
h=tmp*ymult; // height in pixels
@ -397,7 +395,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
//
}
}*/
a+="Days="+QString::number(total_days,'f',0);
a+="Days="+QString::number(totalcounts[0],'f',0);
GetTextExtent(a,x,y);
px-=30+x;
//w.renderText(a,px+24,py+5);

5
docs/channels.xml
View File

@ -13,7 +13,7 @@ One id code per item
<channel id="0x1002" class="data" name="Obstructive" details="Obstructive Apnea" label="O" color="#40c0ff"/>
<channel id="0x1003" class="data" name="Hypopnea" details="Hypopnea" label="H" color="blue"/>
<channel id="0x1004" class="data" name="Apnea" details="Unspecified Apnea" label="A" color="dark green"/>
<channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" color="#202020"/>
<channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" color="dark grey"/>
<channel id="0x1006" class="data" name="RERA" details="Respiratory Effort Related Arousal" label="RERA" color="gold"/>
<channel id="0x1007" class="data" name="VSnore" details="Vibratory Snore" label="VS" unit="" color="red"/>
<channel id="0x1008" class="data" name="VSnore2" details="Vibratory Snore 2" label="VS2" unit="" color="orange"/>
@ -53,7 +53,7 @@ One id code per item
<channel id="0x1156" class="data" name="PRS1_0C" details="Unknown 0C" label="U0C" unit="" color="black"/>
<channel id="0x1157" class="data" name="PRS1_0E" details="Unknown 0E" label="U0E" unit="" color="dark green"/>
<channel id="0x1158" class="data" name="PRS1_10" details="Unknown 10" label="U10" unit="" color="black"/>
<channel id="0x1159" class="data" name="PRS1_12" details="Unknown 12" label="U12" unit="" color="black"/>
<channel id="0x1159" class="data" name="PRS1_12" details="PRS1 Unknown 12" label="U12" unit="" color="black"/>
<channel id="0x1160" class="data" name="RMS9_E01" details="RMS9 Empty 1" label="E01" unit="" color="black"/>
<channel id="0x1161" class="data" name="RMS9_E02" details="RMS9 Empty 2" label="U02" unit="" color="black"/>
@ -76,7 +76,6 @@ One id code per item
<channel id="0x2001" class="data" name="ZEOBW" details="Zeo Brainwave" label="ZeoWave" color="black"/>
</group>
<group name="GENERAL">
<!-- Channel List -->
<channel id="0x0800" class="data" name="BPSys" details="Blood Pressure Systolic" label="BPS" unit="mmHg" color="red"/>
<channel id="0x0801" class="data" name="BPDia" details="Blood Pressure Diastolic" label="BPD" unit="mmHg" color="blue"/>
<channel id="0x0802" class="data" name="Glucose" details="Blood Glucose" label="BGL" unit="mmol/L" color="black"/>

2
mainwindow.cpp
View File

@ -410,7 +410,7 @@ void MainWindow::replyFinished(QNetworkReply * reply)
QMessageBox::information(this,"Laziness Warning","I'd love to do it for you automatically, but it's not implemented yet.. :)",QMessageBox::Ok);
}
} else {
QMessageBox::information(this,"SleepyHead v"+a,"You're already up to date!",QMessageBox::Ok);
QMessageBox::information(this,"SleepyHead v"+a,"Your already up to date!",QMessageBox::Ok);
}
}
} else {

2
preferencesdialog.cpp
View File

@ -87,6 +87,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
ui->eventTable->setCellWidget(row,0,c);
ui->eventTable->setCellWidget(row,1,pb);
QColor a=ci.value()->defaultColor();//(rand() % 255, rand() % 255, rand() % 255, 255);
QPalette p(a,a,a,a,a,a,a);
@ -96,7 +97,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
row++;
}
}
ui->eventTable->sortByColumn(2,Qt::AscendingOrder);
QLocale locale=QLocale::system();
QString shortformat=locale.dateFormat(QLocale::ShortFormat);
if (!shortformat.toLower().contains("yyyy")) {

4
preferencesdialog.ui
View File

@ -29,7 +29,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
<number>3</number>
</property>
<widget class="QWidget" name="profileTab">
<attribute name="title">
@ -348,7 +348,7 @@
<item>
<widget class="QCheckBox" name="memoryHogCheckbox">
<property name="toolTip">
<string>Turn this off if you are worried about SleepyHead consuming too much memory.
<string>Turn this off if your worried about SleepyHead consuming too much memory.
It will be faster changing to days you've already been to if you leave it on. </string>
</property>
<property name="text">