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

Rename mainwindow qsplitters, suppress some warnings

Browse Source
This commit is contained in:
Mark Watkins 2014-10-03 12:31:51 +10:00
parent 45559ac721
commit 1094159657
7 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sleepyhead/Graphs/MinutesAtPressure.cpp
View File

@ -221,7 +221,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
// left = rect.left(); // left = rect.left();
QHash<ChannelID, QMap<EventStoreType, EventDataType> >::iterator eit; QHash<ChannelID, QMap<EventStoreType, EventDataType> >::iterator eit;
QHash<ChannelID, QMap<EventStoreType, EventDataType> >::iterator ev_end = events.end(); //QHash<ChannelID, QMap<EventStoreType, EventDataType> >::iterator ev_end = events.end();
QMap<EventStoreType, EventDataType>::iterator vit; QMap<EventStoreType, EventDataType>::iterator vit;
@ -547,7 +547,7 @@ skip:
QList<EventStoreType> trash; QList<EventStoreType> trash;
for (it = times.begin(); it != times_end; ++it) { for (it = times.begin(); it != times_end; ++it) {
EventStoreType key = it.key(); //EventStoreType key = it.key();
int value = it.value(); int value = it.value();
// if (value == 0) { // if (value == 0) {
// trash.append(key); // trash.append(key);
@ -637,7 +637,7 @@ void MinutesAtPressure::recalcFinished()
} }
bool MinutesAtPressure::mouseMoveEvent(QMouseEvent *event, gGraph *graph) bool MinutesAtPressure::mouseMoveEvent(QMouseEvent *, gGraph *graph)
{ {
// int y = event->y() - m_rect.top(); // int y = event->y() - m_rect.top();
// int x = event->x() - graph->graphView()->titleWidth; // int x = event->x() - graph->graphView()->titleWidth;

10
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -1629,10 +1629,10 @@ bool PRS1Import::ParseSummaryF3()
session->set_first(qint64(summary->timestamp) * 1000L); session->set_first(qint64(summary->timestamp) * 1000L);
EventDataType epap = data[0x04] | (data[0x05] << 8); // EventDataType epap = data[0x04] | (data[0x05] << 8);
EventDataType ipap = data[0x06] | (data[0x07] << 8); // EventDataType ipap = data[0x06] | (data[0x07] << 8);
EventDataType f1 = data[0x08] | (data[0x09] << 8); // EventDataType f1 = data[0x08] | (data[0x09] << 8);
return true; return true;
} }
@ -1667,7 +1667,7 @@ bool PRS1Import::ParseSummaryF5V0()
session->settings[CPAP_IPAP] = imax_epap/10.0f; session->settings[CPAP_IPAP] = imax_epap/10.0f;
} else if (cpapmode == MODE_ASV_VARIABLE_EPAP) { } else if (cpapmode == MODE_ASV_VARIABLE_EPAP) {
int imax_ipap = imax_epap + imax_ps; //int imax_ipap = imax_epap + imax_ps;
int imin_ipap = imin_epap + imin_ps; int imin_ipap = imin_epap + imin_ps;
session->settings[CPAP_EPAPLo] = imin_epap / 10.0f; session->settings[CPAP_EPAPLo] = imin_epap / 10.0f;
@ -1753,7 +1753,7 @@ bool PRS1Import::ParseSummaryF5V1()
session->settings[CPAP_IPAP] = imax_epap/10.0f; session->settings[CPAP_IPAP] = imax_epap/10.0f;
} else if (cpapmode == MODE_ASV_VARIABLE_EPAP) { } else if (cpapmode == MODE_ASV_VARIABLE_EPAP) {
int imax_ipap = imax_epap + imax_ps; //int imax_ipap = imax_epap + imax_ps;
int imin_ipap = imin_epap + imin_ps; int imin_ipap = imin_epap + imin_ps;
session->settings[CPAP_EPAPLo] = imin_epap / 10.0f; session->settings[CPAP_EPAPLo] = imin_epap / 10.0f;

24
sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp
View File

@ -135,11 +135,11 @@ int WeinmannLoader::Open(QString path)
int WeekComplianceOffset = index["WeekComplianceOffset"]; int WeekComplianceOffset = index["WeekComplianceOffset"];
int WCD_Pin_Offset = index["WCD_Pin_Offset"]; int WCD_Pin_Offset = index["WCD_Pin_Offset"];
int WCD_Pex_Offset = index["WCD_Pex_Offset"]; // int WCD_Pex_Offset = index["WCD_Pex_Offset"];
int WCD_Snore_Offset = index["WCD_Snore_Offset"]; // int WCD_Snore_Offset = index["WCD_Snore_Offset"];
int WCD_Lf_Offset = index["WCD_Lf_Offset"]; // int WCD_Lf_Offset = index["WCD_Lf_Offset"];
int WCD_Events_Offset = index["WCD_Events_Offset"]; // int WCD_Events_Offset = index["WCD_Events_Offset"];
int WCD_IO_Offset = index["WCD_IO_Offset"]; // int WCD_IO_Offset = index["WCD_IO_Offset"];
int comp_start = index[CompOffset]; int comp_start = index[CompOffset];
int wccount = index["WeekComplianceCount"]; int wccount = index["WeekComplianceCount"];
@ -197,9 +197,9 @@ int WeinmannLoader::Open(QString path)
float flow_sample_duration = 1000.0 / 5; float flow_sample_duration = 1000.0 / 5;
float pressure_sample_duration = 1000.0 / 2; float pressure_sample_duration = 1000.0 / 2;
float amv_sample_duration = 200 * 10; //float amv_sample_duration = 200 * 10;
int c = index[DayComplianceCount]; //int c = index[DayComplianceCount];
for (int i=0; i < 5; i++) { for (int i=0; i < 5; i++) {
int year = QString().sprintf("%02i%02i", p[0], p[1]).toInt(); int year = QString().sprintf("%02i%02i", p[0], p[1]).toInt();
int month = p[2]; int month = p[2];
@ -348,13 +348,13 @@ int WeinmannLoader::Open(QString path)
//EventList * MV = sess->AddEventList(CPAP_Snore, EVL_Waveform, 1.0f, 0.0, 0.0, 0.0, amv_sample_duration); //EventList * MV = sess->AddEventList(CPAP_Snore, EVL_Waveform, 1.0f, 0.0, 0.0, 0.0, amv_sample_duration);
//MV->AddWaveform(ti, (unsigned char *)&mv[ci.amv_start], ci.amv_size, (ci.amv_size/(1000/amv_sample_duration)) * 1000L); //MV->AddWaveform(ti, (unsigned char *)&mv[ci.amv_start], ci.amv_size, (ci.amv_size/(1000/amv_sample_duration)) * 1000L);
EventList * L = sess->AddEventList(CPAP_Leak, EVL_Event); // EventList * L = sess->AddEventList(CPAP_Leak, EVL_Event);
EventList * S = sess->AddEventList(CPAP_Snore, EVL_Event); // EventList * S = sess->AddEventList(CPAP_Snore, EVL_Event);
EventList * OA = sess->AddEventList(CPAP_Obstructive, EVL_Event); EventList * OA = sess->AddEventList(CPAP_Obstructive, EVL_Event);
EventList * A = sess->AddEventList(CPAP_Apnea, EVL_Event); EventList * A = sess->AddEventList(CPAP_Apnea, EVL_Event);
EventList * H = sess->AddEventList(CPAP_Hypopnea, EVL_Event); EventList * H = sess->AddEventList(CPAP_Hypopnea, EVL_Event);
EventList * FL = sess->AddEventList(CPAP_FlowLimit, EVL_Event); EventList * FL = sess->AddEventList(CPAP_FlowLimit, EVL_Event);
EventList * VS = sess->AddEventList(CPAP_VSnore, EVL_Event); // EventList * VS = sess->AddEventList(CPAP_VSnore, EVL_Event);
quint64 tt = ti; quint64 tt = ti;
quint64 step = sess->length() / ci.event_recs; quint64 step = sess->length() / ci.event_recs;
unsigned char *p = &ev[ci.event_start]; unsigned char *p = &ev[ci.event_start];
@ -563,8 +563,8 @@ int WeinmannLoader::Open(QString path)
void WeinmannLoader::initChannels() void WeinmannLoader::initChannels()
{ {
using namespace schema; //using namespace schema;
Channel * chan = nullptr; //Channel * chan = nullptr;
// channel.add(GRP_CPAP, chan = new Channel(INTP_SmartFlex = 0x1165, SETTING, SESSION, // channel.add(GRP_CPAP, chan = new Channel(INTP_SmartFlex = 0x1165, SETTING, SESSION,
// "INTPSmartFlex", QObject::tr("SmartFlex"), // "INTPSmartFlex", QObject::tr("SmartFlex"),
// QObject::tr("Weinmann pressure relief setting."), // QObject::tr("Weinmann pressure relief setting."),

2
sleepyhead/SleepLib/session.cpp
View File

@ -356,7 +356,7 @@ bool Session::StoreSummary()
bool Session::LoadSummary() bool Session::LoadSummary()
{ {
static int sumcnt = 0; //static int sumcnt = 0;
if (s_summary_loaded) return true; if (s_summary_loaded) return true;
QString filename = s_machine->getSummariesPath() + QString().sprintf("%08lx.000", s_session); QString filename = s_machine->getSummariesPath() + QString().sprintf("%08lx.000", s_session);

10
sleepyhead/mainwindow.cpp
View File

@ -331,9 +331,9 @@ MainWindow::MainWindow(QWidget *parent) :
int panel_width = p_profile->appearance->rightPanelWidth(); int panel_width = p_profile->appearance->rightPanelWidth();
a.push_back(this->width() - panel_width); a.push_back(this->width() - panel_width);
a.push_back(panel_width); a.push_back(panel_width);
ui->splitter_2->setSizes(a); ui->mainsplitter->setSizes(a);
ui->splitter_2->setStretchFactor(0,1); ui->mainsplitter->setStretchFactor(0,1);
ui->splitter_2->setStretchFactor(1,0); ui->mainsplitter->setStretchFactor(1,0);
} }
void MainWindow::on_changeWarningMessage() void MainWindow::on_changeWarningMessage()
@ -2720,7 +2720,7 @@ void MainWindow::on_actionExport_Review_triggered()
QMessageBox::information(nullptr, STR_MessageBox_Information, QObject::tr("Sorry, this feature is not implemented yet"), QMessageBox::Ok); QMessageBox::information(nullptr, STR_MessageBox_Information, QObject::tr("Sorry, this feature is not implemented yet"), QMessageBox::Ok);
} }
void MainWindow::on_splitter_2_splitterMoved(int, int) void MainWindow::on_mainsplitter_splitterMoved(int, int)
{ {
p_profile->appearance->setRightPanelWidth(ui->splitter_2->sizes()[1]); p_profile->appearance->setRightPanelWidth(ui->mainsplitter->sizes()[1]);
} }

2
sleepyhead/mainwindow.h
View File

@ -335,7 +335,7 @@ class MainWindow : public QMainWindow
void on_actionExport_Review_triggered(); void on_actionExport_Review_triggered();
void on_splitter_2_splitterMoved(int pos, int index); void on_mainsplitter_splitterMoved(int pos, int index);
private: private:
void importCPAPBackups(); void importCPAPBackups();

18
sleepyhead/mainwindow.ui
View File

@ -474,11 +474,11 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QSplitter" name="splitter_2"> <widget class="QSplitter" name="mainsplitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="logsplitter">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -1482,8 +1482,8 @@ QToolBox::tab:selected {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>223</width> <width>98</width>
<height>582</height> <height>606</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -1896,8 +1896,8 @@ border: 2px solid #56789a; border-radius: 30px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>240</width> <width>100</width>
<height>237</height> <height>30</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -3044,8 +3044,8 @@ border-radius: 10px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>69</width> <width>77</width>
<height>237</height> <height>236</height>
</rect> </rect>
</property> </property>
<property name="mouseTracking"> <property name="mouseTracking">
@ -3107,7 +3107,7 @@ border-radius: 10px;
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>687</width> <width>687</width>
<height>21</height> <height>22</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">