tempo-plotter Changeset - 91504904883a · protofusion repositories

Changeset - 91504904883a

Parent rev.

Child rev.

[Not reviewed]

command-panel

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-10-10 14:19:37
hy@ozderya.net

instead of keeping different ascii and hex commands, convert between them

2 files changed with 2 insertions and 10 deletions:

commandedit.cpp

commandwidget.cpp

0 comments (0 inline, 0 general)

commandedit.cpp

➞

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/>.
 */
 #include <QKeyEvent>
 #include "commandedit.h"
 class HexCommandValidator : public QRegExpValidator
+{
 public:
     explicit HexCommandValidator(QObject* parent = 0);
     QValidator::State validate(QString & input, int & pos) const;
 };
 HexCommandValidator::HexCommandValidator(QObject* parent) :
     QRegExpValidator(parent)
+{
     QRegExp regExp("^(?:(?:[0-9A-F]{2}[ ])+(?:[0-9A-F]{2}))|(?:[0-9A-F]{2})$");
     setRegExp(regExp);
+}
 QValidator::State HexCommandValidator::validate(QString & input, int & pos) const
+{
     input = input.toUpper();
     // don't let pos to be altered at this stage
     int orgPos = pos;
     auto r = QRegExpValidator::validate(input, pos);
     pos = orgPos;
     // try fixing up spaces
     if (r != QValidator::Acceptable)
+    {
         input = input.replace(" ", "");
         input.replace(QRegExp("([0-9A-F]{2}(?!$))"), "\\1 ");
         if (pos == input.size()-1) pos = input.size();
         r = QRegExpValidator::validate(input, pos);
+    }
     return r;
+}
 CommandEdit::CommandEdit(QWidget *parent) :
     QLineEdit(parent)
+{
     hexValidator = new HexCommandValidator(this);
     asciiValidator = new QRegExpValidator(QRegExp("[\\x0000-\\x007F]+"));
     ascii_mode = true;
     setValidator(asciiValidator);
+}
 CommandEdit::~CommandEdit()
+{
     delete hexValidator;
+}
 void CommandEdit::setMode(bool ascii)
+{
     ascii_mode = ascii;
     if (ascii)
+    {
         setValidator(asciiValidator);
         setText(QByteArray::fromHex(text().remove(" ").toLatin1()));
+    }
     else
+    {
         setValidator(hexValidator);
         setText(text().toLatin1().toHex());
+    }
+}
 void CommandEdit::keyPressEvent(QKeyEvent * event)
+{
     if (ascii_mode)
+    {
         QLineEdit::keyPressEvent(event);
         return;
+    }
     if (event->key() == Qt::Key_Backspace && !hasSelectedText())
+    {
         int cursor = cursorPosition();
         if (cursor != 0 && text()[cursor-1] == ' ')
+        {
             setCursorPosition(cursor-1);
+        }
+    }
     QLineEdit::keyPressEvent(event);
+}

commandwidget.cpp

➞

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/>.
 */
 #include "commandwidget.h"
 #include "ui_commandwidget.h"
 #include <QRegExp>
 #include <QRegExpValidator>
 #include <QtDebug>
 CommandWidget::CommandWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::CommandWidget)
+{
     ui->setupUi(this);
     connect(ui->pbDelete, &QPushButton::clicked, this, &CommandWidget::onDeleteClicked);
     connect(ui->pbSend, &QPushButton::clicked, this, &CommandWidget::onSendClicked);
     connect(ui->pbASCII, &QPushButton::toggled, this, &CommandWidget::onASCIIToggled);
+}
 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()) // 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);
             int textSize = ui->leCommand->text().size();
             ui->leCommand->setSelection(textSize-1, textSize);
             return;
+        }
+    }
     emit sendCommand(command, ui->pbASCII->isChecked());
+}
 void CommandWidget::onASCIIToggled(bool checked)
+{
     ui->leCommand->setMode(checked);
     if (checked)
+    {
         storedHexText = ui->leCommand->text();
         ui->leCommand->setText(storedAsciiText);
+    }
     else
+    {
         storedAsciiText = ui->leCommand->text();
         ui->leCommand->setText(storedHexText);
+    }
+}
 bool CommandWidget::isASCIIMode()
+{
     return ui->pbASCII->isChecked();
+}

0 comments (0 inline, 0 general)