From f35c6a055ac19f329eec85001ad3e24bffadd4b5 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 20 Aug 2014 00:04:29 +1000 Subject: [PATCH] Oximetry fix #372342 --- sleepyhead/Graphs/gGraphView.cpp | 3 +++ sleepyhead/Graphs/gLineChart.h | 2 +- sleepyhead/daily.cpp | 4 ++-- sleepyhead/oximeterimport.cpp | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index 547298e1..408dfda9 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -1208,9 +1208,12 @@ void gGraphView::paintGL() if (width() <= 0) { return; } if (height() <= 0) { return; } + // Create QPainter object, note this is only valid from paintGL events! QPainter painter(this); + painter.setRenderHint(QPainter::TextAntialiasing, true); + QRect bgrect(0, 0, width(), height()); painter.fillRect(bgrect,QBrush(QColor(255,255,255))); diff --git a/sleepyhead/Graphs/gLineChart.h b/sleepyhead/Graphs/gLineChart.h index fcbd5f65..dba694cf 100644 --- a/sleepyhead/Graphs/gLineChart.h +++ b/sleepyhead/Graphs/gLineChart.h @@ -110,7 +110,7 @@ class gLineChart: public Layer virtual bool isEmpty(); //! \brief Add Subplot 'code'. Note the first one is added in the constructor. - void addPlot(ChannelID code, bool square) { m_codes.push_back(code); m_enabled[code] = true; m_square.push_back(square); } + void addPlot(ChannelID code, bool square=false) { m_codes.push_back(code); m_enabled[code] = true; m_square.push_back(square); } //! \brief Returns true of the subplot 'code' is enabled. bool plotEnabled(ChannelID code) { if ((m_enabled.contains(code)) && m_enabled[code]) { return true; } else { return false; } } diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 3693bb7a..1958e5d2 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -362,8 +362,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared) leakchart->addPlot(CPAP_LeakTotal, square); leakchart->addPlot(CPAP_MaxLeak, square); - schema::channel[CPAP_Leak].setUpperThresholdColor(Qt::red); - schema::channel[CPAP_Leak].setLowerThresholdColor(Qt::green); +// schema::channel[CPAP_Leak].setUpperThresholdColor(Qt::red); +// schema::channel[CPAP_Leak].setLowerThresholdColor(Qt::green); graphlist[schema::channel[CPAP_Leak].code()]->AddLayer(AddCPAP(leakchart)); //LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak, COLOR_Leak,square))); diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp index 05638147..d8f672a2 100644 --- a/sleepyhead/oximeterimport.cpp +++ b/sleepyhead/oximeterimport.cpp @@ -267,11 +267,12 @@ void OximeterImport::on_directImportButton_clicked() selecting_session = true; ui->tableOxiSessions->selectRow(0); return; - } else { + } else if (session_count > 0) { chosen_sessions.push_back(0); oximodule->getDuration(0); oximodule->setStartTime(oximodule->getDateTime(0)); } + doImport(); } void OximeterImport::doImport()