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

@@ @@ -53,24 +53,25 @@ 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)

src/commandpanel.h

➞

Show inline comments

@@ @@ -34,24 +34,28 @@ 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);
 };

src/commandwidget.cpp

➞

Show inline comments

@@ @@ -55,24 +55,25 @@ 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

src/commandwidget.h

➞

Show inline comments

@@ @@ -41,24 +41,27 @@ public: @@
     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);
 };

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -61,24 +61,29 @@ 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);
             });
     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());

0 comments (0 inline, 0 general)