tempo-plotter Changeset - cd8c3e8601e0 · protofusion repositories

Changeset - cd8c3e8601e0

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-06-14 22:11:39
hy@ozderya.net

focus on command panel when user tries to send an empty command from the menu

5 files changed with 14 insertions and 0 deletions:

src/commandpanel.cpp

src/commandpanel.h

src/commandwidget.cpp

src/commandwidget.h

src/mainwindow.cpp

0 comments (0 inline, 0 general)

src/commandpanel.cpp

➞

Show inline comments

@@ @@ -41,48 +41,49 @@ CommandPanel::CommandPanel(QSerialPort* @@
     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);
     connect(command, &CommandWidget::focusRequested, this, &CommandPanel::focusRequested);
     _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()
+{

src/commandpanel.h

➞

Show inline comments

@@ @@ -22,38 +22,42 @@ @@
 #include <QWidget>
 #include <QSerialPort>
 #include <QByteArray>
 #include <QMenu>
 #include <QAction>
 #include "commandwidget.h"
 namespace Ui {
 class CommandPanel;
+}
 class CommandPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit CommandPanel(QSerialPort* port, QWidget *parent = 0);
     ~CommandPanel();
     QMenu* menu();
     QAction* newCommandAction();
 signals:
     // emitted when user tries to send an empty command
     void focusRequested();
 private:
     Ui::CommandPanel *ui;
     QSerialPort* serialPort;
     QMenu _menu;
     QAction _newCommandAction;
     unsigned command_name_counter;
 private slots:
     void newCommand();
     void sendCommand(QByteArray command);
 };
 #endif // COMMANDPANEL_H

src/commandwidget.cpp

➞

Show inline comments

@@ @@ -43,48 +43,49 @@ CommandWidget::CommandWidget(QWidget *pa @@
+            {
                 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);
         emit focusRequested();
         return;
+    }
     if (isASCIIMode())
+    {
         qDebug() << "Sending " << name() << ":" << command;
         emit sendCommand(ui->leCommand->unEscapedText().toLatin1());
+    }
     else // hex mode
+    {
         command = command.remove(' ');
         // check if nibbles are missing
         if (command.size() % 2 == 1)
+        {
             qWarning() << "HEX command is missing a nibble at the end!";
             ui->leCommand->setFocus(Qt::OtherFocusReason);
             // highlight the byte that is missing a nibble (last byte obviously)
             int textSize = ui->leCommand->text().size();
             ui->leCommand->setSelection(textSize-1, textSize);
             return;
+        }
         qDebug() << "Sending HEX:" << command;
         emit sendCommand(QByteArray::fromHex(command.toLatin1()));
+    }

src/commandwidget.h

➞

Show inline comments

@@ @@ -29,37 +29,40 @@ 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);
     // emitted when user tries to send an empty command
     void focusRequested();
 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

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -49,48 +49,53 @@ MainWindow::MainWindow(QWidget *parent) @@
     ui(new Ui::MainWindow),
     aboutDialog(this),
     portControl(&serialPort),
     channelMan(1, 1, this),
     commandPanel(&serialPort),
     dataFormatPanel(&serialPort, &channelMan),
     snapshotMan(this, &channelMan)
+{
     ui->setupUi(this);
     ui->tabWidget->insertTab(0, &portControl, "Port");
     ui->tabWidget->insertTab(1, &dataFormatPanel, "Data Format");
     ui->tabWidget->insertTab(2, &plotControlPanel, "Plot");
     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);
             });
     connect(&commandPanel, &CommandPanel::focusRequested, [this]()
+            {
                 this->ui->tabWidget->setCurrentWidget(&commandPanel);
             });
     setupAboutDialog();
     // init view menu
     for (auto a : ui->plot->menuActions())
+    {
         ui->menuView->addAction(a);
+    }
     ui->menuView->addSeparator();
     QMenu* tbMenu = ui->menuView->addMenu("Toolbars");
     tbMenu->addAction(ui->plotToolBar->toggleViewAction());
     tbMenu->addAction(portControl.toolBar()->toggleViewAction());
     // init UI signals
     // menu signals
     QObject::connect(ui->actionHelpAbout, &QAction::triggered,
               &aboutDialog, &QWidget::show);
     QObject::connect(ui->actionReportBug, &QAction::triggered,
                      [](){QDesktopServices::openUrl(QUrl(BUG_REPORT_URL));});
     QObject::connect(ui->actionExportCsv, &QAction::triggered,

0 comments (0 inline, 0 general)