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

.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,12 +124,12 @@ 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
+        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:

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);

mainwindow.h

@@ -209,6 +209,7 @@ private:
     void writeSettings();
     bool eventFilter(QObject *obj, QEvent *event);
     void manageRowExpansion();
+    void disableAutoRowExpansion();
 };
 
 #endif // MAINWINDOW_H