tempo-plotter Changeset - c65e4fbe5d6d · protofusion repositories

Changeset - c65e4fbe5d6d

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Hasan Yavuz ÖZDERYA - 10 years ago 2016-02-28 11:51:24
hy@ozderya.net

added menu items to send command

3 files changed with 17 insertions and 1 deletions:

commandpanel.cpp

commandwidget.cpp

commandwidget.h

0 comments (0 inline, 0 general)

commandpanel.cpp

➞

Show inline comments

@@ @@ -20,66 +20,68 @@ @@
 #include "commandpanel.h"
 #include "ui_commandpanel.h"
 #include <QByteArray>
 #include <QtDebug>
 CommandPanel::CommandPanel(QSerialPort* port, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::CommandPanel),
     _menu(trUtf8("Commands")), _newCommandAction(trUtf8("New Command"), this)
+{
     serialPort = port;
     ui->setupUi(this);
     ui->scrollAreaWidgetContents->setLayout(new QVBoxLayout);
 #ifdef Q_OS_WIN
     ui->pbNew->setIcon(QIcon(":/icons/list-add"));
 #endif // Q_OS_WIN
     connect(ui->pbNew, &QPushButton::clicked, this, &CommandPanel::newCommand);
     connect(&_newCommandAction, &QAction::triggered, this, &CommandPanel::newCommand);
     _menu.addAction(&_newCommandAction);
     _menu.addSeparator();
     command_name_counter = 0;
     newCommand(); // add an empty slot by default
+}
 CommandPanel::~CommandPanel()
+{
     delete ui;
+}
 void CommandPanel::newCommand()
+{
     auto command = new CommandWidget();
     command_name_counter++;
     command->setName(trUtf8("Command ") + QString::number(command_name_counter));
     ui->scrollAreaWidgetContents->layout()->addWidget(command);
     command->setFocusToEdit();
     connect(command, &CommandWidget::sendCommand, this, &CommandPanel::sendCommand);
     _menu.addAction(command->sendAction());
+}
 void CommandPanel::sendCommand(QByteArray command)
+{
     if (!serialPort->isOpen())
+    {
         qCritical() << "Port is not open!";
         return;
+    }
     if (serialPort->write(command) < 0)
+    {
         qCritical() << "Send command failed!";
+    }
+}
 QMenu* CommandPanel::menu()
+{
     return &_menu;
+}
 QAction* CommandPanel::newCommandAction()
+{
     return &_newCommandAction;

commandwidget.cpp

➞

Show inline comments

@@ @@ -6,59 +6,65 @@ @@
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "commandwidget.h"
 #include "ui_commandwidget.h"
 #include <QRegExp>
 #include <QRegExpValidator>
 #include <QtDebug>
 #include <QIcon>
 CommandWidget::CommandWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::CommandWidget)
     ui(new Ui::CommandWidget),
     _sendAction(this)
+{
     ui->setupUi(this);
 #ifdef Q_OS_WIN
     ui->pbDelete->setIcon(QIcon(":/icons/list-remove"));
 #endif // Q_OS_WIN
     connect(ui->pbDelete, &QPushButton::clicked, this, &CommandWidget::onDeleteClicked);
     connect(ui->pbSend, &QPushButton::clicked, this, &CommandWidget::onSendClicked);
     connect(ui->pbASCII, &QPushButton::toggled, this, &CommandWidget::onASCIIToggled);
     connect(ui->leName, &QLineEdit::textChanged, [this](QString text)
+            {
                 this->_sendAction.setText(text);
             });
     connect(&_sendAction, &QAction::triggered, this, &CommandWidget::onSendClicked);
+}
 CommandWidget::~CommandWidget()
+{
     delete ui;
+}
 void CommandWidget::onDeleteClicked()
+{
     this->deleteLater();
+}
 void CommandWidget::onSendClicked()
+{
     auto command = ui->leCommand->text();
     if (command.isEmpty())
+    {
         qWarning() << "Enter a command to send!";
         ui->leCommand->setFocus(Qt::OtherFocusReason);
         return;
+    }
     if (isASCIIMode())
@@ @@ -87,24 +93,29 @@ void CommandWidget::onSendClicked() @@
 void CommandWidget::onASCIIToggled(bool checked)
+{
     ui->leCommand->setMode(checked);
+}
 bool CommandWidget::isASCIIMode()
+{
     return ui->pbASCII->isChecked();
+}
 void CommandWidget::setName(QString name)
+{
     ui->leName->setText(name);
+}
 QString CommandWidget::name()
+{
     return ui->leName->text();
+}
 void CommandWidget::setFocusToEdit()
+{
     ui->leCommand->setFocus(Qt::OtherFocusReason);
+}
 QAction* CommandWidget::sendAction()
+{
     return &_sendAction;
+}

commandwidget.h

➞

Show inline comments

 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef COMMANDWIDGET_H
 #define COMMANDWIDGET_H
 #include <QWidget>
 #include <QByteArray>
 #include <QAction>
 namespace Ui {
 class CommandWidget;
+}
 class CommandWidget : public QWidget
+{
     Q_OBJECT
 public:
     explicit CommandWidget(QWidget *parent = 0);
     ~CommandWidget();
     void setName(QString name);
     QString name();
     void setFocusToEdit();
     QAction* sendAction();
 signals:
     void deleteRequested(CommandWidget* thisWidget); // emitted when delete button is clicked
     // emitted when send button is clicked
     //
     // in case of hex mode, command text should be a hexadecimal
     // string containing hexadecimal characters only (not even spaces)
     void sendCommand(QByteArray command);
 private:
     Ui::CommandWidget *ui;
     QAction _sendAction;
     bool isASCIIMode(); // true: ascii mode, false hex mode
 private slots:
     void onDeleteClicked();
     void onSendClicked();
     void onASCIIToggled(bool checked);
 };
 #endif // COMMANDWIDGET_H

0 comments (0 inline, 0 general)