Commit: 63321b4324512be0bf8614c9995455c8a62e851f - QtSimpleDAQmx_CO_PulseGen (git)

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

Commit MetaInfo

• Revision: 63321b4324512be0bf8614c9995455c8a62e851f (tree)
• Time: 2012-11-09 23:29:37
• Author: arakaki <alucky4416@user...>
• Commiter: arakaki

Log Message

ADD: Add Widget: CheckBox for Select ContSamp/FiniteSamp mode.

Change Summary

• modified: daqthread.cpp
• modified: daqthread.h
• modified: mainwindow.cpp
• modified: mainwindow.h
• modified: mainwindow.ui

Incremental Difference

--- a/daqthread.cpp
+++ b/daqthread.cpp
@@ -25,13 +25,15 @@ void DAQThread::stop()
     stopped = true;
 }
 
-void DAQThread::startPulseOutput(QString &devname, float freq, float duty)
+void DAQThread::startPulseOutput(QString &devname, float freq, float duty, int continue_mode = 1, unsigned long long int pulsecount = 1)
 {
     QString tmpname = devname + "/ctr0";
     // qDebug() << "counter name  is " << tmpname;
     ctrname = tmpname.toLocal8Bit();
     pulse_freq = freq;
     pulse_duty = (float64)(duty / 100.0);
+    cont_mode = continue_mode ? DAQmx_Val_ContSamps : DAQmx_Val_FiniteSamps;
+    pulse_count = pulsecount;
     EvtQue->enqueue(Ev_Start);
 }
 
@@ -79,12 +81,13 @@ void DAQThread::run()
         switch (state) {
         case State_IDLE:
             if (event == Ev_Start) {
-                qDebug() << QString("start pulse output: freq = %1, ducy = %2").arg(pulse_freq).arg(pulse_duty);
+                qDebug() << QString("start pulse output: freq = %1, ducy = %2, mode = %3, count = %4").arg(pulse_freq).arg(pulse_duty).arg(cont_mode).arg(pulse_count);
                 //    int32 DAQmxBaseCreateCOPulseChanFreq (TaskHandle taskHandle, const char counter[ ], const char nameToAssignToChannel[ ], int32 units, int32 idleState, float64 initialDelay, float64 freq, float64 dutyCycle);
                 DAQmxErrChk (DAQmxCreateTask("", &taskHandle));
                 DAQmxErrChk (DAQmxCreateCOPulseChanFreq (taskHandle, ctrname, "", DAQmx_Val_Hz, DAQmx_Val_Low, (float64)0.0, pulse_freq, pulse_duty));
                 //    int32 DAQmxBaseCfgImplicitTiming (TaskHandle taskHandle, int32 sampleMode, uInt64 sampsPerChanToAcquire);
-                DAQmxErrChk (DAQmxCfgImplicitTiming (taskHandle, DAQmx_Val_ContSamps, (uInt64)0));
+                // DAQmxErrChk (DAQmxCfgImplicitTiming (taskHandle, DAQmx_Val_ContSamps, (uInt64)0));
+                DAQmxErrChk (DAQmxCfgImplicitTiming (taskHandle, cont_mode, pulse_count));
                 DAQmxErrChk (DAQmxStartTask (taskHandle));
                 emit pulse_output_started();
                 state = State_OUTPUT;
@@ -119,7 +122,7 @@ void DAQThread::run()
                     DAQmxErrChk (DAQmxClearTask (taskHandle));
                     taskHandle = 0;
                     emit pulse_output_stopped();
-                    qDebug() << "stop pulse output."; // stop Pulse
+                    qDebug() << "done, stop pulse output."; // stop Pulse
                     state = State_IDLE;
                 }
             }

--- a/daqthread.h
+++ b/daqthread.h
@@ -15,7 +15,7 @@ public:
     ~DAQThread();
     void stop();
 
-    void startPulseOutput(QString &devname, float freq, float duty);
+    void startPulseOutput(QString &devname, float freq, float duty, int mode, unsigned long long int pulsecount);
     void stopPulseOutput();
     void changePulseOutput(float freq, float duty);
 
@@ -38,6 +38,8 @@ private:
     QByteArray ctrname; //  = "Dev1/ctr0";
     float64 pulse_freq;
     float64 pulse_duty;
