From 10941596579a5b326d7763a0c9519617999dedbd Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 3 Oct 2014 12:31:51 +1000 Subject: [PATCH] Rename mainwindow qsplitters, suppress some warnings --- sleepyhead/Graphs/MinutesAtPressure.cpp | 6 ++--- .../SleepLib/loader_plugins/prs1_loader.cpp | 10 ++++---- .../loader_plugins/weinmann_loader.cpp | 24 +++++++++---------- sleepyhead/SleepLib/session.cpp | 2 +- sleepyhead/mainwindow.cpp | 10 ++++---- sleepyhead/mainwindow.h | 2 +- sleepyhead/mainwindow.ui | 18 +++++++------- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp index 907126fb..fdfc9516 100644 --- a/sleepyhead/Graphs/MinutesAtPressure.cpp +++ b/sleepyhead/Graphs/MinutesAtPressure.cpp @@ -221,7 +221,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r // left = rect.left(); QHash >::iterator eit; - QHash >::iterator ev_end = events.end(); + //QHash >::iterator ev_end = events.end(); QMap::iterator vit; @@ -547,7 +547,7 @@ skip: QList trash; for (it = times.begin(); it != times_end; ++it) { - EventStoreType key = it.key(); + //EventStoreType key = it.key(); int value = it.value(); // if (value == 0) { // 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 x = event->x() - graph->graphView()->titleWidth; diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 1850b4be..7fbbc2e3 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -1629,10 +1629,10 @@ bool PRS1Import::ParseSummaryF3() session->set_first(qint64(summary->timestamp) * 1000L); - EventDataType epap = data[0x04] | (data[0x05] << 8); - EventDataType ipap = data[0x06] | (data[0x07] << 8); +// EventDataType epap = data[0x04] | (data[0x05] << 8); +// EventDataType ipap = data[0x06] | (data[0x07] << 8); - EventDataType f1 = data[0x08] | (data[0x09] << 8); +// EventDataType f1 = data[0x08] | (data[0x09] << 8); return true; } @@ -1667,7 +1667,7 @@ bool PRS1Import::ParseSummaryF5V0() session->settings[CPAP_IPAP] = imax_epap/10.0f; } 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; session->settings[CPAP_EPAPLo] = imin_epap / 10.0f; @@ -1753,7 +1753,7 @@ bool PRS1Import::ParseSummaryF5V1() session->settings[CPAP_IPAP] = imax_epap/10.0f; } 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; session->settings[CPAP_EPAPLo] = imin_epap / 10.0f; diff --git a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp index fce18be6..fcfd3264 100644 --- a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp @@ -135,11 +135,11 @@ int WeinmannLoader::Open(QString path) int WeekComplianceOffset = index["WeekComplianceOffset"]; int WCD_Pin_Offset = index["WCD_Pin_Offset"]; - int WCD_Pex_Offset = index["WCD_Pex_Offset"]; - int WCD_Snore_Offset = index["WCD_Snore_Offset"]; - int WCD_Lf_Offset = index["WCD_Lf_Offset"]; - int WCD_Events_Offset = index["WCD_Events_Offset"]; - int WCD_IO_Offset = index["WCD_IO_Offset"]; +// int WCD_Pex_Offset = index["WCD_Pex_Offset"]; +// int WCD_Snore_Offset = index["WCD_Snore_Offset"]; +// int WCD_Lf_Offset = index["WCD_Lf_Offset"]; +// int WCD_Events_Offset = index["WCD_Events_Offset"]; +// int WCD_IO_Offset = index["WCD_IO_Offset"]; int comp_start = index[CompOffset]; int wccount = index["WeekComplianceCount"]; @@ -197,9 +197,9 @@ int WeinmannLoader::Open(QString path) float flow_sample_duration = 1000.0 / 5; 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++) { int year = QString().sprintf("%02i%02i", p[0], p[1]).toInt(); 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); //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 * S = sess->AddEventList(CPAP_Snore, EVL_Event); +// EventList * L = sess->AddEventList(CPAP_Leak, EVL_Event); +// EventList * S = sess->AddEventList(CPAP_Snore, EVL_Event); EventList * OA = sess->AddEventList(CPAP_Obstructive, EVL_Event); EventList * A = sess->AddEventList(CPAP_Apnea, EVL_Event); EventList * H = sess->AddEventList(CPAP_Hypopnea, 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 step = sess->length() / ci.event_recs; unsigned char *p = &ev[ci.event_start]; @@ -563,8 +563,8 @@ int WeinmannLoader::Open(QString path) void WeinmannLoader::initChannels() { - using namespace schema; - Channel * chan = nullptr; + //using namespace schema; + //Channel * chan = nullptr; // channel.add(GRP_CPAP, chan = new Channel(INTP_SmartFlex = 0x1165, SETTING, SESSION, // "INTPSmartFlex", QObject::tr("SmartFlex"), // QObject::tr("Weinmann pressure relief setting."), diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index 0db0a817..bf81a7a9 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -356,7 +356,7 @@ bool Session::StoreSummary() bool Session::LoadSummary() { - static int sumcnt = 0; + //static int sumcnt = 0; if (s_summary_loaded) return true; QString filename = s_machine->getSummariesPath() + QString().sprintf("%08lx.000", s_session); diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index bcb8d17c..05a5c339 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -331,9 +331,9 @@ MainWindow::MainWindow(QWidget *parent) : int panel_width = p_profile->appearance->rightPanelWidth(); a.push_back(this->width() - panel_width); a.push_back(panel_width); - ui->splitter_2->setSizes(a); - ui->splitter_2->setStretchFactor(0,1); - ui->splitter_2->setStretchFactor(1,0); + ui->mainsplitter->setSizes(a); + ui->mainsplitter->setStretchFactor(0,1); + ui->mainsplitter->setStretchFactor(1,0); } 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); } -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]); } diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index c875c104..55f92bf8 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -335,7 +335,7 @@ class MainWindow : public QMainWindow void on_actionExport_Review_triggered(); - void on_splitter_2_splitterMoved(int pos, int index); + void on_mainsplitter_splitterMoved(int pos, int index); private: void importCPAPBackups(); diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index a05561e6..0c0b4ad5 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -474,11 +474,11 @@ 0 - + Qt::Horizontal - + QFrame::StyledPanel @@ -1482,8 +1482,8 @@ QToolBox::tab:selected { 0 0 - 223 - 582 + 98 + 606 @@ -1896,8 +1896,8 @@ border: 2px solid #56789a; border-radius: 30px; 0 0 - 240 - 237 + 100 + 30 @@ -3044,8 +3044,8 @@ border-radius: 10px; 0 0 - 69 - 237 + 77 + 236 @@ -3107,7 +3107,7 @@ border-radius: 10px; 0 0 687 - 21 + 22