Merge branch 'master' of github.com:collin80/SavvyCAN

This commit is contained in:
Collin Kidder
2017-10-04 21:08:51 -04:00
3 changed files with 6 additions and 0 deletions
+1
View File
@@ -52,6 +52,7 @@ This project requires 5.8.0 or higher because of a dependency on QSerialBus.
Download the newest stable version of Qt directly from qt.io (You need 5.8.x or newer) Download the newest stable version of Qt directly from qt.io (You need 5.8.x or newer)
```sh
cd ~ cd ~
git clone https://github.com/collin80/SavvyCAN.git git clone https://github.com/collin80/SavvyCAN.git
+4
View File
@@ -18,6 +18,10 @@ void ScriptContainer::compileScript()
emit sendLog("Compiling script..."); emit sendLog("Compiling script...");
canHelper->clearFilters();
isoHelper->clearFilters();
udsHelper->clearFilters();
if (result.isError()) if (result.isError())
{ {
+1
View File
@@ -18,6 +18,7 @@ ScriptingWindow::ScriptingWindow(const QVector<CANFrame> *frames, QWidget *paren
editor->setWordWrapMode(QTextOption::NoWrap); editor->setWordWrapMode(QTextOption::NoWrap);
editor->setTabStopWidth(4); editor->setTabStopWidth(4);
editor->setEnabled(false); editor->setEnabled(false);
editor->setFont(QFont("Monospace", 12));
editor->show(); editor->show();
ui->verticalLayout->insertWidget(2,editor, 10); ui->verticalLayout->insertWidget(2,editor, 10);