Minor bugfix and flow rate optimisations

Graphs/gGraphView.cpp

@@ -95,6 +95,7 @@ void InitGraphs()
         images["smiley"]=new QImage(":/icons/smileyface.png");
         //images["sad"]=new QImage(":/icons/sadface.png");
 
+        images["sheep"]=new QImage(":/icons/sheep.png");
         images["brick"]=new QImage(":/icons/brick.png");
         images["nographs"]=new QImage(":/icons/nographs.png");
         images["nodata"]=new QImage(":/icons/nodata.png");
@@ -2331,7 +2332,7 @@ void gGraphView::resizeGL(int w, int h)
     glLoadIdentity();
 }
 
-void gGraphView::renderSomethingFun()
+void gGraphView::renderSomethingFun(float alpha)
 {
     if (cubeimg.size()==0) return;
 //    glPushMatrix();
@@ -2394,7 +2395,7 @@ void gGraphView::renderSomethingFun()
 
     //glBindTexture(GL_TEXTURE_2D, cubetex); //texid[i % imgcount]);
     i++;
-    glColor4f(1,1,1,1);
+    glColor4f(1,1,1,alpha);
 
     glBegin(GL_QUADS);
     glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);	// Bottom Left Of The Texture and Quad
@@ -2747,8 +2748,14 @@ void gGraphView::paintGL()
         }
     }
 
+    // Need a really good condition/excuse to switch this on.. :-}
+    bool bereallyannoying=false;
+
     if (!m_inAnimation || (!m_fadingIn)) {
         // Not in animation sequence, draw graphs like normal
+        if (bereallyannoying)
+            renderSomethingFun(0.7);
+
         numgraphs=renderGraphs();
 
         if (!numgraphs) { // No graphs drawn?
@@ -2756,7 +2763,8 @@ void gGraphView::paintGL()
             GetTextExtent(m_emptytext,x,y,bigfont);
             int tp;
             if (something_fun && this->isVisible()) {// Do something fun instead
-                renderSomethingFun();
+                if (!bereallyannoying)
+                    renderSomethingFun();
                 tp=height()-(y/2);
             } else {
                 tp=height() / 2 + y / 2;
@@ -2800,7 +2808,7 @@ void gGraphView::paintGL()
     swapBuffers(); // Dump to screen.
 
     if (this->isVisible()) {
-        if (m_limbo || m_inAnimation || (something_fun && !numgraphs)) {
+        if (m_limbo || m_inAnimation || (something_fun && (bereallyannoying || !numgraphs))) {
             redrawtimer->setInterval(1000.0/50);
             redrawtimer->setSingleShot(true);
             redrawtimer->start();

Graphs/gGraphView.h

@@ -1020,7 +1020,7 @@ protected:
     //! \variable Scale used to enlarge graphs when less graphs than can fit on screen.
     float m_scaleY;
 
-    void renderSomethingFun();
+    void renderSomethingFun(float alpha=1);
 
     bool m_sizer_dragging;
     int m_sizer_index;

Graphs/gLineChart.cpp

@@ -520,10 +520,11 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                     }
 
                     // Unrolling square plot outside of loop to gain a minor speed improvement.
+                    EventStoreType *eptr=dptr+siz;
                     if (square_plot) {
-                        for (int i=0;i<siz;i++) {
+                        for (; dptr < eptr; dptr++) {
                             time=start + *tptr++;
-                            data=gain  * *dptr++;
+                            data=gain * *dptr;
 
                             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
@@ -553,9 +554,10 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                             }
                         }
                     } else {
-                        for (int i=0;i<siz;i++) {
+                        for (; dptr < eptr; dptr++) {
+                        //for (int i=0;i<siz;i++) {
                             time=start + *tptr++;
-                            data=gain  * *dptr++;
+                            data=gain  * *dptr;
 
                             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

Graphs/gSummaryChart.cpp

@@ -363,8 +363,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
     Day * day;
     EventDataType hours;
 
-    quint32 * tptr;
-    EventStoreType * dptr;
+    //quint32 * tptr;
+    //EventStoreType * dptr;
 
     short px2,py2;
     for (qint64 Q=minx;Q<=maxx+86400000L;Q+=86400000L) {

Resources.qrc

@@ -41,5 +41,6 @@
         <file>icons/bob-v3.0.png</file>
         <file>docs/script.js</file>
         <file>icons/nographs.png</file>
+        <file>icons/sheep.png</file>
     </qresource>
 </RCC>

daily.cpp

@@ -859,7 +859,7 @@ void Daily::Load(QDate date)
 
                 html+="</table></td>";
             } else if (cpap->machine->GetClass()==STR_MACH_Intellipap) {
-                html+="<td colspan=2 valign=top><table cellspacing=0 cellpadding=2 border=0 width='100%'>";
+                html+="<td colspan=2 valign=top><table cellspacing=0 cellpadding=1 border=0 width='100%'>";
                 html+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a class=info2 href='event=%6'>%3<span>%4</span></a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%5%</font></b></td></tr>\n")
                 .arg("#40c0c0").arg("black").arg(tr("Leak")).arg(schema::channel[CPAP_LeakFlag].description()).arg(lki,0,'f',2).arg(CPAP_LeakFlag);
 
@@ -1796,6 +1796,8 @@ void Daily::updateCube()
             GraphView->setCubeImage(images["nodata"]);
         }
     } else {
+        GraphView->setCubeImage(images["sheep"]);
+
         ui->toggleGraphs->setArrowType(Qt::DownArrow);
         ui->toggleGraphs->setToolTip(tr("Hide all graphs"));
         ui->toggleGraphs->blockSignals(true);

overview.cpp

@@ -517,11 +517,10 @@ void Overview::on_rangeCombo_activated(int index)
 }
 void Overview::setRange(QDate start, QDate end)
 {
-    ui->dateStart->setMaximumDate(end);
-    ui->dateEnd->setMinimumDate(start);
-
     ui->dateEnd->blockSignals(true);
     ui->dateStart->blockSignals(true);
+    ui->dateStart->setMaximumDate(end);
+    ui->dateEnd->setMinimumDate(start);
     ui->dateStart->setDate(start);
     ui->dateEnd->setDate(end);
     ui->dateEnd->blockSignals(false);