Resist attempts to close GraphDlg while running

CompEphys-team · Oct 14, 2016 · 65b7597 · 65b7597
1 parent 1398c1e
commit 65b7597
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/gui/GraphDlg.cpp b/src/gui/GraphDlg.cpp
@@ -104,6 +104,12 @@ GraphDlg::~GraphDlg()
     delete ui;
 }
 
+void GraphDlg::reject()
+{
+    if ( !dataTimer.isActive() )
+        QDialog::reject();
+}
+
 void GraphDlg::reloadGraphs()
 {
     ui->plot->clearGraphs();
@@ -161,7 +167,7 @@ void GraphDlg::replot()
     bool rangeFound;
     QCPRange range = ui->plot->graph()->getKeyRange(rangeFound);
 
-    DataPoint point;
+    DataPoint point {0., 0.};
 
     if ( initial && q[0]->pop(point) ) {
         initial = false;
@@ -170,7 +176,7 @@ void GraphDlg::replot()
 
     int i = 0;
     double fac;
-    double tNow;
+    double tNow = 0.;
     for ( auto &queue : q ) {
         if ( Graphp[i].isVoltage )
             fac = 1e3;

diff --git a/src/include/GraphDlg.h b/src/include/GraphDlg.h
@@ -41,6 +41,7 @@ public slots:
      void startPlotting(DCThread *);
      void stopPlotting();
      void reloadGraphs();
+     void reject();
 }; 
 
 #endif