tempo-plotter Changeset - 3216cc699a63 · protofusion repositories

Changeset - 3216cc699a63

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Hasan Yavuz ÖZDERYA - 10 years ago 2016-02-28 09:56:16
hy@ozderya.net

added "Commands" menu

5 files changed with 34 insertions and 1 deletions:

commandpanel.cpp

commandpanel.h

commandwidget.cpp

commandwidget.h

mainwindow.cpp

0 comments (0 inline, 0 general)

commandpanel.cpp

➞

Show inline comments

@@ @@ -22,24 +22,28 @@ @@
 #include <QByteArray>
 #include <QtDebug>
 CommandPanel::CommandPanel(QSerialPort* port, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::CommandPanel)
     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);
     command_name_counter = 0;
     newCommand(); // add an empty slot by default
+}
 CommandPanel::~CommandPanel()
@@ @@ -50,12 +54,13 @@ CommandPanel::~CommandPanel() @@
 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);
+}
 void CommandPanel::sendCommand(QByteArray command)
+{
     if (!serialPort->isOpen())
@@ @@ -66,6 +71,16 @@ void CommandPanel::sendCommand(QByteArra @@
     if (serialPort->write(command) < 0)
+    {
         qCritical() << "Send command failed!";
+    }
+}
 QMenu* CommandPanel::menu()
+{
     return &_menu;
+}
 QAction* CommandPanel::newCommandAction()
+{
     return &_newCommandAction;
+}

commandpanel.h

➞

Show inline comments

@@ @@ -20,12 +20,14 @@ @@
 #ifndef COMMANDPANEL_H
 #define COMMANDPANEL_H
 #include <QWidget>
 #include <QSerialPort>
 #include <QByteArray>
 #include <QMenu>
 #include <QAction>
 #include "commandwidget.h"
 namespace Ui {
 class CommandPanel;
+}
@@ @@ -35,15 +37,20 @@ class CommandPanel : public QWidget @@
     Q_OBJECT
 public:
     explicit CommandPanel(QSerialPort* port, QWidget *parent = 0);
     ~CommandPanel();
     QMenu* menu();
     QAction* newCommandAction();
 private:
     Ui::CommandPanel *ui;
     QSerialPort* serialPort;
     QMenu _menu;
     QAction _newCommandAction;
     unsigned command_name_counter;
 private slots:
     void newCommand();
     void sendCommand(QByteArray command);

commandwidget.cpp

➞

Show inline comments

@@ @@ -100,6 +100,11 @@ void CommandWidget::setName(QString name @@
+}
 QString CommandWidget::name()
+{
     return ui->leName->text();
+}
 void CommandWidget::setFocusToEdit()
+{
     ui->leCommand->setFocus(Qt::OtherFocusReason);
+}

commandwidget.h

➞

Show inline comments

@@ @@ -34,12 +34,13 @@ class CommandWidget : public QWidget @@
 public:
     explicit CommandWidget(QWidget *parent = 0);
     ~CommandWidget();
     void setName(QString name);
     QString name();
     void setFocusToEdit();
 signals:
     void deleteRequested(CommandWidget* thisWidget); // emitted when delete button is clicked
     // emitted when send button is clicked
     //

mainwindow.cpp

➞

Show inline comments

@@ @@ -64,12 +64,17 @@ MainWindow::MainWindow(QWidget *parent) @@
     ui->tabWidget->insertTab(3, &commandPanel, "Commands");
     ui->tabWidget->setCurrentIndex(0);
     addToolBar(portControl.toolBar());
     ui->plotToolBar->addAction(snapshotMan.takeSnapshotAction());
     ui->menuBar->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu());
     ui->menuBar->insertMenu(ui->menuHelp->menuAction(), commandPanel.menu());
     connect(commandPanel.newCommandAction(), &QAction::triggered, [this]()
+            {
                 this->ui->tabWidget->setCurrentWidget(&commandPanel);
             });
     setupAboutDialog();
     // init view menu
     for (auto a : ui->plot->menuActions())
+    {

0 comments (0 inline, 0 general)