• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revisãoe8aba50946dd6e3c52d4f7552121bd5ab5144e81 (tree)
Hora2012-12-08 18:24:21
Autorarakaki <alucky4416@user...>
Commiterarakaki

Mensagem de Log

CHG: refactoring.

Mudança Sumário

Diff

--- a/daqthread.h
+++ b/daqthread.h
@@ -14,8 +14,7 @@ public:
1414 explicit DAQThread(QObject *parent = 0);
1515 ~DAQThread();
1616 void stop();
17-
18- void startPulseOutput(QString &devname, float freq, float duty, int mode, unsigned long long int pulsecount);
17+ void startPulseOutput(QString &devname, float freq, float duty, int continue_mode, unsigned long long int pulsecount);
1918 void stopPulseOutput();
2019 void changePulseOutput(float freq, float duty);
2120
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -22,7 +22,7 @@ MainWindow::MainWindow(QWidget *parent) :
2222 ui->comboBox_DevName->setCurrentIndex(0);
2323 DevName = "Dev1";
2424
25- ui->statusBar->showMessage("DaqmxBase Initialize...");
25+ ui->statusBar->showMessage("DAQmx Initialize...");
2626 ui->pushButton_Output->setEnabled(false);
2727 ui->pushButton_Output->setText("ON");
2828
@@ -131,13 +131,13 @@ void MainWindow::daqmxbase_ready()
131131 void MainWindow::daqmxbase_final()
132132 {
133133 ui->pushButton_Output->setEnabled(false);
134- ui->statusBar->showMessage("DaqmxBase final.");
134+ ui->statusBar->showMessage("DAQmx final.");
135135 }
136136
137137 void MainWindow::daqmxbase_error(QString ErrMsg)
138138 {
139139 // Dialog
140- QMessageBox::critical(this, "DaqmxBase Error", ErrMsg);
140+ QMessageBox::critical(this, "DAQmx Error", ErrMsg);
141141 }
142142
143143 void MainWindow::pulse_output_started()
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -421,7 +421,7 @@
421421 <rect>
422422 <x>340</x>
423423 <y>150</y>
424- <width>141</width>
424+ <width>161</width>
425425 <height>16</height>
426426 </rect>
427427 </property>
@@ -452,7 +452,7 @@
452452 <x>0</x>
453453 <y>0</y>
454454 <width>562</width>
455- <height>19</height>
455+ <height>22</height>
456456 </rect>
457457 </property>
458458 </widget>