From 483c887b906d3d89026b7ba9ef17757aaba88223 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 29 Aug 2014 20:38:46 +1000 Subject: [PATCH] Modify Clone graphs titles --- sleepyhead/Graphs/gGraphView.cpp | 22 +++++++++++++- sleepyhead/mainwindow.ui | 13 ++++----- sleepyhead/oximeterimport.cpp | 35 +++++++++++++++++++++++ sleepyhead/oximeterimport.h | 2 ++ sleepyhead/oximeterimport.ui | 49 +++++++++++++++----------------- 5 files changed, 86 insertions(+), 35 deletions(-) diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index 3643c640..3cd128f2 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -2119,7 +2119,27 @@ void gGraphView::onSnapshotGraphToggle() } } - gGraph * newgraph = new gGraph(newname, nullptr, graph->title(), graph->units(), graph->height(), graph->group()); + QString newtitle; + bool fnd = false; + // someday, some clown will keep adding new graphs to break this.. + for (int i=1; i < 100; i++) { + newtitle = graph->title()+"-"+QString::number(i); + fnd = false; + for (int j=0; jtitle() == newtitle) { + fnd = true; + break; + } + } + if (!fnd) break; + } + if (fnd) { + // holy crap.. what patience. but not what I meant by as many as you like ;) + return; + } + + + gGraph * newgraph = new gGraph(newname, nullptr, newtitle, graph->units(), graph->height(), graph->group()); // newgraph->setBlockSelect(true); newgraph->setHeight(graph->height()); diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index 42223a8c..27d35ed7 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -1442,7 +1442,7 @@ color: yellow; QToolBox { -icon-size: 32px; +icon-size: 24px; border-radius: 15px; background: rgb(163, 190, 255) } @@ -1469,10 +1469,7 @@ QToolBox::tab:selected { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8181b1, stop: 1.0 #8393c3); -} - - - +} QFrame::Box @@ -1498,7 +1495,7 @@ QToolBox::tab:selected { 0 0 180 - 700 + 724 @@ -1912,7 +1909,7 @@ border: 2px solid #56789a; border-radius: 30px; 0 0 180 - 700 + 724 @@ -3060,7 +3057,7 @@ border-radius: 10px; 0 0 180 - 700 + 724 diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp index 1328e412..40d4488b 100644 --- a/sleepyhead/oximeterimport.cpp +++ b/sleepyhead/oximeterimport.cpp @@ -99,6 +99,7 @@ OximeterImport::OximeterImport(QWidget *parent) : } ui->dateTimeEdit->setMinimumHeight(ui->dateTimeEdit->height()+10); + setInformation(); } OximeterImport::~OximeterImport() @@ -1021,3 +1022,37 @@ void OximeterImport::on_chooseSessionButton_clicked() on_syncButton_clicked(); } } + +void OximeterImport::setInformation() +{ + QString html="" + "" + "

" + +tr("Welcome to the Oximeter Import Wizard")+"

" + "

" + +tr("Pulse Oximeters are medical devices used to measure blood oxygen saturation. During extended Apnea events and abnormal breathing patterns, blood oxygen saturation levels can drop significantly, and can indicate issues that need medical attention.")+"

" + "

" + +tr("SleepyHead gives you the ability to track Oximetry data alongside CPAP session data, which can give valuable insight into the effectiveness of CPAP treatment. It will also work standalone with your Pulse Oximeter, allowing you to store, track and review your recorded data.")+"

" + "

" + +tr("SleepyHead is currently compatible with Contec CMS50D+, CMS50E, CMS50F and CMS50I serial oximeters.
(Note: Direct importing from bluetooth models is probaby not possible yet)")+"

" + "

" + +tr("You may wish to note, other companies, such as Pulox, simply rebadge Contec CMS50's under new names, such as the Pulox PO-200, PO-300, PO-400. These should also work.")+"

" + + "

" + +tr("It also can read from ChoiceMMed MD300W1 oximeter .dat files.")+"

