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

Merge branch 'master' into vAuto-Settings

Browse Source
This commit is contained in:
Phil Olynyk 2022-04-29 20:20:24 -04:00
commit a5f3caa125
20 changed files with 638 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Htmldocs/release_notes.html
View File

@ -17,9 +17,12 @@
<ul> <ul>
<li>[new] Additional Philips Respironics devices tested and fully supported: <li>[new] Additional Philips Respironics devices tested and fully supported:
<ul> <ul>
<li>DreamStation 2 CPAP (410X150C)</li>
<li>BiPAP Auto (System One 60 Series) (761P)</li> <li>BiPAP Auto (System One 60 Series) (761P)</li>
<li>BiPAP autoSV Advanced 30 (System One 60 Series) (961TCA)</li>
</ul> </ul>
</li> </li>
<li>[fix] Added support for pressure pulse, CA, and VS on BiPAP autoSV Advanced 30 (System One 60 Series) (960T).</li>
</ul> </ul>
<p> <p>
<b>Changes and fixes in OSCAR v1.3.5-alpha.2</b> <b>Changes and fixes in OSCAR v1.3.5-alpha.2</b>

31
oscar/Graphs/MinutesAtPressure.cpp
View File

@ -143,34 +143,10 @@ some messages from Apnea Board.
//#define MAP_LOG_EVENTS //#define MAP_LOG_EVENTS
//#define ENABLE_UNEVEN_MACHINE_MIN_MAX_TEST //#define ENABLE_UNEVEN_MACHINE_MIN_MAX_TEST
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< / <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
// Define Display macros to enhance displays // Define Display macros to enhance displays
#define DEBUGQ qDebug()
#define DEBUGT qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__
#define DEBUGF qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
#define DEBUGTF qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
#include <QRegularExpression>
#define DEBUG qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__
#define TIMEO( DD , XX ) " " #DD ":" << QDateTime::fromMSecsSinceEpoch( XX ).time().toString("hh:mm:ss.zzz")
#define TIME( XX ) QDateTime::fromMSecsSinceEpoch( XX ).time().toString("hh:mm:ss.zzz")
#define O( XX ) " " #XX ":" << XX
#define OO( XX , YY ) " " #XX ":" << YY
#define FULLNAME( id) schema::channel[ id ].fullname()
#define PLACE (QString(basename( __FILE__)).remove(QRegularExpression("\\..*$"))) << __LINE__
#define DATETIME( XX ) QDateTime::fromMSecsSinceEpoch( XX ).toString("dd MMM yyyy hh:mm:ss.zzz")
#define DATE( XX ) QDateTime::fromMSecsSinceEpoch( XX ).toString("dd MMM yyyy")
#define DATEO( XX ) " " #XX ":" << QDateTime::fromMSecsSinceEpoch( XX ).toString("dd MMM yyyy")
#define TIME2( XX ) " " #XX ":" << XX << QDateTime::fromMSecsSinceEpoch( XX ).time().toString("hh:mm:ss.zzz")
#define NAME( id) schema::channel[ id ].label()
//#define ENABLE_TEST_NODATA // no valid samples.
//#define ENABLE_TEST_SINGLE // a single value.
//#define ENABLE_TEST_CPAP // change all values to a single value.
//#define ENABLE_TEST_SAWTOOTH // change all sample time and value to a sawtooth
#endif #endif
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@ -180,6 +156,9 @@ some messages from Apnea Board.
#define test_data(A,B,C,D,E,F,G,H) #define test_data(A,B,C,D,E,F,G,H)
#endif #endif
#define TEST_MACROS_ENABLEDoff
#include "test_macros.h"
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@ -553,7 +532,6 @@ void RecalcMAP::updateTimesValues(qint64 d1,qint64 d2, int key,PressureInfo & in
//! \brief Updates Time At Pressure from session *sess //! \brief Updates Time At Pressure from session *sess
void RecalcMAP::updateTimes(PressureInfo & info) { void RecalcMAP::updateTimes(PressureInfo & info) {
//DEBUGF <<DATETIME(sessStartTime) << "CALLED" <<TIME(sessStartTime) <<TIME(sessEndTime);
qint64 d1,d2; qint64 d1,d2;
qint64 minx=0,maxx=0; qint64 minx=0,maxx=0;
//qint64 prevSessDuration=info.totalDuration; //qint64 prevSessDuration=info.totalDuration;
@ -1080,7 +1058,6 @@ void MinutesAtPressure::setEnabled(gGraph &graph) {
} else { } else {
value &= pressureGraphLC->m_flags_enabled[ch]; value &= pressureGraphLC->m_flags_enabled[ch];
} }
//DEBUGF << FULLNAME(ch) << O(value);
m_enabled[ch]=value; m_enabled[ch]=value;
} }
}; };

