t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow spaces in signal names, unit names, and comments on signals

Browse Source
This commit is contained in:
Collin Kidder
2017-01-05 18:37:50 -05:00
parent 5caef500a7
commit d950ff2d88
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbcsignaleditor.cpp
+4 -4
View File
@@ -130,14 +130,14 @@ DBCSignalEditor::DBCSignalEditor(DBCHandler *handler, QWidget *parent) :
[=]() [=]()
{ {
if (currentSignal == NULL) return; if (currentSignal == NULL) return;
currentSignal->comment = ui->txtComment->text(); currentSignal->comment = ui->txtComment->text().simplified().replace(' ', '_');
}); });
connect(ui->txtUnitName, &QLineEdit::editingFinished, connect(ui->txtUnitName, &QLineEdit::editingFinished,
[=]() [=]()
{ {
if (currentSignal == NULL) return; if (currentSignal == NULL) return;
currentSignal->unitName = ui->txtUnitName->text(); currentSignal->unitName = ui->txtUnitName->text().simplified().replace(' ', '_');
}); });
connect(ui->txtBitLength, &QLineEdit::editingFinished, connect(ui->txtBitLength, &QLineEdit::editingFinished,
[=]() [=]()
@@ -155,7 +155,7 @@ DBCSignalEditor::DBCSignalEditor(DBCHandler *handler, QWidget *parent) :
[=]() [=]()
{ {
if (currentSignal == NULL) return; if (currentSignal == NULL) return;
currentSignal->name = ui->txtName->text(); currentSignal->name = ui->txtName->text().simplified().replace(' ', '_');
//need to update the list too. //need to update the list too.
ui->signalsList->currentItem()->setText(currentSignal->name); ui->signalsList->currentItem()->setText(currentSignal->name);
}); });
@@ -291,7 +291,7 @@ void DBCSignalEditor::onValuesCellChanged(int row,int col)
} }
else if (col == 1) 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(' ', '_');
} }
} }