コミット: 9dbb6f4aa12696e6ef6e5f54a4767c7998858bf2 - QtSimpleDAQmx_CO_PulseGen (git)

Qt+MinGw環境でNIDAQmxを使ったパルス生成サンプル

コミットメタ情報

• リビジョン: 9dbb6f4aa12696e6ef6e5f54a4767c7998858bf2 (tree)
• 日時: 2012-11-14 21:22:06
• 作者: arakaki <alucky4416@user...>
• コミッター: arakaki

ログメッセージ

FIX: lost pulseout done. TaskDone() removed to EmptyEvent Procedure.

変更サマリ

• modified: daqthread.cpp
• modified: mainwindow.cpp

差分

--- a/daqthread.cpp
+++ b/daqthread.cpp
@@ -73,6 +73,17 @@ void DAQThread::run()
 
     while(!stopped) {
         if (EvtQue->isEmpty()) {
+            if (state == State_OUTPUT) {
+                bool32 done = 0;
+                DAQmxIsTaskDone(taskHandle, &done);
+                if (done) {
+                    DAQmxErrChk (DAQmxClearTask (taskHandle));
+                    taskHandle = 0;
+                    emit pulse_output_stopped();
+                    qDebug() << "done, stop pulse output."; // stop Pulse
+                    state = State_IDLE;
+                }
+            }
             msleep(100);
             continue;  // Jump to Next Loop
         }
@@ -115,22 +126,11 @@ void DAQThread::run()
                 //    int32 DAQmxBaseCfgImplicitTiming (TaskHandle taskHandle, int32 sampleMode, uInt64 sampsPerChanToAcquire);
                 DAQmxErrChk (DAQmxCfgImplicitTiming (taskHandle, DAQmx_Val_ContSamps, (uInt64)0));
                 DAQmxErrChk (DAQmxStartTask (taskHandle));
-            } else {
-                bool32 done = 0;
-                DAQmxIsTaskDone(taskHandle, &done);
-                if (done) {
-                    DAQmxErrChk (DAQmxClearTask (taskHandle));
-                    taskHandle = 0;
-                    emit pulse_output_stopped();
-                    qDebug() << "done, stop pulse output."; // stop Pulse
-                    state = State_IDLE;
-                }
             }
             break;
         default:
             break;
         }
-        msleep(100);
     }
 
 Error:

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -71,9 +71,9 @@ void MainWindow::on_pushButton_Output_clicked()
 {
     if (flag_output_status) {
         DaqTh->stopPulseOutput();
-        ui->pushButton_Output->setText("ON");
-        ui->comboBox_DevName->setEnabled(true);
-        flag_output_status = false;
+//        ui->pushButton_Output->setText("ON");
+//        ui->comboBox_DevName->setEnabled(true);
+//        flag_output_status = false;
     } else {
         int mode = ui->checkBox_ContMode->isChecked() ? 1 : 0;
         DaqTh->startPulseOutput(DevName,
@@ -147,5 +147,9 @@ void MainWindow::pulse_output_started()
 
 void MainWindow::pulse_output_stopped()
 {
+    ui->pushButton_Output->setText("ON");
+    ui->comboBox_DevName->setEnabled(true);
+    flag_output_status = false;
+
     ui->statusBar->showMessage("Idle...");
 }