Commit: 1ed5db835fc216132340089c6329066ffb7048e1 - QtSimpleDAQ_CO_PulseGen (git)

QtSDK と NI-DAQmxBase (Linux) を使った単純なサンプル

Commit MetaInfo

• Revision: 1ed5db835fc216132340089c6329066ffb7048e1 (tree)
• Time: 2012-08-29 17:13:46
• Author: arakaki <alucky4416@user...>
• Commiter: arakaki

Log Message

CHG: add DevName combobox Widget for selectable DeviceName.

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,8 +25,11 @@ void DAQThread::stop()
     stopped = true;
 }
 
-void DAQThread::startPulseOutput(float freq, float duty)
+void DAQThread::startPulseOutput(QString &devname, float freq, float duty)
 {
+    QString tmpname = devname + "/ctr0";
+    // qDebug() << "counter name  is " << tmpname;
+    ctrname = tmpname.toLocal8Bit();
     pulse_freq = freq;
     pulse_duty = (float64)(duty / 100.0);
     EvtQue->enqueue(Ev_Start);
@@ -48,9 +51,10 @@ void DAQThread::run()
 {
     int32       error = 0;
     char        errBuff[2048] = { '\0' };
-    char        ctrname[128] = "Dev1/ctr0";
+//    char        ctrname[128] = "Dev1/ctr0";
 
     taskHandle = 0;
+    ctrname = "Dev1/ctr0";
     pulse_freq = (float64)1000.0;
     pulse_duty = (float64)0.50; // 0.50 is 50%
     int event = 0;

--- a/daqthread.h
+++ b/daqthread.h
@@ -15,7 +15,7 @@ public:
     ~DAQThread();
     void stop();
 
-    void startPulseOutput(float freq, float duty);
+    void startPulseOutput(QString &devname, float freq, float duty);
     void stopPulseOutput();
     void changePulseOutput(float freq, float duty);
 
@@ -35,6 +35,7 @@ private:
     volatile bool stopped;
 
     TaskHandle  taskHandle; // Daqmxbase task handle
+    QByteArray ctrname; //  = "Dev1/ctr0";
     float64 pulse_freq;
     float64 pulse_duty;
 

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4,12 +4,22 @@
 #include <QDebug>
 #include <QMessageBox>
 
+#include <QRegExp>
+#include <QRegExpValidator>
+
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
 
+    QRegExp regexpDevName("Dev[1-9][0-9]*");
+    ui->comboBox_DevName->setValidator(new QRegExpValidator(regexpDevName, this));
+    ui->comboBox_DevName->setEditable(true);
+    ui->comboBox_DevName->setEnabled(true);
+    ui->comboBox_DevName->setCurrentIndex(0);
+    DevName = "Dev1";
+
     ui->statusBar->showMessage("DaqmxBase Initialize...");
     ui->pushButton_Output->setEnabled(false);
     ui->pushButton_Output->setText("ON");
@@ -49,15 +59,23 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+void MainWindow::on_comboBox_DevName_editTextChanged(const QString &arg1)
+{
+    DevName = arg1;
+//    qDebug() << QString("combobox_Devname is %1").arg(DevName);
+}
+
 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;
     } else {
-        DaqTh->startPulseOutput((float)ui->doubleSpinBox_Freq->value(), (float)ui->doubleSpinBox_Duty->value());
+        DaqTh->startPulseOutput(DevName, (float)ui->doubleSpinBox_Freq->value(), (float)ui->doubleSpinBox_Duty->value());
         ui->pushButton_Output->setText("OFF");
+        ui->comboBox_DevName->setEnabled(false);
         flag_output_status = true;
     }
 }
@@ -113,5 +131,3 @@ void MainWindow::pulse_output_stopped()
 {
     ui->statusBar->showMessage("Idle...");
 }
-
-

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -18,6 +18,8 @@ public:
     ~MainWindow();
 
 private slots:
