diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index 489360f6..4de86d79 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -23,8 +23,8 @@ gYAxis::~gYAxis() } void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) { - static QColor DARK_GREY(0xb8,0xb8,0xb8,0xa0); - static QColor LIGHT_GREY(0xd8,0xd8,0xd8,0xa0); + static QColor DARK_GREY(0xc0,0xc0,0xc0,0x80); + static QColor LIGHT_GREY(0xd8,0xd8,0xd8,0x80); float x,y; int labelW=0; diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp index beb39181..3ebcd662 100644 --- a/Graphs/graphwindow.cpp +++ b/Graphs/graphwindow.cpp @@ -43,6 +43,8 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLWidget * s setFocusPolicy(Qt::StrongFocus); rmin_x=rmax_x=0; min_x=max_x=0; + rmin_y=rmax_y=0; + min_y=max_y=0; } /*gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext * context,Qt::WindowFlags f) diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 92fd4d91..4a8e05d9 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -314,7 +314,7 @@ bool Session::LoadEvents(QString filename) in >> s_last; qint16 mcsize; - in >> mcsize; // Summary size (number of Machine Code lists) + in >> mcsize; // number of Machine Code lists MachineCode code; qint64 ts1,ts2; diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index d1d080ae..eff1ec04 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -97,7 +97,6 @@ HEADERS += \ Graphs/gFlagsLine.h \ Graphs/glcommon.h \ Graphs/gTitle.h \ - Graphs/gCandleStick.h \ Graphs/gBarChart.h \ Graphs/gSegmentChart.h\ Graphs/gSessionTime.h \ diff --git a/daily.cpp b/daily.cpp index f14c0449..de47e1ef 100644 --- a/daily.cpp +++ b/daily.cpp @@ -223,7 +223,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : TAP_IAP->SetGradientBackground(false); TAP->SetMargins(0,0,0,0); - TAP->AddLayer(AddCPAP(seg=new gTAPGraph(CPAP_Pressure,GST_Line))); + TAP->AddLayer(AddCPAP(seg=new gTAPGraph(CPAP_Pressure,GST_CandleStick))); TAP->hide(); TAP->SetGradientBackground(false); @@ -573,7 +573,7 @@ void Daily::Load(QDate date) } html+="\n