chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui build warning fixes, AHI calc dropoff

Browse Source
This commit is contained in:
Mark Watkins 2011-11-30 16:56:20 +10:00
parent 0297e9d601
commit 669b2a3b2b
5 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SleepLib/calcs.cpp
View File

@ -274,7 +274,7 @@ int CalcAHIGraph::calculate(Session *session)
AHI->AddEvent(ti,ahi); AHI->AddEvent(ti,ahi);
ti+=winsize; ti+=winsize;
} }
AHI->AddEvent(ti,ahi); AHI->AddEvent(ti,0);
return AHI->count(); return AHI->count();
} }

5
daily.cpp
View File

@ -188,8 +188,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAP,Qt::yellow,square))); PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAP,Qt::yellow,square)));
PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAPHi,Qt::red,square))); PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAPHi,Qt::red,square)));
//AHI->AddLayer(AddCPAP(new gLineChart(CPAP_AHI,QColor("light green"),square))); AHI->AddLayer(AddCPAP(new gLineChart(CPAP_AHI,QColor("light green"),square)));
AHI->AddLayer(AddCPAP(new AHIChart(QColor("#37a24b"))));
//AHI->AddLayer(AddCPAP(new AHIChart(QColor("#37a24b"))));
LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,Qt::darkYellow,square))); LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,Qt::darkYellow,square)));
LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_MaxLeak,Qt::darkRed,square))); LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_MaxLeak,Qt::darkRed,square)));
SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::darkGray,true))); SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::darkGray,true)));

4
preferencesdialog.cpp
View File

@ -28,10 +28,6 @@ MaskProfile masks[]={
}; };
const int num_masks=sizeof(masks)/sizeof(MaskProfile); const int num_masks=sizeof(masks)/sizeof(MaskProfile);
void PreferencesDialog::resizeEvent(QResizeEvent *e)
{
}
PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
QDialog(parent), QDialog(parent),

1
preferencesdialog.h
View File

@ -70,7 +70,6 @@ private slots:
void on_maskTypeCombo_activated(int index); void on_maskTypeCombo_activated(int index);
private: private:
virtual void resizeEvent(QResizeEvent *);
void resetGraphModel(); void resetGraphModel();
Ui::PreferencesDialog *ui; Ui::PreferencesDialog *ui;
Profile * profile; Profile * profile;

16
preferencesdialog.ui
View File

@ -270,12 +270,6 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</item> </item>
</layout> </layout>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
</widget> </widget>
</item> </item>
<item> <item>
@ -344,20 +338,12 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
</layout> </layout>
<zorder>removeImportLocation</zorder>
<zorder>addImportLocation</zorder>
<zorder>verticalSpacer_5</zorder>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
<zorder>label</zorder>
<zorder>label_3</zorder>
<zorder>groupBox_6</zorder>
<zorder>groupBox_3</zorder>
<zorder>line</zorder>
</widget> </widget>
<widget class="QWidget" name="maskTab"> <widget class="QWidget" name="maskTab">
<attribute name="title"> <attribute name="title">
@ -543,7 +529,7 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget2">
<layout class="QGridLayout" name="gridLayout_8"> <layout class="QGridLayout" name="gridLayout_8">
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_28"> <widget class="QLabel" name="label_28">