OSDN > Desarrollador > alucky4416 > Chamber > QtSimpleDAQmx_CO_PulseGen > Commit

QtSimpleDAQmx_CO_PulseGen
Fork

(Original repository, No fork origin)

Commit

CHG: refactoring.

--- a/daqthread.h

+++ b/daqthread.h

		@@ -14,8 +14,7 @@ public:
14	14	explicit DAQThread(QObject *parent = 0);
15	15	~DAQThread();
16	16	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);
19	18	void stopPulseOutput();
20	19	void changePulseOutput(float freq, float duty);
21	20

--- a/mainwindow.cpp

+++ b/mainwindow.cpp

		@@ -22,7 +22,7 @@ MainWindow::MainWindow(QWidget *parent) :
22	22	ui->comboBox_DevName->setCurrentIndex(0);
23	23	DevName = "Dev1";
24	24
25		- ui->statusBar->showMessage("DaqmxBase Initialize...");
	25	+ ui->statusBar->showMessage("DAQmx Initialize...");
26	26	ui->pushButton_Output->setEnabled(false);
27	27	ui->pushButton_Output->setText("ON");
28	28

		@@ -131,13 +131,13 @@ void MainWindow::daqmxbase_ready()
131	131	void MainWindow::daqmxbase_final()
132	132	{
133	133	ui->pushButton_Output->setEnabled(false);
134		- ui->statusBar->showMessage("DaqmxBase final.");
	134	+ ui->statusBar->showMessage("DAQmx final.");
135	135	}
136	136
137	137	void MainWindow::daqmxbase_error(QString ErrMsg)
138	138	{
139	139	// Dialog
140		- QMessageBox::critical(this, "DaqmxBase Error", ErrMsg);
	140	+ QMessageBox::critical(this, "DAQmx Error", ErrMsg);
141	141	}
142	142
143	143	void MainWindow::pulse_output_started()

--- a/mainwindow.ui

+++ b/mainwindow.ui