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

@@ @@ -55,50 +55,52 @@ QValidator::State HexCommandValidator::v @@
     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

@@ @@ -56,40 +56,30 @@ void CommandWidget::onSendClicked() @@
         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)