From d950ff2d88dcc64100c962772ac93c6456a669d1 Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Thu, 5 Jan 2017 18:37:50 -0500 Subject: [PATCH] Disallow spaces in signal names, unit names, and comments on signals --- dbc/dbcsignaleditor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dbc/dbcsignaleditor.cpp b/dbc/dbcsignaleditor.cpp index b3a5acf..5e5c832 100644 --- a/dbc/dbcsignaleditor.cpp +++ b/dbc/dbcsignaleditor.cpp @@ -130,14 +130,14 @@ DBCSignalEditor::DBCSignalEditor(DBCHandler *handler, QWidget *parent) : [=]() { if (currentSignal == NULL) return; - currentSignal->comment = ui->txtComment->text(); + currentSignal->comment = ui->txtComment->text().simplified().replace(' ', '_'); }); connect(ui->txtUnitName, &QLineEdit::editingFinished, [=]() { if (currentSignal == NULL) return; - currentSignal->unitName = ui->txtUnitName->text(); + currentSignal->unitName = ui->txtUnitName->text().simplified().replace(' ', '_'); }); connect(ui->txtBitLength, &QLineEdit::editingFinished, [=]() @@ -155,7 +155,7 @@ DBCSignalEditor::DBCSignalEditor(DBCHandler *handler, QWidget *parent) : [=]() { if (currentSignal == NULL) return; - currentSignal->name = ui->txtName->text(); + currentSignal->name = ui->txtName->text().simplified().replace(' ', '_'); //need to update the list too. ui->signalsList->currentItem()->setText(currentSignal->name); }); @@ -291,7 +291,7 @@ void DBCSignalEditor::onValuesCellChanged(int row,int col) } else if (col == 1) { - currentSignal->valList[row].descript = ui->valuesTable->item(row, col)->text(); + currentSignal->valList[row].descript = ui->valuesTable->item(row, col)->text().simplified().replace(' ', '_'); } }