Commit: e8aba50946dd6e3c52d4f7552121bd5ab5144e81 - QtSimpleDAQmx_CO_PulseGen (git)

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

Commit MetaInfo

• Revision: e8aba50946dd6e3c52d4f7552121bd5ab5144e81 (tree)
• Time: 2012-12-08 18:24:21
• Author: arakaki <alucky4416@user...>
• Commiter: arakaki

Log Message

CHG: refactoring.

Change Summary

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

Incremental Difference

--- a/daqthread.h
+++ b/daqthread.h
@@ -14,8 +14,7 @@ public:
     explicit DAQThread(QObject *parent = 0);
     ~DAQThread();
     void stop();
-
-    void startPulseOutput(QString &devname, float freq, float duty, int mode, unsigned long long int pulsecount);
+    void startPulseOutput(QString &devname, float freq, float duty, int continue_mode, unsigned long long int pulsecount);
     void stopPulseOutput();
     void changePulseOutput(float freq, float duty);
 

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -22,7 +22,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->comboBox_DevName->setCurrentIndex(0);
     DevName = "Dev1";
 
-    ui->statusBar->showMessage("DaqmxBase Initialize...");
+    ui->statusBar->showMessage("DAQmx Initialize...");
     ui->pushButton_Output->setEnabled(false);
     ui->pushButton_Output->setText("ON");
 
@@ -131,13 +131,13 @@ void MainWindow::daqmxbase_ready()
 void MainWindow::daqmxbase_final()
 {
     ui->pushButton_Output->setEnabled(false);
-    ui->statusBar->showMessage("DaqmxBase final.");
+    ui->statusBar->showMessage("DAQmx final.");
 }
 
 void MainWindow::daqmxbase_error(QString ErrMsg)
 {
     // Dialog
-    QMessageBox::critical(this, "DaqmxBase Error", ErrMsg);
+    QMessageBox::critical(this, "DAQmx Error", ErrMsg);
 }
 
 void MainWindow::pulse_output_started()

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -421,7 +421,7 @@
      <rect>
       <x>340</x>
       <y>150</y>
-      <width>141</width>
+      <width>161</width>
       <height>16</height>
      </rect>
     </property>
@@ -452,7 +452,7 @@
      <x>0</x>
      <y>0</y>
      <width>562</width>
-     <height>19</height>
+     <height>22</height>
     </rect>
    </property>
   </widget>