Improved oximetry messages

Graphs/gGraphView.cpp

@@ -1817,6 +1817,11 @@ gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
     timer=new QTimer(this);
     connect(timer,SIGNAL(timeout()),SLOT(refreshTimeout()));
     print_scaleY=print_scaleX=1.0;
+
+    redrawtimer=new QTimer(this);
+    //redrawtimer->setInterval(80);
+    //redrawtimer->start();
+    connect(redrawtimer,SIGNAL(timeout()),SLOT(repaint()));
 }
 gGraphView::~gGraphView()
 {
@@ -1838,6 +1843,7 @@ gGraphView::~gGraphView()
     if (m_scrollbar) {
         this->disconnect(SIGNAL(sliderMoved(int)),this);
     }
+    disconnect(redrawtimer,0,0,0);
     disconnect(timer,0,0,0);
     timer->stop();
     delete timer;
@@ -2137,7 +2143,7 @@ void gGraphView::renderSomethingFun()
     glViewport(0, 0, w, h);
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    gluPerspective(65.0f,(GLfloat)w/(GLfloat)h,0.1f,100.0f);
+    gluPerspective(35.0f,(GLfloat)w/(GLfloat)h,0.1f,100.0f);
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
 
@@ -2158,38 +2164,43 @@ void gGraphView::renderSomethingFun()
     glRotatef(rotqube,0.0f,1.0f,0.0f);
     glRotatef(rotqube,1.0f,1.0f,1.0f);
 
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
     glBegin(GL_QUADS);
-      glColor3f(0.0f,1.0f,0.0f);	// Color Blue
+      float alpha=0.08;
+      glColor4f(0.0f,1.0f,0.0f,alpha);	// Color Blue
       glVertex3f( 1.0f, 1.0f,-1.0f);	// Top Right Of The Quad (Top)
       glVertex3f(-1.0f, 1.0f,-1.0f);	// Top Left Of The Quad (Top)
       glVertex3f(-1.0f, 1.0f, 1.0f);	// Bottom Left Of The Quad (Top)
       glVertex3f( 1.0f, 1.0f, 1.0f);	// Bottom Right Of The Quad (Top)
-      glColor3f(1.0f,0.5f,0.0f);	// Color Orange
+      glColor4f(1.0f,0.5f,0.0f,alpha);	// Color Orange
       glVertex3f( 1.0f,-1.0f, 1.0f);	// Top Right Of The Quad (Bottom)
       glVertex3f(-1.0f,-1.0f, 1.0f);	// Top Left Of The Quad (Bottom)
       glVertex3f(-1.0f,-1.0f,-1.0f);	// Bottom Left Of The Quad (Bottom)
       glVertex3f( 1.0f,-1.0f,-1.0f);	// Bottom Right Of The Quad (Bottom)
-      glColor3f(1.0f,0.0f,0.0f);	// Color Red
+      glColor4f(1.0f,0.0f,0.0f,alpha);	// Color Red
       glVertex3f( 1.0f, 1.0f, 1.0f);	// Top Right Of The Quad (Front)
       glVertex3f(-1.0f, 1.0f, 1.0f);	// Top Left Of The Quad (Front)
       glVertex3f(-1.0f,-1.0f, 1.0f);	// Bottom Left Of The Quad (Front)
       glVertex3f( 1.0f,-1.0f, 1.0f);	// Bottom Right Of The Quad (Front)
-      glColor3f(1.0f,1.0f,0.0f);	// Color Yellow
+      glColor4f(1.0f,1.0f,0.0f,alpha);	// Color Yellow
       glVertex3f( 1.0f,-1.0f,-1.0f);	// Top Right Of The Quad (Back)
       glVertex3f(-1.0f,-1.0f,-1.0f);	// Top Left Of The Quad (Back)
       glVertex3f(-1.0f, 1.0f,-1.0f);	// Bottom Left Of The Quad (Back)
       glVertex3f( 1.0f, 1.0f,-1.0f);	// Bottom Right Of The Quad (Back)
-      glColor3f(0.0f,0.0f,1.0f);	// Color Blue
+      glColor4f(0.0f,0.0f,1.0f,alpha);	// Color Blue
       glVertex3f(-1.0f, 1.0f, 1.0f);	// Top Right Of The Quad (Left)
       glVertex3f(-1.0f, 1.0f,-1.0f);	// Top Left Of The Quad (Left)
       glVertex3f(-1.0f,-1.0f,-1.0f);	// Bottom Left Of The Quad (Left)
       glVertex3f(-1.0f,-1.0f, 1.0f);	// Bottom Right Of The Quad (Left)
-      glColor3f(1.0f,0.0f,1.0f);	// Color Violet
+      glColor4f(1.0f,0.0f,1.0f,alpha);	// Color Violet
       glVertex3f( 1.0f, 1.0f,-1.0f);	// Top Right Of The Quad (Right)
       glVertex3f( 1.0f, 1.0f, 1.0f);	// Top Left Of The Quad (Right)
       glVertex3f( 1.0f,-1.0f, 1.0f);	// Bottom Left Of The Quad (Right)
       glVertex3f( 1.0f,-1.0f,-1.0f);	// Bottom Right Of The Quad (Right)
     glEnd();
+    glDisable(GL_BLEND);
 
     rotqube +=0.9f;
 
@@ -2206,6 +2217,11 @@ void gGraphView::renderSomethingFun()
 
 void gGraphView::paintGL()
 {
+    bool something_fun=PREF.ExistsAndTrue("SomeFun");
+
+    if (something_fun && redrawtimer->isActive()) {
+        redrawtimer->stop();
+    }
 
     if (width()<=0) return;
     if (height()<=0) return;
@@ -2216,6 +2232,9 @@ void gGraphView::paintGL()
     //glClearDepth(1);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+    if (something_fun)
+        renderSomethingFun();
+
     /*glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glBegin(GL_QUADS);
@@ -2344,6 +2363,11 @@ void gGraphView::paintGL()
     //glDisable(GL_DEPTH_TEST);
     swapBuffers(); // Dump to screen.
 
+    if (something_fun && this->isVisible()) {
+        redrawtimer->setInterval(25);
+        redrawtimer->setSingleShot(true);
+        redrawtimer->start();
+    }
 
     //qDebug() << "Graph Prep,Draw" << el << "," << time.elapsed()-el << "ms x" << thr;
 }

Graphs/gGraphView.h

@@ -888,6 +888,7 @@ protected:
     int m_horiz_travel;
 
     MyScrollBar * m_scrollbar;
+    QTimer *redrawtimer;
 
     bool m_graph_dragging;
     int m_graph_index;
@@ -912,6 +913,7 @@ public slots:
 
     //! \brief Simply refreshes the GL view, called when timeout expires.
     void refreshTimeout();
+
 };
 
 #endif // GGRAPHVIEW_H

oximetry.cpp

@@ -656,6 +656,9 @@ void CMS50Serial::ReadyRead()
                             c=bytes.at(z);
                             if (c & 0x80) break;
                         }
+                        mainwin->getOximetry()->graphView()->setEmptyText("Please Wait, Importing...");
+                        mainwin->getOximetry()->graphView()->updateGL();
+
                         data.clear();
                         for (z=i;z<size;z++) {
                             data.push_back(bytes.at(z));
@@ -669,14 +672,10 @@ void CMS50Serial::ReadyRead()
                 }
             } else {
                 qDebug() << "Recieving Block" << size << "(" << received_bytes << "of" << datasize <<")";
-                mainwin->getOximetry()->graphView()->setEmptyText("fun");
-                mainwin->getOximetry()->graphView()->updateGL();
                 for (int z=i;z<size;z++) {
                     data.push_back(bytes.at(z));
                     received_bytes++;
                 }
-                mainwin->getOximetry()->graphView()->updateGL();
-                mainwin->getOximetry()->graphView()->updateGL();
                 emit(updateProgress(float(received_bytes)/float(datasize)));
                 if ((received_bytes>=datasize) || (((received_bytes/datasize)>0.7) && (size<250))) {
                     done_import=true;
@@ -706,8 +705,8 @@ void CMS50Serial::ReadyRead()
     if (import_mode && waitf6 && (cntf6==0)) {
         int i=imptime.elapsed();
 
-        mainwin->getOximetry()->graphView()->setEmptyText("fun");
+        //mainwin->getOximetry()->graphView()->setEmptyText("fun");
-        mainwin->getOximetry()->graphView()->updateGL();
+        //mainwin->getOximetry()->graphView()->updateGL();
 
         if (i>1000) {
             //mainwin->getOximetry()->graphView()->setEmptyText("fun");
@@ -723,8 +722,10 @@ void CMS50Serial::ReadyRead()
                 mainwin->getOximetry()->graphView()->updateGL();
                 return;
             } else {
-                a="fun";
+                a="Waiting";
-                //for (int i=0;i<failcnt;i++) a+=".";
+                for (int i=0;i<failcnt;i++) a+=".";
+                mainwin->getOximetry()->graphView()->setEmptyText(a);
+                mainwin->getOximetry()->graphView()->updateGL();
                 requestData(); // retransmit the data request code
             }
         }
@@ -1172,7 +1173,7 @@ void Oximetry::on_ImportButton_clicked()
 
     day->getSessions().clear();
     GraphView->setDay(day);
-    GraphView->setEmptyText("Importing");
+    GraphView->setEmptyText("Make Sure Oximeter Is Ready");
     GraphView->updateGL();
 
     if (!oximeter->startImport()) {