Commit: 32b3c4ac97776b5fd651161cf615cb7638541f1e - SampleLCDOutput_DAQmxBase (git)

Commit MetaInfo

• Revision: 32b3c4ac97776b5fd651161cf615cb7638541f1e (tree)
• Zeit: 2013-12-11 00:15:01
• Autor: alucky4416 <alucky4416@user...>
• Commiter: alucky4416

Log Message

CHG: daqmx error handling when dio_init().

Ändern Zusammenfassung

• modified: mainwindow.cpp
• modified: mainwindow.ui
• modified: thlcdoutput.cpp

Diff

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -28,11 +28,15 @@ MainWindow::~MainWindow()
 
 void MainWindow::slot_dio_ready(int status)
 {
-    qDebug() << "DIO Ready.";
-    ui->statusBar->showMessage("Idle...");
-    ui->pushButton_Init->setEnabled(true);
-    ui->pushButton_Clear->setEnabled(true);
-    ui->pushButton_Enter->setEnabled(true);
+    if (status) {
+        ui->statusBar->showMessage("Device Error!");
+    } else {
+        qDebug() << "DIO Ready.";
+        ui->statusBar->showMessage("Idle...");
+        ui->pushButton_Init->setEnabled(true);
+        ui->pushButton_Clear->setEnabled(true);
+        ui->pushButton_Enter->setEnabled(true);
+    }
 }
 
 void MainWindow::on_pushButton_Init_clicked()

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -51,7 +51,7 @@
      <rect>
       <x>20</x>
       <y>10</y>
-      <width>161</width>
+      <width>191</width>
       <height>16</height>
      </rect>
     </property>

--- a/thlcdoutput.cpp
+++ b/thlcdoutput.cpp
@@ -266,6 +266,9 @@ void ThLCDOutput::run()
 
     err = dio_init();
     emit notify_dio_ready(err);
+    if (err) {
+        goto Error;
+    }
 
     lcd_init();
 
@@ -297,6 +300,8 @@ void ThLCDOutput::run()
     }
 
     dio_final();
+Error:
+    ;
 }
 void ThLCDOutput::sendEvent_Init()
 {