+    int32   cont_mode; // 1 = DAQmx_Val_ContSamps or 0 = DAQmx_Val_FiniteSamps
+    uInt64  pulse_count; // pulse count when DAQmx_Val_FiniteSamps
 
     // State Machine, state Id
     enum { State_IDLE = 0,

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -75,7 +75,12 @@ void MainWindow::on_pushButton_Output_clicked()
         ui->comboBox_DevName->setEnabled(true);
         flag_output_status = false;
     } else {
-        DaqTh->startPulseOutput(DevName, (float)ui->doubleSpinBox_Freq->value(), (float)ui->doubleSpinBox_Duty->value());
+        int mode = ui->checkBox_ContMode->isChecked() ? 1 : 0;
+        DaqTh->startPulseOutput(DevName,
+                                (float)ui->doubleSpinBox_Freq->value(),
+                                (float)ui->doubleSpinBox_Duty->value(),
+                                mode,
+                                (unsigned long long int)ui->spinBox_PulseCount->value());
         ui->pushButton_Output->setText("OFF");
         ui->comboBox_DevName->setEnabled(false);
         flag_output_status = true;
@@ -108,6 +113,15 @@ void MainWindow::on_horizontalSlider_Duty_valueChanged(int value)
     ui->doubleSpinBox_Duty->setValue((double)value);
 }
 
+void MainWindow::on_checkBox_ContMode_toggled(bool checked)
+{
+    if (checked) {
+        ui->spinBox_PulseCount->setEnabled(false);
+    } else {
+        ui->spinBox_PulseCount->setEnabled(true);
+    }
+}
+
 void MainWindow::daqmxbase_ready()
 {
     ui->statusBar->showMessage("Idle...");
@@ -135,4 +149,3 @@ void MainWindow::pulse_output_stopped()
 {
     ui->statusBar->showMessage("Idle...");
 }
-

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -30,6 +30,8 @@ private slots:
 
     void on_horizontalSlider_Duty_valueChanged(int value);
 
+    void on_checkBox_ContMode_toggled(bool checked);
+
     void daqmxbase_ready();
     void daqmxbase_final();
     void daqmxbase_error(QString ErrMsg);

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -22,15 +22,21 @@
      <rect>
       <x>80</x>
       <y>270</y>
-      <width>101</width>
+      <width>91</width>
       <height>31</height>
      </rect>
     </property>
+    <property name="alignment">
+     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+    </property>
     <property name="readOnly">
      <bool>true</bool>
     </property>
+    <property name="buttonSymbols">
+     <enum>QAbstractSpinBox::NoButtons</enum>
+    </property>
     <property name="suffix">
-     <string>Hz</string>
+     <string> Hz</string>
     </property>
     <property name="decimals">
      <number>0</number>
@@ -42,7 +48,7 @@
      <double>1.000000000000000</double>
     </property>
     <property name="value">
-     <double>1.000000000000000</double>
+     <double>1000.000000000000000</double>
     </property>
    </widget>
    <widget class="QLabel" name="label">
@@ -68,7 +74,7 @@
     <property name="geometry">
      <rect>
       <x>340</x>
-      <y>250</y>
+      <y>290</y>
       <width>141</width>
       <height>51</height>
      </rect>
@@ -86,8 +92,11 @@
       <height>31</height>
      </rect>
     </property>
+    <property name="alignment">
+     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+    </property>
     <property name="suffix">
-     <string>%</string>
+     <string> %</string>
     </property>
     <property name="decimals">
      <number>0</number>
@@ -106,7 +115,7 @@
     <property name="geometry">
      <rect>
       <x>340</x>
-      <y>230</y>
+      <y>270</y>
       <width>101</width>
       <height>18</height>
      </rect>
@@ -222,7 +231,7 @@
     <property name="geometry">
      <rect>
       <x>350</x>
-      <y>310</y>
+      <y>350</y>
       <width>191</width>
       <height>20</height>
      </rect>
@@ -318,6 +327,9 @@
       <height>28</height>
      </rect>
     </property>
+    <property name="currentIndex">
+     <number>3</number>
+    </property>
     <property name="maxCount">
      <number>2147483645</number>
     </property>
@@ -376,6 +388,63 @@
      <string>x Scale</string>
     </property>
    </widget>
+   <widget class="QSpinBox" name="spinBox_PulseCount">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
+    <property name="geometry">
+     <rect>
+      <x>340</x>
+      <y>190</y>
+      <width>121</width>
+      <height>22</height>
+     </rect>
+    </property>
+    <property name="wrapping">
+     <bool>false</bool>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+    </property>
+    <property name="minimum">
+     <number>1</number>
+    </property>
+    <property name="maximum">
+     <number>214748647</number>
+    </property>
+    <property name="value">
+     <number>1</number>
+    </property>
+   </widget>
+   <widget class="QCheckBox" name="checkBox_ContMode">
+    <property name="geometry">
+     <rect>
+      <x>340</x>
+      <y>150</y>
+      <width>141</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Continue Output Pulse</string>
+    </property>
+    <property name="checked">
+     <bool>true</bool>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_10">
+    <property name="geometry">
+     <rect>
+      <x>340</x>
+      <y>170</y>
+      <width>111</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Output Pulse Count</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">