t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,346 Commits 1 Branch 0 Tags
6d62c2e9c82ca60ff34bbb0657493e4f88603a42
Commit Graph
1346 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ludovic LANGE 5002f3ebec fix some static cast errors in QMqtt 
The following error occurs twice:
```
mqtt/qmqtt_ssl_socket.cpp:49:13: error: static_cast from 'QAbstractSocket::SocketError (QAbstractSocket::*)() const' to 'void (QSslSocket::*)(QAbstractSocket::SocketError)' is not allowed
```

It may not be the cleanest fix but the it is the only one I could come with...
 2022-09-27 22:15:47 +02:00
Ludovic LANGE 1af5cbacc6 fix QMqtt ambiguous conversion 
Prevent error:
```
moc_qmqtt_client.cpp:459:53: error: conversion from 'QMQTT::ConnectionState' to 'QChar' is ambiguous
```
 2022-09-27 22:09:30 +02:00
Ludovic LANGE 74388791bf remove QSerialPort obsolete enum values (qt6) 
Three enums (`QSerialPort::ParityError`, `QSerialPort::FramingError`,
`QSerialPort::BreakConditionError`) are [deprecated since Qt5.6](https://doc.qt.io/qt-5/qserialport.html)
and removed from Qt6.

We remove them, it's unfortunate but I don't know how to replace
these - it seems that we need to handle those in an [OS-specific
way](https://codereview.qt-project.org/c/qt/qtserialport/+/125517/).
 2022-09-27 21:36:38 +02:00
Ludovic LANGE bcbe3d38bd Use enums from Qt::ItemFlags 
It seems that one my compiler we need to use an explicit enum instead of
the constant it represents.
It shouldn't cause any issue as the value is the same.
 2022-09-27 21:29:03 +02:00
Ludovic LANGE 768ebf9966 replace QString::SkipEmptyParts with Qt::SkipEmptyParts (qt6) 
`QString::SkipEmptyParts` is [deprecated since around Qt5.14](https://doc.qt.io/qt-5/qstring-obsolete.html),
and has been removed in Qt6.

We replace it with `Qt::SkipEmptyParts` for Qt >= 5.14
 2022-09-27 21:04:19 +02:00
Andy Huska 23d995060b Merge pull request #4 from collin80/master 
getting the latest after this branch was pulled in
 2022-09-27 05:55:34 -07:00
Collin Kidder ea0dbd90a8 Merge pull request #508 from llange/qt6.3-qcustomplot 
make QCustomPlot compatible with Qt6.2+ (qt6)
 2022-09-26 21:26:56 -05:00
Collin Kidder 61088d0184 Merge pull request #507 from llange/qt6.3-qatomicinteger 
replace QAtomicInt load()/store() with loadRelaxed()/storeRelaxed()
 2022-09-26 21:25:10 -05:00
Collin Kidder 9da32e97f8 Merge pull request #506 from llange/qt6.3-itemdatarole 
replace BackgroundColorRole/TextColorRole with BackgroundRole/ForegroundRole (qt6)
 2022-09-26 21:24:13 -05:00
Collin Kidder 52a2d719c7 Merge pull request #505 from llange/qt6.3-qmetatype 
remove qRegisterMetaTypeStreamOperators (qt6)
 2022-09-26 21:23:49 -05:00
Collin Kidder 194bd545e6 Merge pull request #504 from llange/qt6.3-qrandomgenerator 
replace qrand/qsrand with QRandomGenerator (qt6)
 2022-09-26 21:23:10 -05:00
Collin Kidder f653ef859a Merge pull request #503 from llange/qt6.3-qelapsedtimer 
replace QTime with QElapsedTimer when possible (qt6)
 2022-09-26 21:22:22 -05:00
Collin Kidder 51f02a0332 Merge pull request #502 from qurrent-llc/add_allowfilterstostayuponclear 
Add option to main window to allow filters to persist when clearing frames
 2022-09-26 21:21:45 -05:00
Ludovic LANGE 97844ad1e5 make QCustomPlot compatible with Qt6.2+ (qt6) 
Cf the discussion here: https://www.qcustomplot.com/index.php/support/forum/2380
 2022-09-24 22:23:08 +02:00
Ludovic LANGE 5ac5a7d45f replace QAtomicInt load()/store() with loadRelaxed()/storeRelaxed() 
Since Qt5, some methods of QAtomicInteger [are deprecated](https://doc.qt.io/qt-5/qatomicinteger-obsolete.html).

Qt6 remove those methods, thus we need to replace them.
 2022-09-24 22:13:02 +02:00
Ludovic LANGE c2fc1f179e replace BackgroundColorRole/TextColorRole with BackgroundRole/ForegroundRole (qt6) 
Since long time ago (12yrs), Qt::BackgroundColorRole/Qt::TextColorRole are aliased by Qt::BackgroundRole/Qt::ForegroundRole
and raise a deprecation warning.

Qt6 remove those values, thus we need to use Qt::BackgroundRole/Qt::ForegroundRole.
 2022-09-24 22:06:09 +02:00
Ludovic LANGE 5a18c611e1 replace QTime with QElapsedTimer when possible (qt6) 
Since Qt5, some methods of QTime [are deprecated](https://doc.qt.io/qt-5/qtime-obsolete.html).

Qt6 remove those methods, thus in two instances we need to use
a [QElapsedTimer](https://doc.qt.io/qt-6/qelapsedtimer.html) instead of a QTime.

QElapsedTimer is available since Qt5.4, and is already used in the source
code.
 2022-09-24 17:54:51 +02:00
Ludovic LANGE 9fb86e649f remove qRegisterMetaTypeStreamOperators (qt6) 
Since Qt6, some methods of [QMetaType are removed](https://doc.qt.io/qt-6/qtcore-changes-qt6.html#the-qmetatype-class).

We remove `qRegisterMetaTypeStreamOperators()` calls for Qt >= 6
 2022-09-24 17:51:25 +02:00
Ludovic LANGE 07db287407 replace qrand/qsrand with QRandomGenerator (qt6) 
Since Qt5, qrand/qsrand methods [are deprecated](https://doc.qt.io/qt-5/qtglobal-obsolete.html#qrand).

Qt6 remove those methods, thus we need to use instead a [QRandomGenerator](https://doc.qt.io/qt-6/qrandomgenerator.html).

QElapsedTimer is available since Qt5.10, and is already used in the source code.
 2022-09-24 17:34:40 +02:00
Andy Huska 7b65451874 Merge branch 'add_allowfilterstostayuponclear' 2022-09-23 15:51:02 -05:00
Andy Huska d5c0731366 Merge branch 'collin80-master' into add_allowfilterstostayuponclear 2022-09-23 15:40:09 -05:00
Andy Huska 9312cadd88 Merge branch 'master' of https://github.com/collin80/SavvyCAN into collin80-master 2022-09-23 15:39:45 -05:00
Andy Huska 5ffe161210 more clean up 2022-09-23 15:30:58 -05:00
Andy Huska f38e0b0bfa Took out unnecessary exception recover code 
Cuz app is going to crash anyway, no need to make a mess
 2022-09-23 15:28:41 -05:00
Collin Kidder a3bd67ea99 Merge pull request #499 from qurrent-llc/fix_addframebadalloc 
Fix frames and filteredFrames from growing until out of memory
 2022-09-22 18:12:54 -05:00
Collin Kidder 5a4f211ca0 Merge pull request #498 from qurrent-llc/fix_dbc_delete 
Fixed regression where non-commented dbc editor node would not delete
 2022-09-22 18:11:47 -05:00
Andy Huska 47d63c6296 duplicate works! multiplexed signals are not copied at this time 
need to learn more about them first

need to do clean up and corner case handling
 2022-09-22 18:04:27 -05:00
Andy Huska 27b58552df rebase working but definitely needs clean up for all the whatifs 2022-09-21 18:04:11 -05:00
Andy Huska 74366d1c6b context menu in place for node rebase/duplicate 
need to add menu for rebase options and code for both actions
 2022-09-20 17:49:04 -05:00
Andy Huska 0ee9eacbb3 realized that the value list was already supported so reverted 
my custom code.  The issue that made me go down this path
is related to the little endian checkbox mysteriously and
inconsistently unchecking and therefore interpreting enum values
wrong...would really like to find this.
 2022-09-20 17:08:20 -05:00
Andy Huska d9e371c494 The last commit of the ext ID fix removed need for modal editor 2022-09-20 16:50:04 -05:00
Andy Huska 6accf2e9e7 Fixed bug in extended addressing check 
where ID was being AND'ed with 80000000 decimal instead of hex
 2022-09-20 16:48:11 -05:00
Andy Huska da7a721494 Changed default signalviewer message matching to be by ID 2022-09-20 16:27:53 -05:00
Andy Huska e6058ead34 Progress! 
Masked error caused by saving dbc while editor is open that causes
msg IDs to go crazy by making editor modal, but that affects all
other windows, so might be a better fix.

Added new value type of VALUE_STRING, probably better named
ENUMERATED_STRING, and it uses the table in the editor to define
the enum.

Fixed a bug in the signal viewer load when a signal is not matched
(I found it by renaming a signal and then loading)
 2022-09-20 16:23:18 -05:00
Andy Huska 536122f3b5 Merge branch 'fix_dbc_delete' 2022-09-20 14:36:29 -05:00
Andy Huska 616718262e Merge branch 'collin80:master' into add_nodenameinsignalviewer 2022-09-20 06:13:02 -07:00
Andy Huska 53882805e7 Merge branch 'collin80:master' into add_allowfilterstostayuponclear 2022-09-20 06:12:05 -07:00
Andy Huska 6be8e8e002 Merge branch 'collin80:master' into fix_addframebadalloc 2022-09-20 05:54:23 -07:00
Andy Huska aea5e9f9c8 Merge branch 'fix_dbc_delete' of github.com:qurrent-llc/SavvyCAN into fix_dbc_delete 2022-09-20 07:51:45 -05:00
Andy Huska 13c920f971 Fixed regression where non-commented node would not delete 
Fixed odd crash due to dbcNode being null on refresh
 2022-09-20 07:46:30 -05:00
Andy Huska 42b020e48b Merge pull request #1 from collin80/master 
Pull in PRs from upstream fork
 2022-09-19 17:39:41 -07:00
Collin Kidder dd5dc9d638 Merge pull request #496 from qurrent-llc/fix_dbc_delete 
Fix dbc delete node non-function and dbc delete message occasional crash
 2022-09-19 18:48:09 -05:00
Collin Kidder e2ad516bd2 Merge pull request #495 from qurrent-llc/fix_socketcand 
Fix two socketcand issues: start up switch to raw mode, crash due to partial frame
 2022-09-19 18:47:31 -05:00
Collin Kidder f9934b11fe Merge pull request #494 from qurrent-llc/fix_framesenderloadtrailing0x00 
Fixed data string parsing bug where a trailing space is treated as a zero
 2022-09-19 18:47:19 -05:00
Collin Kidder c14c5aa241 Merge pull request #484 from Sheimy/patch-1 
Solve restore network connection  not working
 2022-09-19 18:46:29 -05:00
Andy Huska 9e9195b34e changed default data table font to be fixed-width for easier reading 2022-09-19 16:13:30 -05:00
Andy Huska 40dbf253af Saving, loading, clearing, and appending signal lists working!! 2022-09-19 15:28:53 -05:00
Andy Huska afede9573b Merge branch 'fix_addframebadalloc' 2022-09-19 13:51:31 -05:00
Andy Huska cb94cac205 Fixed issue where filteredFrames was having its capacity changed 
when adjusting filters due to appending a QVector of frames which
appears to change the capacity to the number of items appended.
Also fixed bug where preallocsize was being locally defined and
therefore the global version wasn't being updated with unknown
effets.
 2022-09-19 13:47:57 -05:00
Andy Huska 6fa84df7e0 Added ability to maintain bus and msg filters when clearing frames 2022-09-19 13:31:00 -05:00