diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp index cac11f56..8c7f405e 100644 --- a/Graphs/gBarChart.cpp +++ b/Graphs/gBarChart.cpp @@ -83,6 +83,8 @@ void SummaryChart::SetDay(Day * nullday) fnd=true; total+=tmp; m_values[dn][j+1]=tmp; + if (tmpm_maxy) m_maxy=tmp; break; // } @@ -92,12 +94,16 @@ void SummaryChart::SetDay(Day * nullday) if (fnd) { if (!m_fday) m_fday=dn; m_values[dn][0]=total; - if (totalm_maxy) m_maxy=total; + if (m_graphtype==GT_BAR) { + if (totalm_maxy) m_maxy=total; + } m_empty=false; } } - m_miny=0; + if (m_graphtype==GT_BAR) { + m_miny=0; + } // m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; m_maxx=qint64(QDateTime(m_profile->LastDay().addDays(1),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; @@ -197,9 +203,9 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) int zd=minx/86400000L; zd--; QHash >::iterator d=m_values.find(zd); - if (d==m_values.end()) { - d=m_values.find(zd--); - } +// if (d==m_values.end()) { +// d=m_values.find(zd--); + // } lastdaygood=true; for (int i=0;i >::iterator d=m_values.find(zd); + d=m_values.find(zd); qint64 extra=86400000; - if (m_graphtype==GT_LINE) { - // extra*=2; - //extra=0; - } if (Qadd(lastX[j],lastY[j],px2,py2,col); diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index cbedd806..57861a4a 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -1158,18 +1158,20 @@ void gGraph::roundY(EventDataType &miny, EventDataType &maxy) maxy=m*50; m=floor(miny/50.0); miny=m*50; - } else if (maxy>80) { + } else if (maxy>100) { m=ceil(maxy/20.0); maxy=m*20; m=floor(miny/20.0); miny=m*20; - } else if (maxy>30) { + } else if (maxy>40) { m=ceil(maxy/10.0); + m++; maxy=m*10; m=floor(miny/10.0); + if(m<0) m--; miny=m*10; - } else if (maxy>=4) { - m=ceil(maxy/5.0); + } else if (maxy>=5) { + m=ceil(maxy/5.0)+1; maxy=m*5; m=floor(miny/5.0); miny=m*5; diff --git a/overview.cpp b/overview.cpp index 5957d355..83a7b484 100644 --- a/overview.cpp +++ b/overview.cpp @@ -95,7 +95,8 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : PR->AddLayer(new gXGrid()); lk=new SummaryChart(profile,"Avg Leak",GT_LINE); - lk->addSlice(CPAP_Leak,QColor("dark grey"),ST_WAVG); + lk->addSlice(CPAP_Leak,QColor("dark blue"),ST_WAVG); + lk->addSlice(CPAP_Leak,QColor("dark grey"),ST_90P); //lk->addSlice(CPAP_Leak,QColor("dark yellow")); //pr->addSlice(CPAP_IPAP,QColor("red")); LK->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);