Hopefully a CMS50E Oximeter serial import fix

Graphs/gGraphView.cpp

@@ -20,6 +20,9 @@ extern MainWindow *mainwin;
 
 #ifdef Q_WS_MAC
 #define USE_RENDERTEXT
+#include "OpenGL/glu.h"
+#else
+#include "GL/glu.h"
 #endif
 
 
@@ -2126,6 +2129,81 @@ void gGraphView::resizeGL(int w, int h)
     glLoadIdentity();
 }
 
+void gGraphView::renderSomethingFun()
+{
+    //glPushMatrix();
+    float w=width();
+    float h=height();
+    glViewport(0, 0, w, h);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    gluPerspective(65.0f,(GLfloat)w/(GLfloat)h,0.1f,100.0f);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+
+    glShadeModel(GL_SMOOTH);
+    glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
+    glClearDepth(1.0f);
+    glEnable(GL_DEPTH_TEST);
+    glDepthFunc(GL_LEQUAL);
+    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+
+    // This code has been shamelessly pinched of the interwebs..
+    // When I'm feeling more energetic, I'll change it to a textured sheep or something.
+    static float rotqube=0;
+
+    glLoadIdentity();
+
+    glTranslatef(0.0f, 0.0f,-7.0f);
+    glRotatef(rotqube,0.0f,1.0f,0.0f);
+    glRotatef(rotqube,1.0f,1.0f,1.0f);
+
+    glBegin(GL_QUADS);
+      glColor3f(0.0f,1.0f,0.0f);	// 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
+      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
+      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
+      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
+      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
+      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();
+
+    rotqube +=0.9f;
+
+    // Restore boring 2D reality..
+    glViewport(0, 0, w, h);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+
+    glOrtho(0, width(), height(), 0, -1, 1);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glDisable(GL_DEPTH_TEST);
+}
+
 void gGraphView::paintGL()
 {
 
@@ -2136,7 +2214,7 @@ void gGraphView::paintGL()
 
     glClearColor(255,255,255,255);
     //glClearDepth(1);
-    glClear(GL_COLOR_BUFFER_BIT);// | GL_DEPTH_BUFFER_BIT);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     /*glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -2227,8 +2305,10 @@ void gGraphView::paintGL()
     QColor col=Qt::black;
     if (!numgraphs) {
         int x,y;
+        if (m_emptytext!="fun") {
             GetTextExtent(m_emptytext,x,y,bigfont);
             AddTextQue(m_emptytext,(width()/2)-x/2,(height()/2)+y/2,0.0,col,bigfont);
+        } else renderSomethingFun();
     }
 
 

Graphs/gGraphView.h

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

SleepyHeadQT.pro

@@ -82,17 +82,17 @@ SOURCES += main.cpp\
 
 unix:SOURCES           += qextserialport/posix_qextserialport.cpp
 unix:!macx:SOURCES     += qextserialport/qextserialenumerator_unix.cpp
-unix:!macx:LIBS        += -lX11 -lz
+unix:!macx:LIBS        += -lX11 -lz -lGLU
 
 macx {
   SOURCES          += qextserialport/qextserialenumerator_osx.cpp
-  LIBS             += -framework IOKit -framework CoreFoundation -lz
+  LIBS             += -framework IOKit -framework CoreFoundation -lz -lGLU
 }
 
 win32 {
   SOURCES          += qextserialport/win_qextserialport.cpp qextserialport/qextserialenumerator_win.cpp
   DEFINES          += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this
-  LIBS             += -lsetupapi
+  LIBS             += -lsetupapi -lGLU
 
 
 }

oximetry.cpp

@@ -603,6 +603,9 @@ void CMS50Serial::ReadyRead()
 
     while (i<bytes.size()) {
         if (import_mode) {
+
+            // why can't this stay in a waitf6 loop for 30 or so seconds?
+
             if (waitf6) { //ack sequence from f6 command.
                 if ((unsigned char)bytes.at(i++)==0xf2) {
                     c=bytes.at(i);
@@ -666,10 +669,14 @@ 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;
@@ -697,13 +704,29 @@ void CMS50Serial::ReadyRead()
         }
     }
     if (import_mode && waitf6 && (cntf6==0)) {
-        failcnt++;
+        int i=imptime.elapsed();
 
-        if (failcnt>4) {
+        mainwin->getOximetry()->graphView()->setEmptyText("fun");
-            // Device missed the 0xf5 code sequence somehow..
+        mainwin->getOximetry()->graphView()->updateGL();
+
+        if (i>1000) {
+            //mainwin->getOximetry()->graphView()->setEmptyText("fun");
+            //mainwin->getOximetry()->graphView()->updateGL();
+            imptime.start();
+            failcnt++;
+            QString a;
+
+            if (failcnt>15) { // Give up after ~15 seconds
                 m_mode=SO_WAIT;
                 emit(importAborted());
+                mainwin->getOximetry()->graphView()->setEmptyText("Import Failed");
+                mainwin->getOximetry()->graphView()->updateGL();
                 return;
+            } else {
+                a="fun";
+                //for (int i=0;i<failcnt;i++) a+=".";
+                requestData(); // retransmit the data request code
+            }
         }
     }
     if (!import_mode)
@@ -741,10 +764,12 @@ bool CMS50Serial::startImport()
     if (!m_opened && !Open(QextSerialPort::EventDriven))
         return false;
 
+    imptime.start();
+
     m_callbacks=0;
     import_fails=0;
 
-    QTimer::singleShot(250,this,SLOT(startImportTimeout()));
+    QTimer::singleShot(5000,this,SLOT(startImportTimeout()));
     //make sure there is a data stream first..
     createSession();
 
@@ -1145,6 +1170,11 @@ void Oximetry::on_ImportButton_clicked()
     connect(oximeter,SIGNAL(importAborted()),this,SLOT(import_aborted()));
     connect(oximeter,SIGNAL(updateProgress(float)),this,SLOT(update_progress(float)));
 
+    day->getSessions().clear();
+    GraphView->setDay(day);
+    GraphView->setEmptyText("Importing");
+    GraphView->updateGL();
+
     if (!oximeter->startImport()) {
         mainwin->Notify(tr("Oximeter Error\n\nThe device did not respond.. Make sure it's switched on."));
         disconnect(oximeter,SIGNAL(importComplete(Session*)),this,SLOT(import_complete(Session*)));
@@ -1155,9 +1185,6 @@ void Oximetry::on_ImportButton_clicked()
     }
     //QTimer::singleShot(1000,this,SLOT(oximeter_running_check()));
 
-    day->getSessions().clear();
-    day->AddSession(oximeter->getSession());
-
     if (qprogress) {
         qprogress->setValue(0);
         qprogress->setMaximum(100);
@@ -1200,6 +1227,8 @@ void Oximetry::import_complete(Session * session)
 {
     qDebug() << "Oximetry import complete";
     import_finished();
+    day->AddSession(oximeter->getSession());
+
     if (!session) {
         qDebug() << "Shouldn't happen";
         return;

oximetry.h

@@ -245,6 +245,8 @@ protected:
 
     int received_bytes;
     int import_fails;
+
+    QTime imptime;
 };
 
 namespace Ui {