From e18fd1f7e3c9fca60bec6d027b4935708de677c0 Mon Sep 17 00:00:00 2001 From: marcohald Date: Tue, 6 Dec 2022 12:04:12 +0100 Subject: [PATCH 1/3] Changed Windows Build Name Changed the name of the ZIP from SavvyCAN_CIBuild.zip to SavvyCAN-Windows_x64_CIBuild.zip to make it more clearer that it is a Windows Build --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a2304d..a21763a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,7 +129,7 @@ jobs: - uses: actions/download-artifact@v2 - name: Display structure of downloaded files - run: zip -r SavvyCAN_CIBuild.zip SavvyCAN-Windows_x64 + run: zip -r SavvyCAN-Windows_x64_CIBuild.zip SavvyCAN-Windows_x64 - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" @@ -138,7 +138,7 @@ jobs: title: "Development Build" files: | SavvyCAN-Linux_x64.AppImage/SavvyCAN-x86_64.AppImage - SavvyCAN_CIBuild.zip + SavvyCAN-Windows_x64_CIBuild.zip SavvyCAN-macOS_x64.dmg/SavvyCAN.dmg notify: From 1343bb363e6a5fd5bd948ec79675e59136ca6075 Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Sun, 11 Dec 2022 18:42:59 -0500 Subject: [PATCH 2/3] Update build.yml Update to hopefully fix several deprecation warnings. This means that most builds are now also on a slightly newer OS version which might limit some people. However, this is unavoidable as the old system images are going away soon. --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a2304d..a59707f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: jobs: buildlinux: name: Linux x64 - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Prepare Environment @@ -16,10 +16,10 @@ jobs: sudo apt-get install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-randr0 - name: Prepare Qt Libraries - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Compile run: | @@ -33,14 +33,14 @@ jobs: chmod a+x linuxdeployqt-5-x86_64.AppImage ./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@v3 with: name: SavvyCAN-Linux_x64.AppImage path: SavvyCAN-x86_64.AppImage buildmacos: name: macOS x64 - runs-on: macos-10.15 + runs-on: macos-11 steps: - name: Prepare macOS Environment @@ -49,7 +49,7 @@ jobs: brew link qt5 --force - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Compile run: | @@ -62,7 +62,7 @@ jobs: cp -R help/* SavvyCAN.app/Contents/MacOS/help macdeployqt SavvyCAN.app -dmg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: SavvyCAN-macOS_x64.dmg path: SavvyCAN.dmg @@ -73,10 +73,10 @@ jobs: steps: - name: Prepare Qt Libraries - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Compile shell: cmd @@ -113,7 +113,7 @@ jobs: mkdir package/canbus copy "${Env:Qt5_Dir}/plugins/canbus/*.*" package/canbus/ - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: SavvyCAN-Windows_x64 path: package @@ -124,9 +124,9 @@ jobs: needs: [buildwindows, buildmacos, buildlinux] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 - name: Display structure of downloaded files run: zip -r SavvyCAN_CIBuild.zip SavvyCAN-Windows_x64 From 2ec4c6fe62d679a6b0bb01fe04c6ebebf9aaaa7f Mon Sep 17 00:00:00 2001 From: Andy Huska Date: Mon, 12 Dec 2022 13:44:06 -0600 Subject: [PATCH 3/3] Disable row expansion on new file load and turn off row expansion when row count gets too high --- mainwindow.cpp | 19 +++++++++++++++++-- mainwindow.h | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index edb17bb..27a3ea3 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -473,8 +473,21 @@ void MainWindow::expandAllRows() void MainWindow::manageRowExpansion() { - if(rowExpansionActive && model->getInterpretMode()) - ui->canFramesView->resizeRowsToContents(); + int numRows = ui->canFramesView->model()->rowCount(); + if(numRows < 20000) + { + if(rowExpansionActive && model->getInterpretMode()) + ui->canFramesView->resizeRowsToContents(); + } + else + { + disableAutoRowExpansion(); + } +} + +void MainWindow::disableAutoRowExpansion() +{ + rowExpansionActive = false; } void MainWindow::collapseAllRows() @@ -869,6 +882,7 @@ void MainWindow::handleLoadFile() if (loadResult) { + disableAutoRowExpansion(); ui->canFramesView->scrollToTop(); model->clearFrames(); model->insertFrames(tempFrames); @@ -912,6 +926,7 @@ void MainWindow::handleDroppedFile(const QString &filename) if (loadResult) { + disableAutoRowExpansion(); ui->canFramesView->scrollToTop(); model->clearFrames(); model->insertFrames(loadedFrames); diff --git a/mainwindow.h b/mainwindow.h index 2001860..e76ec3f 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -209,6 +209,7 @@ private: void writeSettings(); bool eventFilter(QObject *obj, QEvent *event); void manageRowExpansion(); + void disableAutoRowExpansion(); }; #endif // MAINWINDOW_H