" + "

" + ""+tr("Please remember:")+" " + "" + +tr("If you are trying to sync oximetery and CPAP data, please make sure you imported your CPAP sessions first before proceeding!")+"

" + "

" + ""+tr("Important Notes:")+" " + +tr("For SleepyHead to be able to locate and read directly from your Oximeter device, you need to ensure the correct device drivers (eg. USB to Serial UART) have been installed on your computer. For more information about this, %1click here%2.").arg("").arg("")+"

" + "

" + +tr("Contec CMS50D+ devices do not have an internal clock, and do not record a starting time. If you do not have a CPAP session to link a recording to, you will have to enter the start time manually after the import process is completed.")+"

" + "

" + +tr("Even for devices with an internal clock, it is still recommended to get into the habit of starting oximeter records at the same time as CPAP sessions, because CPAP internal clocks tend to drift over time, and not all can be reset easily.")+"

"; + ui->textBrowser->setHtml(html); + ui->textBrowser->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); +} diff --git a/sleepyhead/oximeterimport.h b/sleepyhead/oximeterimport.h index f5c87b54..e247f970 100644 --- a/sleepyhead/oximeterimport.h +++ b/sleepyhead/oximeterimport.h @@ -87,6 +87,8 @@ protected: SerialOximeter * detectOximeter(); void updateStatus(QString msg); void doImport(); + void setInformation(); + private: Ui::OximeterImport *ui; SerialOximeter * oximodule; diff --git a/sleepyhead/oximeterimport.ui b/sleepyhead/oximeterimport.ui index e78ea54a..35dccff8 100644 --- a/sleepyhead/oximeterimport.ui +++ b/sleepyhead/oximeterimport.ui @@ -647,7 +647,7 @@ border-radius: 0px; - 5 + 0 @@ -695,6 +695,9 @@ border-radius: 0px; QAbstractScrollArea::AdjustToContents + + QTextEdit::AutoAll + QTextEdit::WidgetWidth @@ -702,23 +705,17 @@ border-radius: 0px; 1 - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'.Lucida Grande UI'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(Translators, please don't touch this yet.. it will be split up)</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:18pt;">Welcome to the Oximeter Import Wizard</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Pulse Oximeters are medical devices used to measure blood oxygen saturation. During extended Apnea events and abnormal breathing patterns, blood oxygen saturation levels can drop significantly, and can indicate issues that need medical attention.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SleepyHead gives you the ability to track Oximetry data alongside CPAP session data, which can give valuable insight into the effectiveness of CPAP treatment. It will also work standalone with your Pulse Oximeter, allowing you to store, track and review your recorded data.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SleepyHead is currently compatible with Contec CMS50D+, CMS50E and CMS50F serial oximeters.<br />(Note: Direct importing from bluetooth models is <span style=" font-weight:600;">not</span> supported yet)</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">It also can read from ChoiceMMed MD300W1 oximeter .dat files.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Please remember: </span><span style=" font-weight:600; font-style:italic;">If you are trying to sync oximetery and CPAP data, please make sure you imported your CPAP sessions first before proceeding!</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Important Notes: </span>For SleepyHead to be able to locate and read directly from your Oximeter device, you need to ensure the correct device drivers (eg. USB to Serial UART) have been installed on your computer. For more information about this, <a href="http://sleepyhead.sf.net/"><span style=" text-decoration: underline; color:#0000ff;">click here</span></a>.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Contec CMS50D+ devices do not have an internal clock, and do not record a starting time. If you do not have a CPAP session to link a recording to, you will have to enter the start time manually after the import process is completed.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Even for devices with an internal clock, it is still recommended to get into the habit of starting oximeter records at the same time as CPAP sessions, because CPAP internal clocks tend to drift over time, and not all can be reset easily.</p></body></html> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + + - false + true false @@ -1747,6 +1744,19 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) QFrame::Raised + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -1761,19 +1771,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - - - - Qt::Horizontal - - - - 40 - 20 - - - -