+    void on_comboBox_DevName_editTextChanged(const QString &arg1);
+
     void on_pushButton_Output_clicked();
 
     void on_doubleSpinBox_Freq_valueChanged(double arg1);
@@ -35,11 +37,13 @@ private slots:
     void pulse_output_stopped();
 
 
+
 private:
     Ui::MainWindow *ui;
 
     DAQThread *DaqTh;
     bool flag_output_status;
+    QString DevName;
 };
 
 #endif // MAINWINDOW_H

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>439</height>
+    <width>562</width>
+    <height>500</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,7 +18,7 @@
     <property name="geometry">
      <rect>
       <x>80</x>
-      <y>200</y>
+      <y>260</y>
       <width>101</width>
       <height>31</height>
      </rect>
@@ -43,7 +43,7 @@
     <property name="geometry">
      <rect>
       <x>40</x>
-      <y>40</y>
+      <y>110</y>
       <width>121</width>
       <height>18</height>
      </rect>
@@ -62,7 +62,7 @@
     <property name="geometry">
      <rect>
       <x>280</x>
-      <y>190</y>
+      <y>250</y>
       <width>141</width>
       <height>51</height>
      </rect>
@@ -75,7 +75,7 @@
     <property name="geometry">
      <rect>
       <x>80</x>
-      <y>310</y>
+      <y>370</y>
       <width>101</width>
       <height>31</height>
      </rect>
@@ -100,7 +100,7 @@
     <property name="geometry">
      <rect>
       <x>280</x>
-      <y>170</y>
+      <y>230</y>
       <width>101</width>
       <height>18</height>
      </rect>
@@ -119,7 +119,7 @@
     <property name="geometry">
      <rect>
       <x>40</x>
-      <y>260</y>
+      <y>320</y>
       <width>81</width>
       <height>18</height>
      </rect>
@@ -151,7 +151,7 @@
     <property name="geometry">
      <rect>
       <x>40</x>
-      <y>280</y>
+      <y>340</y>
       <width>160</width>
       <height>19</height>
      </rect>
@@ -173,7 +173,7 @@
     <property name="geometry">
      <rect>
       <x>30</x>
-      <y>60</y>
+      <y>120</y>
       <width>181</width>
       <height>131</height>
      </rect>
@@ -216,7 +216,7 @@
     <property name="geometry">
      <rect>
       <x>290</x>
-      <y>250</y>
+      <y>310</y>
       <width>191</width>
       <height>20</height>
      </rect>
@@ -229,7 +229,7 @@
     <property name="geometry">
      <rect>
       <x>60</x>
-      <y>170</y>
+      <y>230</y>
       <width>21</width>
       <height>18</height>
      </rect>
@@ -242,7 +242,7 @@
     <property name="geometry">
      <rect>
       <x>170</x>
-      <y>170</y>
+      <y>230</y>
       <width>61</width>
       <height>18</height>
      </rect>
@@ -251,13 +251,65 @@
      <string>1000000</string>
     </property>
    </widget>
+   <widget class="QComboBox" name="comboBox_DevName">
+    <property name="geometry">
+     <rect>
+      <x>40</x>
+      <y>60</y>
+      <width>121</width>
+      <height>28</height>
+     </rect>
+    </property>
+    <property name="editable">
+     <bool>true</bool>
+    </property>
+    <item>
+     <property name="text">
+      <string>Dev1</string>
+     </property>
+    </item>
+    <item>
+     <property name="text">
+      <string>Dev2</string>
+     </property>
+    </item>
+    <item>
+     <property name="text">
+      <string>Dev3</string>
+     </property>
+    </item>
+    <item>
+     <property name="text">
+      <string>Dev4</string>
+     </property>
+    </item>
+   </widget>
+   <widget class="QLabel" name="label_8">
+    <property name="geometry">
+     <rect>
+      <x>40</x>
+      <y>40</y>
+      <width>121</width>
+      <height>18</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <weight>75</weight>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>DevName</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>500</width>
+     <width>562</width>
      <height>26</height>
     </rect>
    </property>