Add a cancel button to import auto-scanner

sleepyhead/Graphs/MinutesAtPressure.cpp

@@ -282,10 +282,11 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
 
         }
 
-        double estep =  float(height) / ipap.peakevents;
+        double estep;
 
 
         if (ipap.peakevents>0) {
+            estep =  float(height) / ipap.peakevents;
             for (int k=0; k<ipap.chans.size(); ++k) {
                 ChannelID ch = ipap.chans.at(k);
                 //(ch != CPAP_AHI) &&
@@ -338,6 +339,60 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
             }
         }
 
+        if (0 && epap.peakevents>0) {
+            estep =  float(height) / epap.peakevents;
+            for (int k=0; k<epap.chans.size(); ++k) {
+                ChannelID ch = epap.chans.at(k);
+                //(ch != CPAP_AHI) &&
+                if ((ch != CPAP_Hypopnea) && (ch != CPAP_Obstructive) && (ch != CPAP_ClearAirway) && (ch != CPAP_Apnea)) continue;
+                schema::Channel & chan = schema::channel[ch];
+                QColor col = chan.defaultColor();
+                col.setAlpha(50);
+                painter.setPen(col);
+                painter.setPen(QPen(col, p_profile->appearance->lineThickness()));
+
+
+                xp = left;
+                lastyp = bottom - (float(epap.events[ch][min-1]) * estep);
+                for (int i=min; i<max; ++i) {
+                    p0 = epap.events[ch][i-1];
+                    p1 = epap.events[ch][i];
+                    p2 = epap.events[ch][i+1];
+                    p3 = epap.events[ch][i+1];
+                    yp = bottom - (float(p1) * estep);
+                    painter.drawLine(xp, lastyp, xp+xstep, yp);
+                    lastyp = yp;
+                    xp += xstep;
+
+                    float s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.2),0.0f);
+                    yp = qMax(bottom-height, float(bottom - (s2 * estep)));
+                    painter.drawLine(xp, lastyp, xp+xstep, yp);
+
+                    lastyp = yp;
+                    xp += xstep;
+                    s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.4),0.0f);
+                    yp = qMax(bottom-height, float(bottom - (s2 * estep)));
+                    painter.drawLine(xp, lastyp, xp+xstep, yp);
+                    lastyp = yp;
+                    xp += xstep;
+
+                    s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.6),0.0f);
+                    yp = qMax(bottom-height, float(bottom - (s2 * estep)));
+                    painter.drawLine(xp, lastyp, xp+xstep, yp);
+                    xp+=xstep;
+                    lastyp = yp;
+
+                    s2 = qMax(CatmullRomSpline(p0, p1, p2, p3, 0.8),0.0f);
+                    yp = qMax(bottom-height, float(bottom - (s2 * estep)));
+                    painter.drawLine(xp, lastyp, xp+xstep, yp);
+                    xp+=xstep;
+                    lastyp = yp;
+
+
+                }
+            }
+        }
+
 
         if (epap.min_pressure) {
             schema::Channel & echan = schema::channel[epap.code];

sleepyhead/mainwindow.cpp

@@ -860,6 +860,11 @@ QStringList getDriveList()
     return drivelist;
 }
 
+void ImportDialogScan::cancelbutton()
+{
+    mainwin->importScanCancelled = true;
+    hide();
+}
 
 QList<ImportPath> MainWindow::detectCPAPCards()
 {
@@ -872,7 +877,7 @@ QList<ImportPath> MainWindow::detectCPAPCards()
     time.start();
 
     // Create dialog
-    QDialog popup(this, Qt::SplashScreen);
+    ImportDialogScan popup(this) ;//, Qt::SplashScreen);
     QLabel waitmsg(tr("Please insert your CPAP data card..."));
     QProgressBar progress;
     QVBoxLayout waitlayout;
@@ -881,15 +886,20 @@ QList<ImportPath> MainWindow::detectCPAPCards()
     QHBoxLayout layout2;
     QIcon icon("://icons/sdcard.png");
     QPushButton skipbtn(icon, tr("Choose a folder"));
+    QPushButton cancelbtn(STR_MessageBox_Cancel);
     skipbtn.setMinimumHeight(40);
+    cancelbtn.setMinimumHeight(40);
     waitlayout.addWidget(&waitmsg,1,Qt::AlignCenter);
     waitlayout.addWidget(&progress,1);
     waitlayout.addLayout(&layout2,1);
     layout2.addWidget(&skipbtn);
+    layout2.addWidget(&cancelbtn);
     popup.connect(&skipbtn, SIGNAL(clicked()), &popup, SLOT(hide()));
+    popup.connect(&cancelbtn, SIGNAL(clicked()), &popup, SLOT(cancelbutton()));
     progress.setValue(0);
     progress.setMaximum(timeout);
     progress.setVisible(true);
+    importScanCancelled = false;
     popup.show();
     QApplication::processEvents();
     QString lastpath = (*p_profile)[STR_PREF_LastCPAPPath].toString();
@@ -911,19 +921,23 @@ QList<ImportPath> MainWindow::detectCPAPCards()
 
                     qDebug() << "Found" << loader->loaderName() << "datacard at" << path;
                 }
+                QApplication::processEvents();
             }
         }
         int el=time.elapsed();
         progress.setValue(el);
-        QApplication::processEvents();
         if (el > timeout) break;
         if (!popup.isVisible()) break;
         // needs a slight delay here
-        QThread::msleep(200);
+        for (int i=0; i<5; ++i) {
+            QThread::msleep(50);
+            QApplication::processEvents();
+        }
     } while (detectedCards.size() == 0);
 
     popup.hide();
     popup.disconnect(&skipbtn, SIGNAL(clicked()), &popup, SLOT(hide()));
+    popup.disconnect(&cancelbtn, SIGNAL(clicked()), &popup, SLOT(hide()));
 
     return detectedCards;
 }
@@ -944,6 +958,8 @@ void MainWindow::on_action_Import_Data_triggered()
 
     QList<ImportPath> datacards = detectCPAPCards();
 
+    if (importScanCancelled) return;
+
     QList<MachineLoader *>loaders = GetLoaders(MT_CPAP);
 
     QTime time;

sleepyhead/mainwindow.h

@@ -144,6 +144,8 @@ class MainWindow : public QMainWindow
 
     void log(QString text);
 
+    bool importScanCancelled;
+
   public slots:
     //! \brief Recalculate all event summaries and flags
     void doReprocessEvents();
@@ -368,4 +370,19 @@ private:
     QTimer wtimer;
 };
 
+class ImportDialogScan:public QDialog
+{
+    Q_OBJECT
+public:
+    ImportDialogScan(QWidget * parent) :QDialog(parent, Qt::SplashScreen)
+    {
+    }
+    virtual ~ImportDialogScan()
+    {
+    }
+public slots:
+    virtual void cancelbutton();
+};
+
+
 #endif // MAINWINDOW_H