116
oscar/Graphs/gGraph.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include "test_macros.h"
#include "Graphs/gGraph.h" #include "Graphs/gGraph.h"
#include <QLabel> #include <QLabel>
@ -131,6 +134,7 @@ gGraph::gGraph(QString name, gGraphView *graphview, QString title, QString units
m_units(units), m_units(units),
m_visible(true) m_visible(true)
{ {
// DEBUGF Q(name) Q(title) QQ("UNITS",units) Q(height) Q(group);
if (height == 0) { if (height == 0) {
height = AppSetting->graphHeight(); height = AppSetting->graphHeight();
Q_UNUSED(height) Q_UNUSED(height)
@ -153,7 +157,7 @@ gGraph::gGraph(QString name, gGraphView *graphview, QString title, QString units
min_x = min_y = 0; min_x = min_y = 0;
rec_miny = rec_maxy = 0; rec_miny = rec_maxy = 0;
rphysmax_y = rphysmin_y = 0; rphysmax_y = rphysmin_y = 0;
m_zoomY = 0; m_zoomY = ZS_AUTO_FIT;
m_selectedDuration = 0; m_selectedDuration = 0;
if (graphview) { if (graphview) {
@ -281,9 +285,23 @@ void gGraph::setDay(Day *day)
// ResetBounds(); // ResetBounds();
} }
void gGraph::setZoomY(short zoom) void gGraph::setZoomY(ZoomyScaling zoomy) {
{ m_zoomY = zoomy;
m_zoomY = zoom; dynamicScalingOn =false;
timedRedraw(0);
}
void gGraph::mouseDoubleClickYAxis(QMouseEvent * ) {
if ( isDynamicScalingEnabled() ) {
dynamicScalingOn = !dynamicScalingOn;
} else {
dynamicScalingOn =false;
if (m_zoomY == ZS_AUTO_FIT ) {
m_zoomY = ZS_DEFAULT;
} else if (m_zoomY == ZS_DEFAULT) {
m_zoomY = ZS_AUTO_FIT ;
}
}
timedRedraw(0); timedRedraw(0);
} }
@ -564,22 +582,67 @@ void gGraph::ToolTip(QString text, int x, int y, ToolTipAlignment align, int tim
m_graphview->m_tooltip->display(text, x, y, align, timeout); m_graphview->m_tooltip->display(text, x, y, align, timeout);
} }
bool gGraph::isDynamicScalingEnabled() {
return ((m_lineChart_layer!=nullptr) && AppSetting->allowYAxisScaling() );
}
QString gGraph::unitsTooltip() {
if (isDynamicScalingEnabled()) {
if(dynamicScalingOn) {
if (zoomY() == ZS_AUTO_FIT ) {
return QString("%1%2%3").arg(m_units).arg("\n").arg(tr("Double click Y-axis: Return to AUTO-FIT Scaling"));
} else if (zoomY() == ZS_DEFAULT ) {
return QString("%1%2%3").arg(m_units).arg("\n").arg(tr("Double click Y-axis: Return to DEFAULT Scaling"));
} else {
return QString("%1%2%3").arg(m_units).arg("\n").arg(tr("Double click Y-axis: Return to OVERRIDE Scaling"));
}
} else {
return QString("%1%2%3").arg(m_units).arg("\n").arg(tr("Double click Y-axis: For Dynamic Scaling"));
}
} else {
if (zoomY() == ZS_AUTO_FIT ) {
return QString("%1%2%3").arg(m_units).arg("\n").arg(tr("Double click Y-axis: Select DEFAULT Scaling"));
} else if (zoomY() == ZS_DEFAULT ) {
return QString("%1%2%3").arg(m_units).arg("\n").arg(tr("Double click Y-axis: Select AUTO-FIT Scaling"));
}
}
return m_units;
}
void gGraph::dynamicScaling(EventDataType &miny, EventDataType &maxy) {
// Have new Dynamic mode;
miny = m_lineChart_layer->actualMinY();
maxy = m_lineChart_layer->actualMaxY();
EventDataType diff= (maxy-miny);
maxy += diff*0.08; // more space at top for event ticks.
miny -= diff*0.04;
if (m_saved_minY!=m_lineChart_layer->actualMinY() || m_saved_maxY!=m_lineChart_layer->actualMaxY() ) {
// DEBUGF O(m_name) Q(m_saved_minY) QQ("==>",m_lineChart_layer->actualMinY() ) QQ("==>",miny) Q(m_saved_maxY) QQ("==>",m_lineChart_layer->actualMaxY() ) QQ("==>",maxy);
m_saved_minY=m_lineChart_layer->actualMinY();
m_saved_maxY=m_lineChart_layer->actualMaxY();
}
}
// YAxis Autoscaling code // YAxis Autoscaling code
void gGraph::roundY(EventDataType &miny, EventDataType &maxy) void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
{ {
if (dynamicScalingOn) {
if (zoomY() == 2) { dynamicScaling(miny, maxy) ;
if (maxy > miny) return;
};
if (zoomY() == ZS_OVERRIDE) { // Have override mode
// set min and max to override values.
miny = rec_miny; miny = rec_miny;
maxy = rec_maxy; maxy = rec_maxy;
if (maxy > miny) return; if (maxy > miny) return; // Not Autoscaling
} else if (zoomY() ==1) { } else if (zoomY() ==ZS_DEFAULT) { // Have Default mode
// set min and max to physical Min / max values.
miny = physMinY(); miny = physMinY();
maxy = physMaxY(); maxy = physMaxY();
if (maxy > miny) return; if (maxy > miny) return; // Not Autoscaling
} }
miny = MinY(); miny = MinY();
maxy = MaxY(); maxy = MaxY();
int m, t; int m, t;
bool ymin_good = false, ymax_good = false; bool ymin_good = false, ymax_good = false;
@ -685,6 +748,11 @@ void gGraph::AddLayer(Layer *l, LayerPosition position, short width, short heigh
l->setPos(x, y); l->setPos(x, y);
l->addref(); l->addref();
m_layers.push_back(l); m_layers.push_back(l);
if (l->layerType()==LT_LineChart) {
m_lineChart_layer = dynamic_cast<gLineChart *>(l);
}
} }
void gGraph::dataChanged() void gGraph::dataChanged()
@ -1111,24 +1179,6 @@ void gGraph::mouseDoubleClickEvent(QMouseEvent *event)
layer->mouseDoubleClickEvent(event, this); layer->mouseDoubleClickEvent(event, this);
} }
} }
//int w=m_lastbounds.width()-(m_marginleft+left+right+m_marginright);
//int h=m_lastbounds.height()-(bottom+m_marginbottom);
//int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y();
// if ((m_graphview->horizTravel()<mouse_movement_threshold) && (x>left+m_marginleft && x<w+m_marginleft+left && y>top+m_margintop && y<h)) { // normal click in main area
// if (event->button() & Qt::RightButton) {
// ZoomX(1.66,x); // Zoon out
// return;
// } else if (event->button() & Qt::LeftButton) {
// ZoomX(0.75/2.0,x); // zoom in.
// return;
// }
// } else {
// Propagate the events to graph Layers
// }
//mousePressEvent(event);
//mouseReleaseEvent(event);
//qDebug() << m_title << "Double Clicked" << event->x() << event->y();
} }
void gGraph::keyPressEvent(QKeyEvent *event) void gGraph::keyPressEvent(QKeyEvent *event)
{ {
@ -1416,16 +1466,14 @@ void gGraph::SetMaxY(EventDataType v)
Layer *gGraph::getLineChart() Layer *gGraph::getLineChart()
{ {
gLineChart *lc; if (m_lineChart_layer) return m_lineChart_layer;
for (auto & layer : m_layers) { for (auto & layer : m_layers) {
lc = dynamic_cast<gLineChart *>(layer); Layer *tmp = dynamic_cast<gLineChart *>(layer);
if (tmp) m_lineChart_layer = tmp;
if (lc) { return lc; }
} }
return nullptr; return nullptr;
} }
int gGraph::minHeight() int gGraph::minHeight()
{ {
int minheight = m_min_height; int minheight = m_min_height;

24
oscar/Graphs/gGraph.h
View File

@ -35,6 +35,8 @@ void DestroyGraphGlobals();
const int mouse_movement_threshold = 6; const int mouse_movement_threshold = 6;
enum ZoomyScaling {ZS_AUTO_FIT =0 , ZS_DEFAULT =1 , ZS_OVERRIDE =2};
float CatmullRomSpline(float p0, float p1, float p2, float p3, float t = 0.5); float CatmullRomSpline(float p0, float p1, float p2, float p3, float t = 0.5);
inline void GetTextExtent(QString text, int &width, int &height, QFont *font) inline void GetTextExtent(QString text, int &width, int &height, QFont *font)
@ -164,6 +166,9 @@ class gGraph : public QObject
//! \brief Returns the measurement Units the Y scale is referring to //! \brief Returns the measurement Units the Y scale is referring to
QString units() { return m_units; } QString units() { return m_units; }
//! \brief Returns the measurement Units the Y scale is referring to plus tooltip.
QString unitsTooltip() ;
//! \brief Sets the measurement Units the Y scale is referring to //! \brief Sets the measurement Units the Y scale is referring to
void setUnits(const QString units) { m_units = units; } void setUnits(const QString units) { m_units = units; }
@ -303,9 +308,14 @@ class gGraph : public QObject
bool isSnapshot() { return m_snapshot; } bool isSnapshot() { return m_snapshot; }
void setSnapshot(bool b) { m_snapshot = b; } void setSnapshot(bool b) { m_snapshot = b; }
// returns if graph is a daily line chart with Dynamic Scaling mode enabled.
bool isDynamicScalingEnabled();
short left, right, top, bottom; // dirty magin hacks.. short left, right, top, bottom; // dirty magin hacks..
Layer *getLineChart(); Layer *getLineChart();
Layer *m_lineChart_layer =nullptr ;
bool dynamicScalingOn =false;
QTimer *timer; QTimer *timer;
// This gets set to true to force a redraw of the yAxis tickers when graphs are resized. // This gets set to true to force a redraw of the yAxis tickers when graphs are resized.
@ -318,10 +328,8 @@ class gGraph : public QObject
gGraphView *graphView() { return m_graphview; } gGraphView *graphView() { return m_graphview; }
short m_marginleft, m_marginright, m_margintop, m_marginbottom; short m_marginleft, m_marginright, m_margintop, m_marginbottom;
inline short zoomY() { return m_zoomY; } inline ZoomyScaling zoomY() { return m_zoomY; }
void setZoomY(short zoom); void setZoomY(ZoomyScaling zoomy);
static const short maxZoomY = 2;
inline qint64 selectedDuration() const { return m_selectedDuration; } inline qint64 selectedDuration() const { return m_selectedDuration; }
inline QString selDurString() const { return m_selDurString; } inline QString selDurString() const { return m_selDurString; }
@ -331,6 +339,8 @@ class gGraph : public QObject
inline bool printing() const { return m_printing; } inline bool printing() const { return m_printing; }
void mouseDoubleClickYAxis(QMouseEvent *event);
protected: protected:
//! \brief Mouse Wheel events //! \brief Mouse Wheel events
virtual void wheelEvent(QWheelEvent *event); virtual void wheelEvent(QWheelEvent *event);
@ -353,6 +363,8 @@ class gGraph : public QObject
//! \brief Key Pressed event //! \brief Key Pressed event
virtual void keyReleaseEvent(QKeyEvent *event); virtual void keyReleaseEvent(QKeyEvent *event);
void dynamicScaling(EventDataType &miny, EventDataType &maxy);
void cancelSelection() { void cancelSelection() {
m_selecting_area = false; m_selecting_area = false;
m_selection = QRect(0,0,0,0); m_selection = QRect(0,0,0,0);
@ -389,7 +401,7 @@ class gGraph : public QObject
bool m_showTitle; bool m_showTitle;
bool m_printing; bool m_printing;
bool m_pinned; bool m_pinned;
short m_zoomY; ZoomyScaling m_zoomY;
bool m_block_select; bool m_block_select;
QRect m_rect; QRect m_rect;
@ -401,6 +413,8 @@ class gGraph : public QObject
QString m_selDurString; QString m_selDurString;
bool m_snapshot; bool m_snapshot;
EventDataType m_saved_minY=0;
EventDataType m_saved_maxY=0;
protected slots: protected slots:
//! \brief Deselects any highlights, and schedules a main gGraphView redraw //! \brief Deselects any highlights, and schedules a main gGraphView redraw

146
oscar/Graphs/gGraphView.cpp
View File

@ -7,19 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define xDEBUG_FUNCTIONS #define TEST_MACROS_ENABLEDoff
#ifdef DEBUG_FUNCTIONS #include "test_macros.h"
#include <QRegularExpression>
#define DEBUG qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__
#define DEBUGF qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
#define DEBUGTF qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
#define O( XX ) " " #XX ":" << XX
#define OO( XX , YY ) " " #XX ":" << YY
#define NAME( id) schema::channel[ id ].label()
#define DATE( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy")
#define DATETIME( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy hh:mm:ss.zzz")
#endif
#include "Graphs/gGraphView.h" #include "Graphs/gGraphView.h"
@ -139,10 +129,8 @@ void gToolTip::display(QString text, int x, int y, ToolTipAlignment align, int t
if (timer->isActive()) { if (timer->isActive()) {
timer->stop(); timer->stop();
} }
timer->setSingleShot(true); timer->setSingleShot(true);
timer->start(timeout); timer->start(timeout);
m_invalidate = true;
} }
void gToolTip::cancel() void gToolTip::cancel()
@ -151,17 +139,14 @@ void gToolTip::cancel()
timer->stop(); timer->stop();
} }
void gToolTip::paint(QPainter &painter) //actually paints it. QRect gToolTip::calculateRect(QPainter &painter)
{ {
if (!m_visible) { return; }
int x = m_pos.x(); int x = m_pos.x();
int y = m_pos.y(); int y = m_pos.y();
QRect rect(x, y, 0, 0); QRect rect(x, y, 0, 0);
painter.setFont(*defaultfont); painter.setFont(*m_font);
rect = painter.boundingRect(rect, Qt::AlignCenter, m_text); rect = painter.boundingRect(rect, Qt::AlignCenter, m_text);
int w = rect.width() + m_spacer * 2; int w = rect.width() + m_spacer * 2;
@ -201,19 +186,25 @@ void gToolTip::paint(QPainter &painter) //actually paints it.
rect.setTop(rect.top()-bot); rect.setTop(rect.top()-bot);
rect.setBottom(m_graphview->height()); rect.setBottom(m_graphview->height());
} }
return rect;
}
void gToolTip::paint(QPainter &painter) //actually paints it.
{
if (!m_visible) { return; }
QRect a_rect=calculateRect(painter);
QBrush brush(QColor(255, 255, 128, 230)); QBrush brush(QColor(255, 255, 128, 230));
brush.setStyle(Qt::SolidPattern); brush.setStyle(Qt::SolidPattern);
painter.setBrush(brush); painter.setBrush(brush);
painter.setPen(QColor(0, 0, 0, 255)); painter.setPen(QColor(0, 0, 0, 255));
painter.drawRoundedRect(rect, 5, 5); painter.drawRoundedRect(a_rect, 5, 5);
painter.setBrush(Qt::black); painter.setBrush(Qt::black);
painter.setFont(*defaultfont); painter.setFont(*m_font);
painter.drawText(rect, Qt::AlignCenter, m_text); painter.drawText(a_rect, Qt::AlignCenter, m_text);
} }
void gToolTip::timerDone() void gToolTip::timerDone()
@ -223,6 +214,88 @@ void gToolTip::timerDone()
m_graphview->resetMouse(); m_graphview->resetMouse();
} }
/* Parent tool tip
Allow the parent (overview or daily) to add tooltip or short messages to the user.
The basic problem is that the parent does not know the current dimensions of the graph view.
the parent does have knowledge of the location of fixed widgets which makes it possible to
locate tool tips in an appropiate location.
*/
gParentToolTip::gParentToolTip(gGraphView *graphview)
: gToolTip(graphview) {
m_parent_visible=false;
}
gParentToolTip::~gParentToolTip() {
}
void gParentToolTip::display(gGraphView* gv,QString text, int verticalOffset, int alignOffset, ToolTipAlignment align , int timeout ,QFont *font ) {
m_text=text;
m_verticalOffset=verticalOffset;
m_alignOffset=alignOffset;
m_alignment=align;
m_timeout=timeout;
m_font=font;
m_parent_visible=true;
gv->timedRedraw(0);
};
QRect gParentToolTip::calculateRect(QPainter& painter ) {
QRect rect(0, 0, 0, 0);
painter.setFont(*m_font);
rect = painter.boundingRect(rect, m_alignment, m_text);
// update space arround text
int space=2*m_spacer;
rect.setHeight(space+rect.height());
rect.setWidth(space+rect.width());
rect.moveTo(m_alignOffset,m_height-(m_verticalOffset+rect.height()));
// move rect accounding to alignment. default is left.
if (m_alignment == TT_AlignRight) {
// move rect left by width of rect. if <0 use 0;
rect.moveLeft(rect.left()-rect.width());
} else if (m_alignment == TT_AlignCenter) {
// left by 1/2 width of rect. if < 0 then use 0
rect.moveLeft(rect.left()-rect.width()/2);
}
if (rect.top()<0) {rect.setTop(0);};
if (rect.left()<0) {rect.setLeft(0);};
return rect;
}
void gParentToolTip::paint(QPainter &painter,int width,int height) {
if (!m_parent_visible) {return ;};
m_width=width;
m_height=height;
gToolTip::display(m_text, 0, 0,m_alignment, m_timeout);
gToolTip::paint(painter);
};
void gParentToolTip::timerDone() {
gToolTip::timerDone();
if (m_parent_visible) {
m_graphview->timedRedraw(0);
}
m_parent_visible=false;
};
void gParentToolTip::cancel() {
gToolTip::cancel();
m_parent_visible=false;
};
bool gParentToolTip::visible() {
return gToolTip::visible() && m_parent_visible;
};
#ifdef ENABLE_THREADED_DRAWING #ifdef ENABLE_THREADED_DRAWING
gThread::gThread(gGraphView *g) gThread::gThread(gGraphView *g)
@ -359,6 +432,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared, QWidget *caller)
masterlock = new QSemaphore(m_idealthreads); masterlock = new QSemaphore(m_idealthreads);
#endif #endif
m_tooltip = new gToolTip(this); m_tooltip = new gToolTip(this);
m_parent_tooltip = new gParentToolTip(this);
/*for (int i=0;i<m_idealthreads;i++) { /*for (int i=0;i<m_idealthreads;i++) {
gThread * gt=new gThread(this); gThread * gt=new gThread(this);
m_threads.push_back(gt); m_threads.push_back(gt);
@ -474,7 +548,6 @@ void gGraphView::popoutGraph()
dock->resize(width(),0); dock->resize(width(),0);
// QScrollArea // QScrollArea
} }
//////// Create dock widget and resize dock to hold new widget //////// Create dock widget and resize dock to hold new widget
QDockWidget * newDockWidget = new QDockWidget(dock); QDockWidget * newDockWidget = new QDockWidget(dock);
newDockWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); newDockWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
@ -634,6 +707,7 @@ gGraphView::~gGraphView()
} }
delete m_tooltip; delete m_tooltip;
delete m_parent_tooltip;
m_graphs.clear(); m_graphs.clear();
} }
@ -1499,6 +1573,7 @@ void gGraphView::paintGL()
AppSetting->usePixmapCaching() ? DrawTextQueCached(painter) :DrawTextQue(painter); AppSetting->usePixmapCaching() ? DrawTextQueCached(painter) :DrawTextQue(painter);
m_tooltip->paint(painter); m_tooltip->paint(painter);
m_parent_tooltip->paint(painter,width(), height() );
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
const int rs = 20; const int rs = 20;
@ -1973,8 +2048,8 @@ void MinMaxWidget::onMaxChanged(double d)
} }
void MinMaxWidget::onResetClicked() void MinMaxWidget::onResetClicked()
{ {
int tmp = graph->zoomY(); ZoomyScaling tmp = graph->zoomY();
graph->setZoomY(0); graph->setZoomY(ZS_AUTO_FIT);
EventDataType miny = graph->MinY(), EventDataType miny = graph->MinY(),
maxy = graph->MaxY(); maxy = graph->MaxY();
@ -1996,15 +2071,16 @@ void MinMaxWidget::onResetClicked()
graph->setZoomY(tmp); graph->setZoomY(tmp);
} }
void MinMaxWidget::onComboChanged(int idx) void MinMaxWidget::onComboChanged(int _idx)
{ {
minbox->setEnabled(idx == 2); ZoomyScaling idx = static_cast<ZoomyScaling>(_idx) ;
maxbox->setEnabled(idx == 2); minbox->setEnabled(idx == ZS_OVERRIDE);
reset->setEnabled(idx == 2); maxbox->setEnabled(idx == ZS_OVERRIDE);
reset->setEnabled(idx == ZS_OVERRIDE);
graph->setZoomY(idx); graph->setZoomY(idx);
if (idx == 2) { if (idx == ZS_OVERRIDE) {
if (qAbs(graph->rec_maxy - graph->rec_miny) < 0.0001) { if (qAbs(graph->rec_maxy - graph->rec_miny) < 0.0001) {
onResetClicked(); onResetClicked();
} }
@ -2018,9 +2094,9 @@ void MinMaxWidget::createLayout()
layout->setSpacing(4); layout->setSpacing(4);
combobox = new QComboBox(this); combobox = new QComboBox(this);
combobox->addItem(tr("Auto-Fit"), 0); combobox->addItem(tr("Auto-Fit"), ZS_AUTO_FIT);
combobox->addItem(tr("Defaults"), 1); combobox->addItem(tr("Defaults"), ZS_DEFAULT);
combobox->addItem(tr("Override"), 2); combobox->addItem(tr("Override"), ZS_OVERRIDE);
combobox->setToolTip(tr("The Y-Axis scaling mode, 'Auto-Fit' for automatic scaling, 'Defaults' for settings according to manufacturer, and 'Override' to choose your own.")); combobox->setToolTip(tr("The Y-Axis scaling mode, 'Auto-Fit' for automatic scaling, 'Defaults' for settings according to manufacturer, and 'Override' to choose your own."));
connect(combobox, SIGNAL(activated(int)), this, SLOT(onComboChanged(int))); connect(combobox, SIGNAL(activated(int)), this, SLOT(onComboChanged(int)));
@ -3445,7 +3521,7 @@ void gGraphView::SaveSettings(QString title)
out << graph->visible(); out << graph->visible();
out << graph->RecMinY(); out << graph->RecMinY();
out << graph->RecMaxY(); out << graph->RecMaxY();
out << graph->zoomY(); out << (short)graph->zoomY(); // the return type of zoomY was changed from a short to an enum (int) so much type cast it here
out << (bool)graph->isPinned(); out << (bool)graph->isPinned();
gLineChart * lc = dynamic_cast<gLineChart *>(findLayer(graph, LT_LineChart)); gLineChart * lc = dynamic_cast<gLineChart *>(findLayer(graph, LT_LineChart));
@ -3575,7 +3651,7 @@ bool gGraphView::LoadSettings(QString title)
g->setVisible(vis); g->setVisible(vis);
g->setRecMinY(recminy); g->setRecMinY(recminy);
g->setRecMaxY(recmaxy); g->setRecMaxY(recmaxy);
g->setZoomY(zoomy); g->setZoomY(static_cast<ZoomyScaling>(zoomy));
g->setPinned(pinned); g->setPinned(pinned);
if (gvversion >= 4) { if (gvversion >= 4) {

35
oscar/Graphs/gGraphView.h
View File

@ -240,10 +240,12 @@ class gToolTip : public QObject
virtual void paint(QPainter &paint); //actually paints it. virtual void paint(QPainter &paint); //actually paints it.
//! \brief Close the tooltip early. //! \brief Close the tooltip early.
void cancel(); virtual void cancel();
//! \brief Returns true if the tooltip is currently visible //! \brief Returns true if the tooltip is currently visible
bool visible() { return m_visible; } virtual bool visible() { return m_visible; }
virtual QRect calculateRect(QPainter &painter);
protected: protected:
gGraphView *m_graphview; gGraphView *m_graphview;
@ -254,13 +256,37 @@ class gToolTip : public QObject
bool m_visible; bool m_visible;
int m_spacer; int m_spacer;
QImage m_image; QImage m_image;
bool m_invalidate;
ToolTipAlignment m_alignment; ToolTipAlignment m_alignment;
QFont* m_font=defaultfont;
protected slots: protected slots:
//! \brief Timeout to hide tooltip, and redraw without it. //! \brief Timeout to hide tooltip, and redraw without it.
void timerDone(); virtual void timerDone();
};
class gParentToolTip : public gToolTip
{
Q_OBJECT
public:
gParentToolTip(gGraphView *graphview);
~gParentToolTip();
using gToolTip::display;
virtual void display(gGraphView* gv,QString text,int verticalOffset, int alignOffset , ToolTipAlignment align = TT_AlignCenter, int timeout = 0,QFont *font = defaultfont) ;
virtual void cancel();
virtual bool visible();
virtual QRect calculateRect(QPainter &painter);
using gToolTip::paint;
virtual void paint(QPainter &paint,int width,int height) ;
private:
int m_verticalOffset;
int m_alignOffset;
int m_width;
int m_height;
bool m_parent_visible;
int m_timeout;
protected slots:
virtual void timerDone();
}; };
struct SelectionHistoryItem { struct SelectionHistoryItem {
@ -425,6 +451,7 @@ class gGraphView
gGraph *m_selected_graph; gGraph *m_selected_graph;
gToolTip *m_tooltip; gToolTip *m_tooltip;
gParentToolTip *m_parent_tooltip;
QTimer *timer; QTimer *timer;
//! \brief Add the Text information to the Text Drawing Queue (called by gGraphs renderText method) //! \brief Add the Text information to the Text Drawing Queue (called by gGraphs renderText method)

115
oscar/Graphs/gLineChart.cpp
View File

@ -7,6 +7,10 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include "test_macros.h"
#include "Graphs/gLineChart.h" #include "Graphs/gLineChart.h"
#include <QString> #include <QString>
@ -275,6 +279,7 @@ skipcheck:
} }
} }
} }
EventDataType gLineChart::Miny() EventDataType gLineChart::Miny()
{ {
if (m_codes.size() == 0) return 0; if (m_codes.size() == 0) return 0;
@ -373,6 +378,7 @@ QString gLineChart::getMetaString(qint64 time)
// Time Domain Line Chart // Time Domain Line Chart
void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region) void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
{ {
EventDataType actual_min_y, actual_max_y;
QRectF rect = region.boundingRect(); QRectF rect = region.boundingRect();
rect.translate(0.0f, 0.001f); rect.translate(0.0f, 0.001f);
// TODO: Just use QRect directly. // TODO: Just use QRect directly.
@ -395,6 +401,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
return; return;
} }
actual_min_y = INT_MAX;
actual_max_y = -INT_MAX;
top++; top++;
@ -551,6 +559,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.setPen(QPen(QBrush(color), lineThickness, Qt::DotLine)); painter.setPen(QPen(QBrush(color), lineThickness, Qt::DotLine));
EventDataType y=top + height + 1 - ((dot.value - miny) * ymult); EventDataType y=top + height + 1 - ((dot.value - miny) * ymult);
painter.drawLine(left + 1, y, left + 1 + width, y); painter.drawLine(left + 1, y, left + 1 + width, y);
DEBUGF NAME(dot.code) Q(dot.type) QQ(y,(int)y) Q(ratioX) O(QLine(left + 1, y, left + 1 + width, y)) Q(legendx) O(dot.value) ;
} }
} }
@ -742,6 +751,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
time += rate; time += rate;
// This is much faster than QVector access. // This is much faster than QVector access.
data = *ptr * gain; data = *ptr * gain;
if (actual_min_y>data) { actual_min_y=data; }
if (actual_max_y<data) { actual_max_y=data; }
// Scale the time scale X to pixel scale X // Scale the time scale X to pixel scale X
px = ((time - minx) * xmult); px = ((time - minx) * xmult);
@ -822,6 +833,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
time += rate; time += rate;
data = (*ptr + el.offset()) * gain; data = (*ptr + el.offset()) * gain;
if (actual_min_y>data) { actual_min_y=data; }
if (actual_max_y<data) { actual_max_y=data; }
px = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X px = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X
py = yst - ((data - miny) * ymult); // Same for Y scale, with precomputed gain py = yst - ((data - miny) * ymult); // Same for Y scale, with precomputed gain
@ -880,6 +893,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
time = start + *tptr++; time = start + *tptr++;
data = (*dptr++ + el.offset()) * gain; data = (*dptr++ + el.offset()) * gain;
if (actual_min_y>data) { actual_min_y=data; }
if (actual_max_y<data) { actual_max_y=data; }
idx++; idx++;
@ -897,75 +912,44 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
// Unrolling square plot outside of loop to gain a minor speed improvement. // Unrolling square plot outside of loop to gain a minor speed improvement.
EventStoreType *eptr = dptr + siz; EventStoreType *eptr = dptr + siz;
if (square_plot) { for (; dptr < eptr; dptr++) {
for (; dptr < eptr; dptr++) { time = start + *tptr++;
time = start + *tptr++; data = gain * (*dptr + el.offset());
data = gain * (*dptr + el.offset()); if (actual_min_y>data) { actual_min_y=data; }
if (actual_max_y<data) { actual_max_y=data; }
px = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X px = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X
py = yst - ((data - miny) * ymult); // Same for Y scale without precomputed gain py = yst - ((data - miny) * ymult); // Same for Y scale without precomputed gain
// Horizontal lines are easy to cap // Horizontal lines are easy to cap
if (py == lastpy) { if (py == lastpy) {
// Cap px to left margin // Cap px to left margin
if (lastpx < xst) { lastpx = xst; } if (lastpx < xst) { lastpx = xst; }
// Cap px to right margin // Cap px to right margin
if (px > xst + width) { px = xst + width; } if (px > xst + width) { px = xst + width; }
}
// lines.append(QLine(lastpx, lastpy, px, lastpy)); //else {
// lines.append(QLine(px, lastpy, px, py)); // Letting the scissor do the dirty work for non horizontal lines
} // else { // This really should be changed, as it might be cause that weird
// Letting the scissor do the dirty work for non horizontal lines // display glitch on Linux..
// This really should be changed, as it might be cause that weird //}
// display glitch on Linux.. if (square_plot) {
lines.append(QLine(lastpx, lastpy, px, lastpy));
lines.append(QLine(lastpx, lastpy, px, lastpy)); lines.append(QLine(px, lastpy, px, py));
lines.append(QLine(px, lastpy, px, py)); } else {
// } lines.append(QLine(lastpx, lastpy, px, py));
lastpx = px;
lastpy = py;
if (time > maxx) {
done = true; // Let this iteration finish.. (This point will be in far clipping)
break;
}
} }
} else {
for (; dptr < eptr; dptr++) {
//for (int i=0;i<siz;i++) {
time = start + *tptr++;
data = gain * (*dptr + el.offset());
px = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X lastpx = px;
py = yst - ((data - miny) * ymult); // Same for Y scale without precomputed gain lastpy = py;
// Horizontal lines are easy to cap if (time > maxx) { // Past right edge, abort further drawing..
if (py == lastpy) { done = true;
// Cap px to left margin break;
if (lastpx < xst) { lastpx = xst; }
// Cap px to right margin
if (px > xst + width) { px = xst + width; }
// lines.append(QLine(lastpx, lastpy, px, py));
} //else {
// Letting the scissor do the dirty work for non horizontal lines
// This really should be changed, as it might be cause that weird
// display glitch on Linux..
lines.append(QLine(lastpx, lastpy, px, py));
//}
lastpx = px;
lastpy = py;
if (time > maxx) { // Past right edge, abort further drawing..
done = true;
break;
}
} }
} }
if (w.printing() && AppSetting->monochromePrinting()) { if (w.printing() && AppSetting->monochromePrinting()) {
painter.setPen(QPen(Qt::black, lineThickness + 0.5)); painter.setPen(QPen(Qt::black, lineThickness + 0.5));
} else { } else {
@ -1127,9 +1111,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
double f = double(cnt) / hours; // / (sum / 3600.0); double f = double(cnt) / hours; // / (sum / 3600.0);
QString txt = QObject::tr("Duration %1:%2:%3").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')) + " "+ QString txt = QObject::tr("Duration %1:%2:%3").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')) + " "+
QObject::tr("AHI %1").arg(f,0,'f',2);// +" " + QObject::tr("AHI %1").arg(f,0,'f',2);// +" "
// QObject::tr("Events %1").arg(cnt) + " " +
// QObject::tr("Hours %1").arg(hours,0,'f',2);
if (linecursormode) txt+=lasttext; if (linecursormode) txt+=lasttext;
@ -1138,4 +1120,9 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
// painter.setRenderHint(QPainter::Antialiasing, false); // painter.setRenderHint(QPainter::Antialiasing, false);
if (actual_max_y>0) {
m_actual_min_y=actual_min_y;
m_actual_max_y=actual_max_y;
}
} }

7
oscar/Graphs/gLineChart.h
View File

@ -112,6 +112,12 @@ class gLineChart: public Layer
//! \brief Returns Maximum Y-axis value for this layer //! \brief Returns Maximum Y-axis value for this layer
virtual EventDataType Maxy(); virtual EventDataType Maxy();
//! \brief Returns Minimum Y-axis value for this layer
virtual EventDataType actualMinY() {return m_actual_min_y;};
//! \brief Returns Maximum Y-axis value for this layer
virtual EventDataType actualMaxY() {return m_actual_max_y;};
//! \brief Returns true if all subplots contain no data //! \brief Returns true if all subplots contain no data
virtual bool isEmpty(); virtual bool isEmpty();
@ -164,6 +170,7 @@ class gLineChart: public Layer
bool m_report_empty; bool m_report_empty;
bool m_square_plot; bool m_square_plot;
bool m_disable_accel; bool m_disable_accel;
EventDataType m_actual_min_y=0,m_actual_max_y=0;
//! \brief Used by accelerated waveform plots. Must be >= Screen Resolution (or at least graph width) //! \brief Used by accelerated waveform plots. Must be >= Screen Resolution (or at least graph width)
static const int max_drawlist_size = 10000; static const int max_drawlist_size = 10000;

15
oscar/Graphs/gSessionTimesChart.cpp
View File

@ -7,19 +7,8 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define xDEBUG_FUNCTIONS #define TEST_MACROS_ENABLEDoff
#ifdef DEBUG_FUNCTIONS #include "test_macros.h"
#include <QRegularExpression>
#define DEBUG qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__
#define DEBUGF qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
#define DEBUGTF qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
#define O( XX ) " " #XX ":" << XX
#define OO( XX , YY ) " " #XX ":" << YY
#define NAME( id) schema::channel[ id ].label()
#define DATE( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy")
#define DATETIME( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy hh:mm:ss.zzz")
#endif
#include <math.h> #include <math.h>
#include <QLabel> #include <QLabel>

14
oscar/Graphs/gYAxis.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include "Graphs/gYAxis.h" #include "Graphs/gYAxis.h"
#include <QDebug> #include <QDebug>
@ -20,6 +23,7 @@
#include <QFontMetrics> #include <QFontMetrics>
gXGrid::gXGrid(QColor col) gXGrid::gXGrid(QColor col)
: Layer(NoChannel) : Layer(NoChannel)
{ {
@ -306,7 +310,7 @@ bool gYAxis::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
int y = event->y(); int y = event->y();
if (!graph->units().isEmpty()) { if (!graph->units().isEmpty()) {
graph->ToolTip(graph->units(), x+10, y+10, TT_AlignLeft); graph->ToolTip(graph->unitsTooltip(), x+10, y+10, TT_AlignLeft);
// graph->redraw(); // graph->redraw();
} }
@ -316,14 +320,8 @@ bool gYAxis::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
bool gYAxis::mouseDoubleClickEvent(QMouseEvent *event, gGraph *graph) bool gYAxis::mouseDoubleClickEvent(QMouseEvent *event, gGraph *graph)
{ {
if (graph) { if (graph) {
// int x=event->x(); graph->mouseDoubleClickYAxis(event);
// int y=event->y();
short z = (graph->zoomY() + 1) % gGraph::maxZoomY;
graph->setZoomY(z);
qDebug() << "Mouse double clicked for" << graph->name() << z;
} }
Q_UNUSED(event);
return false; return false;
} }

3
oscar/Graphs/layer.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include "test_macros.h"
#include "Graphs/layer.h" #include "Graphs/layer.h"
Layer::~Layer() Layer::~Layer()

4
oscar/Graphs/layer.h
View File

@ -230,6 +230,10 @@ public:
Q_UNUSED(graph); Q_UNUSED(graph);
return false; return false;
} }
virtual EventDataType actualMinY() {return 0;};
virtual EventDataType actualMaxY() {return 0;};
}; };
/*! \class LayerGroup /*! \class LayerGroup

2
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -132,6 +132,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
{ "700X130", 0, 6, "DreamStation Auto BiPAP" }, { "700X130", 0, 6, "DreamStation Auto BiPAP" },
{ "700X150", 0, 6, "DreamStation Auto BiPAP" }, { "700X150", 0, 6, "DreamStation Auto BiPAP" },
{ "410X150C", 0, 6, "DreamStation 2 CPAP" },
{ "520X110C", 0, 6, "DreamStation 2 Auto CPAP Advanced" }, // based on bottom label, boot screen says "Advanced Auto CPAP" { "520X110C", 0, 6, "DreamStation 2 Auto CPAP Advanced" }, // based on bottom label, boot screen says "Advanced Auto CPAP"
{ "520X150C", 0, 6, "DreamStation 2 Auto CPAP Advanced" }, // from user report { "520X150C", 0, 6, "DreamStation 2 Auto CPAP Advanced" }, // from user report
{ "521X120C", 0, 6, "DreamStation 2 Auto CPAP Advanced with P-Flex" }, // inferred from 501X120 and presence of "P-Flex" on bottom label { "521X120C", 0, 6, "DreamStation 2 Auto CPAP Advanced with P-Flex" }, // inferred from 501X120 and presence of "P-Flex" on bottom label
@ -141,6 +142,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
{ "960P", 5, 1, "BiPAP autoSV Advanced (System One 60 Series)" }, { "960P", 5, 1, "BiPAP autoSV Advanced (System One 60 Series)" },
{ "961P", 5, 1, "BiPAP autoSV Advanced (System One 60 Series)" }, { "961P", 5, 1, "BiPAP autoSV Advanced (System One 60 Series)" },
{ "960T", 5, 2, "BiPAP autoSV Advanced 30 (System One 60 Series)" }, // omits "(System One 60 Series)" on official reports { "960T", 5, 2, "BiPAP autoSV Advanced 30 (System One 60 Series)" }, // omits "(System One 60 Series)" on official reports
{ "961TCA", 5, 2, "BiPAP autoSV Advanced 30 (System One 60 Series)" },
{ "900X110", 5, 3, "DreamStation BiPAP autoSV" }, { "900X110", 5, 3, "DreamStation BiPAP autoSV" },
{ "900X120", 5, 3, "DreamStation BiPAP autoSV" }, { "900X120", 5, 3, "DreamStation BiPAP autoSV" },
{ "900X150", 5, 3, "DreamStation BiPAP autoSV" }, { "900X150", 5, 3, "DreamStation BiPAP autoSV" },

5
oscar/SleepLib/loader_plugins/prs1_parser.cpp
View File

@ -713,12 +713,11 @@ void PRS1DataChunk::ParseHumidifierSetting60Series(unsigned char humid1, unsigne
} else if (this->familyVersion == 2) { } else if (this->familyVersion == 2) {
// F5V2 // F5V2
if (tubepresent) { if (tubepresent) {
CHECK_VALUES(tubetemp, 0, 3); // all tube temperatures seen
if (tubetemp) { if (tubetemp) {
CHECK_VALUE(tubehumidlevel, 1); CHECK_VALUES(tubehumidlevel, 1, 3);
} }
} }
CHECK_VALUE(humidsystemone, false);
CHECK_VALUE(humidclassic, false); CHECK_VALUE(humidclassic, false);
} }
} }

172
oscar/SleepLib/loader_plugins/prs1_parser_asv.cpp
View File

@ -10,11 +10,6 @@
#include "prs1_parser.h" #include "prs1_parser.h"
#include "prs1_loader.h" #include "prs1_loader.h"
static QString hex(int i)
{
return QString("0x") + QString::number(i, 16).toUpper();
}
//******************************************************************************************** //********************************************************************************************
// MARK: - // MARK: -
// MARK: 50 and 60 Series // MARK: 50 and 60 Series
@ -664,7 +659,7 @@ bool PRS1DataChunk::ParseEventsF5V1(void)
elapsed = data[pos]; elapsed = data[pos];
this->AddEvent(new PRS1FlowLimitationEvent(t - elapsed, 0)); this->AddEvent(new PRS1FlowLimitationEvent(t - elapsed, 0));
break; break;
case 0x0a: // Vibratory Snore, note this is 0x9 in F5V3 case 0x0a: // Vibratory Snore, note this is 0xb in F5V2 and 0x9 in F5V3
// VS events are instantaneous flags with no duration, drawn on the official waveform. // VS events are instantaneous flags with no duration, drawn on the official waveform.
// The current thinking is that these are the snores that cause a change in auto-titrating // The current thinking is that these are the snores that cause a change in auto-titrating
// pressure. The snoring statistic above seems to be a total count. It's unclear whether // pressure. The snoring statistic above seems to be a total count. It's unclear whether
@ -672,7 +667,7 @@ bool PRS1DataChunk::ParseEventsF5V1(void)
// no data bytes // no data bytes
this->AddEvent(new PRS1VibratorySnoreEvent(t, 0)); this->AddEvent(new PRS1VibratorySnoreEvent(t, 0));
break; break;
case 0x0b: // Periodic Breathing, note this is 0xa in F5V3 case 0x0b: // Periodic Breathing, note this is 0xc in F5V2 and 0xa in F5V3
// PB events are reported some time after they conclude, and they do have a reported duration. // PB events are reported some time after they conclude, and they do have a reported duration.
duration = 2 * (data[pos] | (data[pos+1] << 8)); // confirmed to double in F5V0 duration = 2 * (data[pos] | (data[pos+1] << 8)); // confirmed to double in F5V0
elapsed = data[pos+2]; elapsed = data[pos+2];
@ -721,12 +716,13 @@ bool PRS1DataChunk::ParseEventsF5V1(void)
const QVector<PRS1ParsedEventType> ParsedEventsF5V2 = { const QVector<PRS1ParsedEventType> ParsedEventsF5V2 = {
PRS1EPAPSetEvent::TYPE, PRS1EPAPSetEvent::TYPE,
PRS1PressurePulseEvent::TYPE,
PRS1TimedBreathEvent::TYPE, PRS1TimedBreathEvent::TYPE,
PRS1ObstructiveApneaEvent::TYPE, PRS1ObstructiveApneaEvent::TYPE,
//PRS1ClearAirwayEvent::TYPE, // not yet seen PRS1ClearAirwayEvent::TYPE,
PRS1HypopneaEvent::TYPE, PRS1HypopneaEvent::TYPE,
PRS1FlowLimitationEvent::TYPE, PRS1FlowLimitationEvent::TYPE,
//PRS1VibratorySnoreEvent::TYPE, // not yet seen PRS1VibratorySnoreEvent::TYPE,
PRS1PeriodicBreathingEvent::TYPE, PRS1PeriodicBreathingEvent::TYPE,
//PRS1LargeLeakEvent::TYPE, // not yet seen //PRS1LargeLeakEvent::TYPE, // not yet seen
PRS1IPAPAverageEvent::TYPE, PRS1IPAPAverageEvent::TYPE,
@ -751,7 +747,7 @@ bool PRS1DataChunk::ParseEventsF5V2(void)
} }
const unsigned char * data = (unsigned char *)this->m_data.constData(); const unsigned char * data = (unsigned char *)this->m_data.constData();
int chunk_size = this->m_data.size(); int chunk_size = this->m_data.size();
static const QMap<int,int> event_sizes = { {0,4}, {1,2}, {3,4}, {8,3}, {9,4}, {0xa,3}, {0xb,5}, {0xc,5}, {0xd,5}, {0xe,0xd}, {0xf,5}, {0x10,5}, {0x11,2}, {0x12,6} }; static const QMap<int,int> event_sizes = { {0,4}, {1,2}, {8,3}, {9,4}, {0xa,3}, {0xb,2}, {0xc,5}, {0xd,5}, {0xe,0xd}, {0xf,5}, {0x10,5}, {0x11,2}, {0x12,6} };
if (chunk_size < 1) { if (chunk_size < 1) {
// This does occasionally happen in F0V6. // This does occasionally happen in F0V6.
@ -780,51 +776,20 @@ bool PRS1DataChunk::ParseEventsF5V2(void)
} }
startpos = pos; startpos = pos;
if (code != 0 && code != 0x12) { // These two codes have no timestamp TODO: verify this applies to F5V012 if (code != 0 && code != 0x12) { // These two codes have no timestamp TODO: verify this applies to F5V012
t += data[pos] /*| (data[pos+1] << 8)*/; // TODO: Is this really only 1 byte? t += data[pos] | (data[pos+1] << 8);
if (data[pos+1] != 0) qWarning() << this->sessionid << "nonzero time? byte" << hex(startpos);
CHECK_VALUE(data[pos+1], 0);
pos += 2; pos += 2;
} }
switch (code) { switch (code) {
/* //case 0x00: // never seen on F5V2
case 0x00: // Unknown (ASV Pressure value) //case 0x01: // never seen on F5V2
DUMP_EVENT();
// offset?
data0 = data[pos++];
if (!data[pos - 1]) { // WTH???
data1 = data[pos++];
}
if (!data[pos - 1]) {
//data2 = data[pos++];
pos++;
}
break;
case 0x01: // Unknown
DUMP_EVENT();
this->AddEvent(new PRS1UnknownValueEvent(code, t, 0, 0.1F));
break;
*/
case 0x02: // Pressure adjustment case 0x02: // Pressure adjustment
this->AddEvent(new PRS1EPAPSetEvent(t, data[pos++], GAIN)); this->AddEvent(new PRS1EPAPSetEvent(t, data[pos++], GAIN));
break; break;
/* case 0x03: // Pressure Pulse
case 0x03: // BIPAP Pressure duration = data[pos]; // TODO: is this a duration?
DUMP_EVENT(); this->AddEvent(new PRS1PressurePulseEvent(t, duration));
qDebug() << "0x03 Observed in ASV data!!????"; break;
data0 = data[pos++];
data1 = data[pos++];
// data0/=10.0;
// data1/=10.0;
// session->AddEvent(new Event(t,CPAP_EAP, 0, data, 1));
// session->AddEvent(new Event(t,CPAP_IAP, 0, &data1, 1));
break;
*/
case 0x04: // Timed Breath case 0x04: // Timed Breath
// TB events have a duration in 0.1s, based on the review of pressure waveforms. // TB events have a duration in 0.1s, based on the review of pressure waveforms.
// TODO: Ideally the starting time here would be adjusted here, but PRS1ParsedEvents // TODO: Ideally the starting time here would be adjusted here, but PRS1ParsedEvents
@ -839,15 +804,13 @@ bool PRS1DataChunk::ParseEventsF5V2(void)
elapsed = data[pos]; elapsed = data[pos];
this->AddEvent(new PRS1ObstructiveApneaEvent(t - elapsed, 0)); this->AddEvent(new PRS1ObstructiveApneaEvent(t - elapsed, 0));
break; break;
/* case 0x06: // Clear Airway Apnea
case 0x06: // CA events are instantaneous flags with no duration: reviewing waveforms
DUMP_EVENT(); // shows that the time elapsed between the flag and reporting often includes
//code=CPAP_ClearAirway; // non-apnea breathing.
data0 = data[pos++]; elapsed = data[pos];
this->AddEvent(new PRS1ClearAirwayEvent(t - data0, data0)); this->AddEvent(new PRS1ClearAirwayEvent(t - elapsed, 0));
break; break;
*/
case 0x07: // Hypopnea case 0x07: // Hypopnea
// NOTE: No additional (unknown) first byte as in F5V3 0x07, but see below. // NOTE: No additional (unknown) first byte as in F5V3 0x07, but see below.
// This seems closer to F5V3 0x0d or 0x0e. // This seems closer to F5V3 0x0d or 0x0e.
@ -862,21 +825,7 @@ bool PRS1DataChunk::ParseEventsF5V2(void)
elapsed = data[pos]; // based on sample waveform, the hypopnea is over after this elapsed = data[pos]; // based on sample waveform, the hypopnea is over after this
this->AddEvent(new PRS1HypopneaEvent(t - elapsed, 0)); this->AddEvent(new PRS1HypopneaEvent(t - elapsed, 0));
break; break;
/* //case 0x09: // never seen on F5V2
case 0x09: // ASV Codes
DUMP_EVENT();
/ *
if (this->familyVersion<2) {
//code=CPAP_FlowLimit;
data0 = data[pos++];
this->AddEvent(new PRS1FlowLimitationEvent(t - data0, data0));
} else {
* /
data0 = data[pos++];
data1 = data[pos++];
break;
*/
case 0x0a: // Flow Limitation, note this is 0x9 in F5V1 and 0x8 in F5V3 case 0x0a: // Flow Limitation, note this is 0x9 in F5V1 and 0x8 in F5V3
// TODO: We should revisit whether this is elapsed or duration once (if) // TODO: We should revisit whether this is elapsed or duration once (if)
// we start calculating flow limitations ourselves. Flow limitations aren't // we start calculating flow limitations ourselves. Flow limitations aren't
@ -884,35 +833,21 @@ bool PRS1DataChunk::ParseEventsF5V2(void)
elapsed = data[pos]; elapsed = data[pos];
this->AddEvent(new PRS1FlowLimitationEvent(t - elapsed, 0)); this->AddEvent(new PRS1FlowLimitationEvent(t - elapsed, 0));
break; break;
/* case 0x0b: // Vibratory Snore, note this is 0xa in F5V1 and 0x9 in F5V3
case 0x0b: // Cheyne Stokes // VS events are instantaneous flags with no duration, drawn on the official waveform.
DUMP_EVENT(); // The current thinking is that these are the snores that cause a change in auto-titrating
data0 = ((unsigned char *)data)[pos + 1] << 8 | ((unsigned char *)data)[pos]; // pressure. The snoring statistic above seems to be a total count. It's unclear whether
//data0*=2; // the trigger for pressure change is severity or count or something else.
pos += 2; // no data bytes
data1 = ((unsigned char *)data)[pos]; //|data[pos+1] << 8 this->AddEvent(new PRS1VibratorySnoreEvent(t, 0));
pos += 1; break;
//tt-=delta;
this->AddEvent(new PRS1PeriodicBreathingEvent(t - data1, data0));
break;
*/
case 0x0c: // Periodic Breathing, note this is 0xb in F5V1 and 0xa in F5V3 case 0x0c: // Periodic Breathing, note this is 0xb in F5V1 and 0xa in F5V3
// PB events are reported some time after they conclude, and they do have a reported duration. // PB events are reported some time after they conclude, and they do have a reported duration.
duration = 2 * (data[pos] | (data[pos+1] << 8)); // confirmed to double in F5V0 duration = 2 * (data[pos] | (data[pos+1] << 8)); // confirmed to double in F5V0
elapsed = data[pos+2]; elapsed = data[pos+2];
this->AddEvent(new PRS1PeriodicBreathingEvent(t - elapsed - duration, duration)); this->AddEvent(new PRS1PeriodicBreathingEvent(t - elapsed - duration, duration));
break; break;
/* //case 0x0d: // never seen on F5V2
case 0x0d:
DUMP_EVENT();
data0 = (data[pos + 1] << 8 | data[pos]);
data0 *= 2;
pos += 2;
data1 = data[pos++];
//tt = t - qint64(data1) * 1000L;
break;
*/
case 0x0e: // Statistics, note this was 0x0d in F5V0 and F5V1 case 0x0e: // Statistics, note this was 0x0d in F5V0 and F5V1
// These appear every 2 minutes, so presumably summarize the preceding period. // These appear every 2 minutes, so presumably summarize the preceding period.
this->AddEvent(new PRS1IPAPAverageEvent(t, data[pos+0], GAIN)); // 00=IPAP this->AddEvent(new PRS1IPAPAverageEvent(t, data[pos+0], GAIN)); // 00=IPAP
@ -928,53 +863,6 @@ bool PRS1DataChunk::ParseEventsF5V2(void)
this->AddEvent(new PRS1LeakEvent(t, data[pos+0xa])); // 0A=Leak (average?) new to F5V1 (originally found in F5V3) this->AddEvent(new PRS1LeakEvent(t, data[pos+0xa])); // 0A=Leak (average?) new to F5V1 (originally found in F5V3)
this->AddEvent(new PRS1IntervalBoundaryEvent(t)); this->AddEvent(new PRS1IntervalBoundaryEvent(t));
break; break;
/*
case 0x0f:
DUMP_EVENT();
qDebug() << "0x0f Observed in ASV data!!????";
data0 = data[pos + 1] << 8 | data[pos];
pos += 2;
data1 = data[pos]; //|data[pos+1] << 8
pos += 1;
//tt -= qint64(data1) * 1000L;
//session->AddEvent(new Event(tt,cpapcode, 0, data, 2));
break;
case 0x10: // Unknown
DUMP_EVENT();
data0 = data[pos + 1] << 8 | data[pos];
pos += 2;
data1 = data[pos++];
this->AddEvent(new PRS1LargeLeakEvent(t - data1, data0));
// qDebug() << "0x10 Observed in ASV data!!????";
// data0 = data[pos++]; // << 8) | data[pos];
// data1 = data[pos++];
// data2 = data[pos++];
//session->AddEvent(new Event(t,cpapcode, 0, data, 3));
break;
case 0x11: // Not Leak Rate
DUMP_EVENT();
qDebug() << "0x11 Observed in ASV data!!????";
//if (!Code[24]) {
// Code[24]=new EventList(cpapcode,EVL_Event);
//}
//Code[24]->AddEvent(t,data[pos++]);
break;
case 0x12: // Summary
DUMP_EVENT();
qDebug() << "0x12 Observed in ASV data!!????";
data0 = data[pos++];
data1 = data[pos++];
//data2 = data[pos + 1] << 8 | data[pos];
pos += 2;
//session->AddEvent(new Event(t,cpapcode, 0, data,3));
break;
*/
default: default:
DUMP_EVENT(); DUMP_EVENT();
UNEXPECTED_VALUE(code, "known event code"); UNEXPECTED_VALUE(code, "known event code");

8
oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
View File

@ -2078,6 +2078,14 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
// TODO: Confirm that 4 is 12HT and update ParseTubingTypeV3. // TODO: Confirm that 4 is 12HT and update ParseTubingTypeV3.
this->ParseTubingTypeV3(data[pos]); this->ParseTubingTypeV3(data[pos]);
break; break;
case 0x48: // ??? Seen on DreamStation 2 non-Advanced (410)
// Appears between 0x2C and 0x2E, but the only values we've seen other than 0 is
// 1, which doesn't seem to be like a reasonable pressure (for ramp pressure) nor
// a boolean setting, which tends to be 0x80.
CHECK_VALUE(len, 1);
CHECK_VALUES(data[pos], 0, 1);
//this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data, size), pos, len));
break;
case 0x4a: // Patient controls access, specific to DreamStation 2. case 0x4a: // Patient controls access, specific to DreamStation 2.
CHECK_VALUE(len, 1); CHECK_VALUE(len, 1);
CHECK_VALUES(data[pos], 0, 0x80); CHECK_VALUES(data[pos], 0, 0x80);

16
oscar/oscar.pro
View File

@ -527,7 +527,6 @@ message("CXXFLAGS pre-mods $$QMAKE_CXXFLAGS ")
QMAKE_CFLAGS += -Werror QMAKE_CFLAGS += -Werror
QMAKE_CXXFLAGS += -Werror QMAKE_CXXFLAGS += -Werror
gcc | clang { gcc | clang {
COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion") COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
COMPILER_MAJOR = $$split(COMPILER_VERSION, ".") COMPILER_MAJOR = $$split(COMPILER_VERSION, ".")
@ -536,25 +535,28 @@ gcc | clang {
message("$$QMAKE_CXX major version $$COMPILER_MAJOR") message("$$QMAKE_CXX major version $$COMPILER_MAJOR")
} }
## equals($$QMAKE_CXX, "gcc") : { // guess what! the name is really "g++" gcc:!clang {
equals(QMAKE_CXX, g++) { message("Building for $$QMAKE_HOST.os")
message("Detected compiler g++")
greaterThan(COMPILER_MAJOR, 10) : { greaterThan(COMPILER_MAJOR, 10) : {
QMAKE_CFLAGS += -Wno-error=stringop-overread QMAKE_CFLAGS += -Wno-error=stringop-overread
QMAKE_CXXFLAGS += -Wno-error=stringop-overread QMAKE_CXXFLAGS += -Wno-error=stringop-overread
message("Making stringop-overread a non-error") message("Making stringop-overread a non-error")
} }
} }
equals(QMAKE_CXX, clang++) {
message("Detected compiler clang++")
}
clang {
message("Building for $$QMAKE_HOST.os")
QMAKE_CFLAGS_WARN_ON += -Wno-error=deprecated-copy
QMAKE_CXXFLAGS_WARN_ON += -Wno-error=deprecated-copy
message("Making deprecated-copy a non-error")
}
# Make deprecation warnings just warnings # Make deprecation warnings just warnings
QMAKE_CFLAGS += -Wno-error=deprecated-declarations QMAKE_CFLAGS += -Wno-error=deprecated-declarations
QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
message("CXXFLAGS post-mods $$QMAKE_CXXFLAGS ") message("CXXFLAGS post-mods $$QMAKE_CXXFLAGS ")
message("CXXFLAGS_WARN_ON $$QMAKE_CXXFLAGS_WARN_ON")
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
QMAKE_CFLAGS += -Wno-error=strict-aliasing QMAKE_CFLAGS += -Wno-error=strict-aliasing

157
oscar/overview.cpp
View File

@ -7,16 +7,19 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define NEWSTUFF
#define xDEBUG_FUNCTIONS #define xDEBUG_FUNCTIONS
#ifdef DEBUG_FUNCTIONS #ifdef DEBUG_FUNCTIONS
#include <QRegularExpression> #include <QRegularExpression>
#define DEBUGQ qDebug() #define DEBUGQ qDebug()
#define DEBUGL qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ #define DEBUGL qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__
#define DEBUGF qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__ #define DEBUGF qDebug()<< QString("%1[%2]%3").arg( QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) ).arg(__LINE__).arg(__func__)
#define DEBUGT qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")
#define DEBUGTF qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__ #define DEBUGTF qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
#define DEBUGT qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")
#define O( XX ) " " #XX ":" << XX #define O( XX ) " " #XX ":" << XX
#define Q( XX ) << #XX ":" << XX
#define R( XX )
#define OO( XX , YY ) " " #XX ":" << YY #define OO( XX , YY ) " " #XX ":" << YY
#define NAME( id) schema::channel[ id ].label() #define NAME( id) schema::channel[ id ].label()
#define DATE( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy") #define DATE( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy")
@ -74,7 +77,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
// Set Date controls locale to 4 digit years // Set Date controls locale to 4 digit years
QLocale locale = QLocale::system(); QLocale locale = QLocale::system();
QString shortformat = locale.dateFormat(QLocale::ShortFormat); shortformat = locale.dateFormat(QLocale::ShortFormat);
if (!shortformat.toLower().contains("yyyy")) { if (!shortformat.toLower().contains("yyyy")) {
shortformat.replace("yy", "yyyy"); shortformat.replace("yy", "yyyy");
@ -173,6 +176,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
GraphView->LoadSettings("Overview"); //no trans GraphView->LoadSettings("Overview"); //no trans
GraphView->setEmptyImage(QPixmap(":/icons/logo-md.png")); GraphView->setEmptyImage(QPixmap(":/icons/logo-md.png"));
dateErrorDisplay = new DateErrorDisplay(this);
connect(ui->dateStart->calendarWidget(), SIGNAL(currentPageChanged(int, int)), this, SLOT(dateStart_currentPageChanged(int, int))); connect(ui->dateStart->calendarWidget(), SIGNAL(currentPageChanged(int, int)), this, SLOT(dateStart_currentPageChanged(int, int)));
connect(ui->dateEnd->calendarWidget(), SIGNAL(currentPageChanged(int, int)), this, SLOT(dateEnd_currentPageChanged(int, int))); connect(ui->dateEnd->calendarWidget(), SIGNAL(currentPageChanged(int, int)), this, SLOT(dateEnd_currentPageChanged(int, int)));
@ -196,6 +200,11 @@ Overview::~Overview()
GraphView->SaveSettings("Overview");//no trans GraphView->SaveSettings("Overview");//no trans
delete ui; delete ui;
delete dateErrorDisplay;
delete icon_on ;
delete icon_off ;
delete icon_up_down ;
delete icon_warning ;
} }
void Overview::ResetFont() void Overview::ResetFont()
@ -235,12 +244,10 @@ void Overview::on_summaryChartEmpty(gSummaryChart*sc,qint64 firstI,qint64 lastI,
if (empty) { if (empty) {
// on next range change allow empty flag to be recalculated // on next range change allow empty flag to be recalculated
chartsEmpty.insert(sc,graph); chartsEmpty.insert(sc,graph);
//DEBUGF << graph->name() << "Chart is Empty" << "Range" << convertTimeToDate(firstI) << convertTimeToDate(lastI);
} else { } else {
// The chart has some entry with data. // The chart has some entry with data.
chartsEmpty.remove(sc); chartsEmpty.remove(sc);
updateGraphCombo(); updateGraphCombo();
//DEBUGF << graph->name() << "Chart is enabled with range:" << convertTimeToDate(firstI) << "==>" << convertTimeToDate(lastI) ;
} }
Q_UNUSED(firstI); Q_UNUSED(firstI);
Q_UNUSED(lastI); Q_UNUSED(lastI);
@ -322,11 +329,8 @@ void Overview::CreateAllGraphs() {
G->AddLayer(sc); G->AddLayer(sc);
chartsToBeMonitored.insert(sc,G); chartsToBeMonitored.insert(sc,G);
} }
if (sc== nullptr) { if (sc!= nullptr) {
//DEBUGF << "Channel" << name << "type" << chan->type() << "machine type" << chan->machtype() << "IGNORED";
} else {
sc ->reCalculate(); sc ->reCalculate();
//DEBUGF << "Channel" << name << "type" << chan->type() << "machine type" << chan->machtype() << OO(Empty,sc->isEmpty());
} }
} // if showInOverview() } // if showInOverview()
} // for chit } // for chit
@ -549,12 +553,6 @@ void Overview::on_XBoundsChanged(qint64 start,qint64 end)
// Only occurs when custom mode is switched to/from a latest mode. custom mode to/from last week. // Only occurs when custom mode is switched to/from a latest mode. custom mode to/from last week.
// All other displays expand the existing range. // All other displays expand the existing range.
// reset all empty flags to not empty // reset all empty flags to not empty
if (displayStartDate>maxRangeEndDate) {
//DEBUGF << "Two ranges" O(displayStartDate) <<">" << O(maxRangeEndDate);
}
if (minRangeStartDate>displayEndDate) {
//DEBUGF << "Two ranges" O(minRangeStartDate) <<">" << O(displayEndDate);
}
largerRange=true; largerRange=true;
chartsEmpty = QHash<gSummaryChart*, gGraph*>( chartsToBeMonitored ); chartsEmpty = QHash<gSummaryChart*, gGraph*>( chartsToBeMonitored );
minRangeStartDate = displayStartDate; minRangeStartDate = displayStartDate;
@ -562,24 +560,14 @@ void Overview::on_XBoundsChanged(qint64 start,qint64 end)
} else { } else {
// new range overlaps with old range // new range overlaps with old range
if (displayStartDate<minRangeStartDate) { if (displayStartDate<minRangeStartDate) {
//DEBUGF << "Start lower" <<O(minRangeStartDate)<< ">" <<O(displayStartDate);
largerRange=true; largerRange=true;
minRangeStartDate = displayStartDate; minRangeStartDate = displayStartDate;
} }
if (displayEndDate>maxRangeEndDate) { if (displayEndDate>maxRangeEndDate) {
//DEBUGF << "End Higher" <<O(maxRangeEndDate)<< "<" <<O(displayEndDate);
largerRange=true; largerRange=true;
maxRangeEndDate = displayEndDate; maxRangeEndDate = displayEndDate;
} }
} }
if (!largerRange) {
if (displayStartDate<minRangeStartDate ) {
//DEBUGF << "ERROR" <<O(minRangeStartDate)<< "==" <<O(displayStartDate);
}
if (displayEndDate>maxRangeEndDate) {
//DEBUGF << "ERROR" <<O(maxRangeEndDate)<< "==" <<O(displayEndDate);
}
}
if (largerRange) { if (largerRange) {
for (auto it= chartsEmpty.begin();it!=chartsEmpty.end();it++) { for (auto it= chartsEmpty.begin();it!=chartsEmpty.end();it++) {
@ -624,6 +612,10 @@ void Overview::dateEnd_currentPageChanged(int year, int month)
void Overview::on_dateEnd_dateChanged(const QDate &date) void Overview::on_dateEnd_dateChanged(const QDate &date)
{ {
if (date<uiStartDate) {
dateErrorDisplay->error(false,date);
return;
}
QDate d2(date); QDate d2(date);
if (customMode) { if (customMode) {
p_profile->general->setCustomOverviewRangeEnd(d2); p_profile->general->setCustomOverviewRangeEnd(d2);
@ -636,6 +628,11 @@ void Overview::on_dateEnd_dateChanged(const QDate &date)
void Overview::on_dateStart_dateChanged(const QDate &date) void Overview::on_dateStart_dateChanged(const QDate &date)
{ {
if (date>uiEndDate) {
// change date back to last date.
dateErrorDisplay->error(true,date);
return;
}
QDate d1(date); QDate d1(date);
if (customMode) { if (customMode) {
p_profile->general->setCustomOverviewRangeStart(d1); p_profile->general->setCustomOverviewRangeStart(d1);
@ -654,6 +651,7 @@ void Overview::on_zoomButton_clicked()
on_rangeCombo_activated(p_profile->general->lastOverviewRange()); // type of range in last use on_rangeCombo_activated(p_profile->general->lastOverviewRange()); // type of range in last use
} }
void Overview::ResetGraphLayout() void Overview::ResetGraphLayout()
{ {
GraphView->resetLayout(); GraphView->resetLayout();
@ -732,7 +730,7 @@ void Overview::on_rangeCombo_activated(int index)
// Ensure that all summary files are available and update version numbers if required // Ensure that all summary files are available and update version numbers if required
int size = start.daysTo(end); int size = start.daysTo(end);
qDebug() << "Overview range combo from" << start << "to" << end << "with" << size << "days"; // qDebug() << "Overview range combo from" << start << "to" << end << "with" << size << "days";
QDate dateback = end; QDate dateback = end;
CProgressBar * progress = new CProgressBar (QObject::tr("Loading summaries"), mainwin, size); CProgressBar * progress = new CProgressBar (QObject::tr("Loading summaries"), mainwin, size);
for (int i=1; i < size; ++i) { for (int i=1; i < size; ++i) {
@ -754,12 +752,101 @@ void Overview::on_rangeCombo_activated(int index)
setRange(start, end); setRange(start, end);
} }
DateErrorDisplay::DateErrorDisplay (Overview* overview)
: m_overview(overview)
{
m_visible=false;
m_timer = new QTimer();
connect(m_timer, SIGNAL(timeout()),this, SLOT(timerDone()));
};
DateErrorDisplay::~DateErrorDisplay() {
disconnect(m_timer, SIGNAL(timeout()),this, SLOT(timerDone()));
delete m_timer;
};
void DateErrorDisplay::cancel() {
m_visible=false;
m_timer->stop();
};
void DateErrorDisplay::timerDone() {
m_visible=false;
m_overview->resetUiDates();
m_overview->graphView()->m_parent_tooltip->cancel();
};
int Overview::calculatePixels(bool startDate,ToolTipAlignment& align) {
// Center error message over start and end dates combined.
// Other allignement were tested but this is the best for this problem.
Q_UNUSED(startDate);
int space=4;
align=TT_AlignCenter;
return ((4*space) + ui->label_3->width() + ui->rangeCombo->width() + ui->dateStartLabel->width() +ui->dateStart->width() );
}
void DateErrorDisplay::error(bool startDate,const QDate& dateEntered) {
m_startDate =m_overview->uiStartDate;
m_endDate =m_overview->uiEndDate;
ToolTipAlignment align=TT_AlignCenter;
QString dateFormatted =dateEntered.toString(m_overview->shortformat);
QString txt = QString(tr("ERROR\nThe start date MUST be before the end date"));
txt.append("\n");
if (startDate) {
txt.append(tr("The entered start date %1 is after the end date %2").arg(dateFormatted).arg(m_endDate.toString(m_overview->shortformat)));
txt.append(tr("\nHint: Change the end date first"));
} else {
txt.append(tr("The entered end date %1 ").arg(dateFormatted));
txt.append(tr("is before the start date %1").arg(m_startDate.toString(m_overview->shortformat)));
txt.append(tr("\nHint: Change the start date first"));
}
gGraphView* gv=m_overview->graphView();
int pixelsFromLeft = m_overview->calculatePixels(startDate,align);
int pixelsAboveBottom = 0;
int warningDurationMS =4000;
int resetUiDatesTimerDelayMS =1000;
//QFont* font=mediumfont;
QFont* font=defaultfont;
gv->m_parent_tooltip->display(gv,txt,pixelsAboveBottom,pixelsFromLeft, align, warningDurationMS , font);
m_timer->setInterval( resetUiDatesTimerDelayMS );
m_timer->setSingleShot(true);
m_timer->start();
};
void Overview::resetUiDates() {
ui->dateStart->blockSignals(true);
ui->dateStart->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY machine type
ui->dateStart->setMaximumDate(p_profile->LastDay());
ui->dateStart->setDate(uiStartDate);
ui->dateStart->blockSignals(false);
ui->dateEnd->blockSignals(true);
ui->dateEnd->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY machine type
ui->dateEnd->setMaximumDate(p_profile->LastDay());
ui->dateEnd->setDate(uiEndDate);
ui->dateEnd->blockSignals(false);
}
// Saves dates in UI, clicks zoom button, and updates combo box // Saves dates in UI, clicks zoom button, and updates combo box
// 1. Updates the dates in the start / end date boxs // 1. Updates the dates in the start / end date boxs
// 2. optionally also changes display range for graphs. // 2. optionally also changes display range for graphs.
void Overview::setRange(QDate& start, QDate& end, bool updateGraphs/*zoom*/) void Overview::setRange(QDate& start, QDate& end, bool updateGraphs/*zoom*/)
{ {
if (start>end) {
// this is an ERROR and shold NEVER occur.
return;
}
// first setting of the date (setDate) will cause pageChanged to be executed. // first setting of the date (setDate) will cause pageChanged to be executed.
// The pageChanged processing requires access to the other ui's date. // The pageChanged processing requires access to the other ui's date.
// so save them to memory before the first call. // so save them to memory before the first call.
@ -777,21 +864,7 @@ void Overview::setRange(QDate& start, QDate& end, bool updateGraphs/*zoom*/)
samePage=nextSamePage; samePage=nextSamePage;
} }
ui->dateEnd->blockSignals(true); resetUiDates();
ui->dateStart->blockSignals(true);
// Calling these methods for the first time trigger pageChange actions.
ui->dateEnd->setDate(end);
ui->dateEnd->setMinimumDate(start);
ui->dateStart->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY machine type
ui->dateEnd->setMaximumDate(p_profile->LastDay());
ui->dateStart->setDate(start);
ui->dateStart->setMaximumDate(end);
ui->dateEnd->blockSignals(false);
ui->dateStart->blockSignals(false);
if (updateGraphs) SetXBounds(uiStartDate,uiEndDate); if (updateGraphs) SetXBounds(uiStartDate,uiEndDate);
updateGraphCombo(); updateGraphCombo();
} }

32
oscar/overview.h
View File

@ -16,6 +16,7 @@
#endif #endif
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QDateEdit> #include <QDateEdit>
#include <QTimer>
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
#include "Graphs/gGraphView.h" #include "Graphs/gGraphView.h"
#include "Graphs/gSummaryChart.h" #include "Graphs/gSummaryChart.h"
@ -26,6 +27,27 @@ class Overview;
} }
class Report; class Report;
class Overview;
class DateErrorDisplay:QObject {
Q_OBJECT
public:
DateErrorDisplay (Overview* overview) ;
~DateErrorDisplay() ;
bool visible() {return m_visible;};
void cancel();
void error(bool startDate,const QDate& date);
protected:
private:
QTimer* m_timer;
bool m_visible=false;
Overview* m_overview;
QDate m_startDate;
QDate m_endDate;
private slots:
void timerDone();
};
enum YTickerType { YT_Number, YT_Time, YT_Weight }; enum YTickerType { YT_Number, YT_Time, YT_Weight };
@ -35,6 +57,7 @@ enum YTickerType { YT_Number, YT_Time, YT_Weight };
*/ */
class Overview : public QWidget class Overview : public QWidget
{ {
friend class DateErrorDisplay;
Q_OBJECT Q_OBJECT
public: public:
@ -103,8 +126,6 @@ class Overview : public QWidget
//! \brief Updates the calendar highlighting when changing to a new month //! \brief Updates the calendar highlighting when changing to a new month
void dateEnd_currentPageChanged(int year, int month); void dateEnd_currentPageChanged(int year, int month);
//void on_printDailyButton_clicked();
void on_rangeCombo_activated(int index); void on_rangeCombo_activated(int index);
void on_graphCombo_activated(int index); void on_graphCombo_activated(int index);
@ -143,6 +164,10 @@ class Overview : public QWidget
void disconnectgSummaryCharts() ; void disconnectgSummaryCharts() ;
void SetXBounds(qint64 minx, qint64 maxx, short group = 0, bool refresh = true); void SetXBounds(qint64 minx, qint64 maxx, short group = 0, bool refresh = true);
void SetXBounds(QDate & start, QDate& end, short group =0 , bool refresh = true); void SetXBounds(QDate & start, QDate& end, short group =0 , bool refresh = true);
void resetUiDates();
DateErrorDisplay* dateErrorDisplay;
int calculatePixels(bool startDate,ToolTipAlignment& align);
QString shortformat;
// Start and of dates of the current graph display // Start and of dates of the current graph display
QDate displayStartDate; QDate displayStartDate;
@ -166,4 +191,7 @@ class Overview : public QWidget
}; };
#endif // OVERVIEW_H #endif // OVERVIEW_H

119
oscar/test_macros.h Normal file
View File

@ -0,0 +1,119 @@
/* Test macros Implemntation
*
* Copyright (c) 2019-2022 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the source code
* for more details. */
/*
These functions will display formatted debug information.
The macro TEST_MACROS_ENABLED will enable these macros to display information
When The macro TEST_MACROS_ENABLED is undefined then these marcos will expand to white space.
When these macos are used then debugging is disabled
When only these macos are used then debugging is disabled.
SO for production code rename TEST_MACROS_ENABLED to TEST_MACROS_ENABLEDoff
###########################################
The the following to source cpp files
to turn on the debug macros for use.
#define TEST_MACROS_ENABLED
#include <test_macros.h>
To turn off the the test macros.
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
###########################################
*/
#ifndef TEST_MACROS_ENABLED_ONCE
#define TEST_MACROS_ENABLED_ONCE
#ifdef TEST_MACROS_ENABLED
#include <QRegularExpression>
#include <QFileInfo>
#define DEBUGL qDebug() <<QString("%1[%2]").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
//example:
//12361: Debug: "gGraphView[572]"
#define DEBUGF qDebug() <<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
//example:
//12361: Debug: "gGraphView[572]popoutGraph"
#define DEBUGT qDebug() <<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
//example:
//12645: Debug: "06:00:18.284 gGraphView[622]"
#define DEBUGTF qDebug() <<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
//example:
//12645: Debug: "06:00:18.284 gGraphView[622]popoutGraph"
// Macros to display variables
#define O( EXPRESSION ) << EXPRESSION
// return values from functions donr't work - QQ macro instead
#define Q( VALUE ) << "" #VALUE ":" << VALUE
//example:
//
#define QQ( TEXT , EXPRESSION) << #TEXT ":" << EXPRESSION
//example:
#define NAME( SCHEMECODE ) << schema::channel[ SCHEMECODE ].label()
//example:
#define FULLNAME( SCHEMECODE ) << schema::channel[ SCHEMEcODE ].fullname()
//example:
//display the date of an epoch time stamp "qint64"
#define DATE( EPOCH ) << QDateTime::fromMSecsSinceEpoch( EPOCH ).toString("dd MMM yyyy")
//display the date and Time of an epoch time stamp "qint64"
#define DATETIME( EPOCH ) << QDateTime::fromMSecsSinceEpoch( EPOCH ).toString("dd MMM yyyy hh:mm:ss.zzz")
/*
sample Lines.
code
DEBUGF Q(name) Q(title) QQ("UNITS",units) Q(height) Q(group);
output
00791: Debug: "gGraph[137]gGraph" name: "RespRate" title: "Respiratory Rate" "UNITS": "Rate of breaths per minute" height: 180 group: 0
DEBUGTF Q(newname);
12645: Debug: "06:00:18.284 gGraphView[622]popoutGraph" newname: "Pressure - Friday, April 15, 2022"
DEBUGF NAME(dot.code) Q(dot.type) QQ(y,(int)y) Q(ratioX) O(QLine(left + 1, y, left + 1 + width, y)) Q(legendx) O(dot.value) ;
92 00917: Debug: "gLineChart[568]paint" "Pressure" dot.type: 4 y: 341 ratioX: 1 QLine(QPoint(91,341),QPoint(464,341)) legendx: 463 12.04
*/
#else
// Turn debugging off. macros expands to white space
#define DEBUGL
#define DEBUGF
#define DEBUGT
#define DEBUGTF
#define O( XX )
#define Q( XX )
#define QQ( XX , YY )
#define NAME( id)
#define FULLNAME( id)
#define DATE( XX )
#define DATETIME( XX )
#endif
#endif