diff --git a/mainwindow.cpp b/mainwindow.cpp index 268e1827de860fabe1bfb34095f0ba83b73019d0..91a6bccfa652cf5863bccfd8d8fc9c0028a1dd9b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -38,7 +38,7 @@ MainWindow::MainWindow(QWidget *parent) //InitTreeView(); - InitCameraComboBox(); + InitImageComboBox(); InitSerialPortNameComboBox(); InitSerialPortBaudComboBox(); InitSerialPortDataBitsComboBox(); @@ -55,9 +55,9 @@ MainWindow::~MainWindow() delete ui; } -void MainWindow::InitCameraComboBox(){ - for(int i = 0;i < 8; i++){ - ui->comboBoxCameras->addItem(QString("Camera%1").arg(i + 1),QVariant(i + 1)); +void MainWindow::InitImageComboBox(){ + for(int i = 0;i < 30; i++){ + ui->comboBoxImages->addItem(QString("%1").arg(i + 1),QVariant(i + 1)); } } @@ -309,10 +309,10 @@ void MainWindow::UpdateWordopControlLEDData(WordopControlLED* pWordopControlLEDD void MainWindow::UpdateSnapData(Snap* pSnap){ ui->lineEditCameraDeviceID->setText(pSnap->strDeviceID()); - for(int i = 0;i < ui->comboBoxCameras->count();i++){ - QVariant var = ui->comboBoxCameras->itemData(i); - if(var == pSnap->nCameraNum()){ - ui->comboBoxCameras->setCurrentIndex(i); + for(int i = 0;i < ui->comboBoxImages->count();i++){ + QVariant var = ui->comboBoxImages->itemData(i); + if(var == pSnap->nImageNum()){ + ui->comboBoxImages->setCurrentIndex(i); break; } } @@ -556,7 +556,7 @@ void MainWindow::on_lineEditDuration_editingFinished() void MainWindow::on_comboBoxCameras_currentIndexChanged(int index) { - QVariant currentData = ui->comboBoxCameras->currentData(); + QVariant currentData = ui->comboBoxImages->currentData(); if(m_pCurrentItem) { QVariant var = m_pCurrentItem->data(); @@ -566,7 +566,7 @@ void MainWindow::on_comboBoxCameras_currentIndexChanged(int index) if(text == QStringLiteral("Snap")){ Snap *pSnap = var.value(); - pSnap->setNCameraNum(currentData.toInt()); + pSnap->setNImageNum(currentData.toInt()); } } } diff --git a/mainwindow.h b/mainwindow.h index 5508492349ac7f7dab5be256734d7cc9f7cd1d50..747c1cca3394c2939e6a23db56b421305b596a4a 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -101,7 +101,7 @@ private: void InitTreeView(); private: - void InitCameraComboBox(); + void InitImageComboBox(); void InitSerialPortNameComboBox(); void InitSerialPortBaudComboBox(); void InitSerialPortDataBitsComboBox(); diff --git a/mainwindow.ui b/mainwindow.ui index efdea17064b9217d2f42715ae01f2fe65982034f..a8f43465c6838aaedc4e9b4b49d0aba5dfd479c4 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -31,7 +31,7 @@ - 7 + 4 @@ -161,12 +161,12 @@ - Camera + Image - + diff --git a/rs232.cpp b/rs232.cpp index 264464bccfcff5f576c1019d91b55013fde1fb60..2d6ed593071692bf4447ed628dfae87650328088 100644 --- a/rs232.cpp +++ b/rs232.cpp @@ -121,18 +121,18 @@ void RS232::readFromXML(QXmlStreamReader& reader){ void RS232::openSerialPort() { - /*m_serial->setPortName(QString("COM%1").arg(m_nPort)); + m_serial->setPortName(QString("COM%1").arg(m_nPort)); m_serial->setBaudRate(m_nBaud); m_serial->setDataBits(QSerialPort::Data8); m_serial->setParity(QSerialPort::NoParity); m_serial->setStopBits(QSerialPort::OneStop); - m_serial->setFlowControl(QSerialPort::NoFlowControl);*/ - m_serial->setPortName("COM1"); + m_serial->setFlowControl(QSerialPort::NoFlowControl); + /*m_serial->setPortName("COM1"); m_serial->setBaudRate(9600); m_serial->setDataBits(QSerialPort::Data8); m_serial->setParity(QSerialPort::NoParity); m_serial->setStopBits(QSerialPort::OneStop); - m_serial->setFlowControl(QSerialPort::NoFlowControl); + m_serial->setFlowControl(QSerialPort::NoFlowControl);*/ if (m_serial->open(QIODevice::ReadWrite)) { qDebug() << QString("Open SerialPort Successful!"); } else { diff --git a/snap.cpp b/snap.cpp index f6efd7a3acfcc2dd0932f8a6443b4766fefcb81e..d6e0b4ffc5d65024a137b590269281c725411666 100644 --- a/snap.cpp +++ b/snap.cpp @@ -2,17 +2,17 @@ Snap::Snap(QObject *parent) : Operation{parent} - , m_nCameraNum(1) + , m_nImageNum(1) {} -int Snap::nCameraNum() const +int Snap::nImageNum() const { - return m_nCameraNum; + return m_nImageNum; } -void Snap::setNCameraNum(int newNCameraNum) +void Snap::setNImageNum(int newNImageNum) { - m_nCameraNum = newNCameraNum; + m_nImageNum = newNImageNum; } void Snap::run(){ @@ -28,7 +28,7 @@ void Snap::writeXML(QXmlStreamWriter& writer){ writer.writeStartElement("Snap"); writer.writeAttribute("device", m_strDeviceID); - writer.writeTextElement("camera", QString::number(m_nCameraNum)); + writer.writeTextElement("image", QString::number(m_nImageNum)); writer.writeEndElement(); // 结束当前操作的元素 } @@ -43,8 +43,8 @@ void Snap::readFromXML(QXmlStreamReader& reader){ while (!(reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == QStringLiteral("Snap"))) { - if (reader.name() == QStringLiteral("camera")) { - m_nCameraNum = reader.readElementText().toInt(); + if (reader.name() == QStringLiteral("image")) { + m_nImageNum = reader.readElementText().toInt(); } reader.readNext(); diff --git a/snap.h b/snap.h index a4da53345c8861baa6cf7320372cc91b25914e6e..6651ae271804c6d7c266e661d7d96483bda9737f 100644 --- a/snap.h +++ b/snap.h @@ -13,7 +13,7 @@ public: private: // 摄像机编号 - int m_nCameraNum; + int m_nImageNum; public: virtual void run() override; @@ -23,8 +23,8 @@ public: virtual QString getClassName() override; public: - int nCameraNum() const; - void setNCameraNum(int newNCameraNum); + int nImageNum() const; + void setNImageNum(int newNImageNum); }; #endif // SNAP_H diff --git a/wordopcontrolled.cpp b/wordopcontrolled.cpp index cff2d083228589ab061d0663243666689c232bc8..671845ef9ed65d253a203527a550771e46974e00 100644 --- a/wordopcontrolled.cpp +++ b/wordopcontrolled.cpp @@ -89,7 +89,6 @@ QByteArray WordopControlLED::ConvertCMD2Bytes(WORDOPCMD& wordopcmd){ } } bytes.append(wordopcmd.chksum); - return bytes; }