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

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

Browse Source
This commit is contained in:
Collin Kidder
2021-09-29 21:39:34 -04:00
parent f6568c330f 21b2d9d4c6
commit 774e9ddafd
3 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+1 -1
View File
@@ -31,7 +31,7 @@ jobs:
make INSTALL_ROOT=appdir install make INSTALL_ROOT=appdir install
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/5/linuxdeployqt-5-x86_64.AppImage" wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/5/linuxdeployqt-5-x86_64.AppImage"
chmod a+x linuxdeployqt-5-x86_64.AppImage chmod a+x linuxdeployqt-5-x86_64.AppImage
./linuxdeployqt-5-x86_64.AppImage appdir/usr/local/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so,canbus ./linuxdeployqt-5-x86_64.AppImage appdir/usr/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so,canbus
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
SavvyCAN.pro
+1 -2
View File
@@ -225,8 +225,7 @@ win32-g++ {
} }
unix { unix {
isEmpty(PREFIX) isEmpty(PREFIX) {
{
PREFIX=/usr/local PREFIX=/usr/local
} }
target.path = $$PREFIX/bin target.path = $$PREFIX/bin
mainwindow.cpp
+38 -18
View File
@@ -535,6 +535,7 @@ void MainWindow::setupAddToNewGraph()
setupSendToLatestGraphWindow(); //then call the other function to finish setupSendToLatestGraphWindow(); //then call the other function to finish
} }
void MainWindow::setupSendToLatestGraphWindow() void MainWindow::setupSendToLatestGraphWindow()
{ {
if (!lastGraphingWindow) showGraphingWindow(); if (!lastGraphingWindow) showGraphingWindow();
@@ -542,26 +543,45 @@ void MainWindow::setupSendToLatestGraphWindow()
QString signalName = getSignalNameFromPosition(contextMenuPosition); QString signalName = getSignalNameFromPosition(contextMenuPosition);
param.ID = getMessageIDFromPosition(contextMenuPosition); param.ID = getMessageIDFromPosition(contextMenuPosition);
DBC_MESSAGE *msg = dbcHandler->findMessageForFilter(param.ID, nullptr); DBC_MESSAGE *msg = dbcHandler->findMessageForFilter(param.ID, nullptr);
DBC_SIGNAL *sig = msg->sigHandler->findSignalByName(signalName); if(msg)
param.associatedSignal = sig; {
param.bias = sig->bias; DBC_SIGNAL *sig = msg->sigHandler->findSignalByName(signalName);
param.intelFormat = sig->intelByteOrder; if(sig)
param.isSigned = sig->valType == SIGNED_INT ? true : false; {
param.numBits = sig->signalSize; param.associatedSignal = sig;
param.scale = sig->factor; param.bias = sig->bias;
param.startBit = sig->startBit; param.intelFormat = sig->intelByteOrder;
param.stride = 1; param.isSigned = sig->valType == SIGNED_INT ? true : false;
param.graphName = sig->name; param.numBits = sig->signalSize;
param.lineColor = QColor(QRandomGenerator::global()->bounded(160), QRandomGenerator::global()->bounded(160), QRandomGenerator::global()->bounded(160)); param.scale = sig->factor;
param.lineWidth = 1; param.startBit = sig->startBit;
param.fillColor = QColor(128, 128, 128, 0); param.stride = 1;
param.mask = 0xFFFFFFFFFFFFFFFFull; param.graphName = sig->name;
param.drawOnlyPoints = false; param.lineColor = QColor(QRandomGenerator::global()->bounded(160), QRandomGenerator::global()->bounded(160), QRandomGenerator::global()->bounded(160));
param.pointType = 0; param.lineWidth = 1;
param.fillColor = QColor(128, 128, 128, 0);
param.mask = 0xFFFFFFFFFFFFFFFFull;
param.drawOnlyPoints = false;
param.pointType = 0;
lastGraphingWindow->createGraph(param); //add the new graph to the window lastGraphingWindow->createGraph(param); //add the new graph to the window
}
else
{
QMessageBox msgbox;
QString boxmsg = "Cannot find ID 0x" + QStringLiteral("%1").arg(param.ID, 3, 16, QLatin1Char('0')) + " in DBC message " + msg->name + ". Not adding graph.";
msgbox.setText(boxmsg);
msgbox.exec();
}
}
else
{
QMessageBox msgbox;
QString boxmsg = "Cannot find ID 0x" + QStringLiteral("%1").arg(param.ID, 3, 16, QLatin1Char('0')) + " in DBC file(s). Not adding graph.";
msgbox.setText(boxmsg);
msgbox.exec();
}
} }
void MainWindow::interpretToggled(bool state) void MainWindow::interpretToggled(bool state)
{ {
model->setInterpretMode(state); model->setInterpretMode(state);