Merge pull request #824 from ElderOrb/#821

in graphs give an option to set the color of the plot and the thickne…
bavc · May 12, 2024 · 686f0de · 686f0de
2 parents 25ea0fe + da43856
commit 686f0de
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 127 deletions.
diff --git a/.github/workflows/qctools.yml b/.github/workflows/qctools.yml
@@ -35,16 +35,20 @@ jobs:
 
     - name: Install dependencies
       run: |
-        brew install ${{ matrix.packages }} pkg-config ffmpeg
+        brew install ${{ matrix.packages }} pkg-config ffmpeg@6 qt@5
 
     - name: Install qwt-qt5
       run: |
         wget https://raw.githubusercontent.com/Homebrew/homebrew-core/56cd02e96876d1fb5b9ae951d605585fe8d614de/Formula/qwt.rb
-        brew install ./qwt.rb
+        brew install --ignore-dependencies ./qwt.rb
 
     - name: Set Qt5 environment path
       run: |
-        echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
+        echo `brew --prefix qt@5`/bin >> $GITHUB_PATH
+
+    - name: Check Qt install
+      run: |
+        qmake -v
 
     - name: Build QCTools
       env:
@@ -53,6 +57,7 @@ jobs:
         cd Project/QtCreator
         mkdir build
         cd build
+        export PKG_CONFIG_PATH="/opt/homebrew/opt/ffmpeg@6/lib/pkgconfig"
         qmake ..
         make CC=$CC CXX=$CXX -j4
 
@@ -64,9 +69,7 @@ jobs:
         include:
           - compiler: clang-9
             packages: llvm@13
-            env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' }
-          - qt_version: "6.3.0"
-            qt_modules: "qtmultimedia"
+            env: { 'CC': 'clang', 'CXX': 'clang++', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' }
 
     runs-on: macos-latest
 
@@ -89,21 +92,19 @@ jobs:
 
     - name: Install dependencies
       run: |
-        brew install ${{ matrix.packages }} pkg-config ffmpeg
-
-    - name: Install Qt6
-      uses: jurplel/install-qt-action@v3
-      with:
-        version: ${{ matrix.qt_version }}
-        modules: ${{ matrix.qt_modules }}
+        brew install ${{ matrix.packages }} pkg-config ffmpeg@6 qt
 
     - name: Install qwt
       run: |
         brew install --ignore-dependencies qwt
 
     - name: Set Qt6 environment path
       run: |
-        echo "/usr/local/opt/qt6/bin" >> $GITHUB_PATH
+        echo `brew --prefix qt`/bin >> $GITHUB_PATH
+
+    - name: Check Qt install
+      run: |
+        qmake -v
 
     - name: Build QCTools
       env:
@@ -112,6 +113,7 @@ jobs:
         cd Project/QtCreator
         mkdir build
         cd build
+        export PKG_CONFIG_PATH="/opt/homebrew/opt/ffmpeg@6/lib/pkgconfig"
         qmake ..
         make -j4
 
@@ -124,6 +126,7 @@ jobs:
           - compiler: clang-9
             packages: llvm@13
             env: { 'CC': 'clang', 'CXX': 'clang++' }
+          - qt_version: "5.15.*"
 
     runs-on: macos-latest
 
@@ -146,18 +149,32 @@ jobs:
 
     - name: Install dependencies
       run: |
-        brew install ${{ matrix.packages }} nasm qt@5
+        brew install ${{ matrix.packages }} nasm
+
+    - name: Install Qt5
+      run: |
+        brew install qt@5
 
     - name: Set Qt5 environment path
       run: |
-        echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
+        echo `brew --prefix qt@5`/bin >> $GITHUB_PATH
+
+#    - name: Install Qt5
+#      uses: jurplel/install-qt-action@v3
+#      with:
+#        version: ${{ matrix.qt_version }}
+#        modules: ${{ matrix.qt_modules }}
+
+    - name: Check Qt install
+      run: |
+        qmake -v
 
     - name: Build qwt
       run: |
-        git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
+        git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         cd ../qwt
         qmake -r
-        make -j4
+        make CC=$CC CXX=$CXX -j4
 
     - name: Build FFmpeg
       run: |
@@ -173,7 +190,7 @@ jobs:
                     --disable-ffplay \
                     --disable-ffprobe \
                     --disable-debug
-        make -j12
+        make CC=$CC CXX=$CXX -j12
 
     - name: Build QCTools
       env:
@@ -193,8 +210,8 @@ jobs:
         include:
           - compiler: clang-9
             packages: llvm@13
-            env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' }
-          - qt_version: "6.3.0"
+            env: { 'CC': 'clang', 'CXX': 'clang++', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' }
+          - qt_version: "6.5.*"
             qt_modules: "qtmultimedia"
 
     runs-on: macos-latest
@@ -226,16 +243,16 @@ jobs:
         version: ${{ matrix.qt_version }}
         modules: ${{ matrix.qt_modules }}
 
-    - name: Set Qt6 environment path
+    - name: Check Qt install
       run: |
-        echo "/usr/local/opt/qt6/bin" >> $GITHUB_PATH
+        qmake -v
 
     - name: Build qwt
       run: |
-        git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
+        git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         cd ../qwt
         qmake -r
-        make -j4
+        make CC=$CC CXX=$CXX -j4
 
     - name: Build FFmpeg
       run: |
@@ -251,7 +268,7 @@ jobs:
                     --disable-ffplay \
                     --disable-ffprobe \
                     --disable-debug
-        make -j12
+        make CC=$CC CXX=$CXX -j12
 
     - name: Build QCTools
       env:
@@ -261,7 +278,7 @@ jobs:
         mkdir build
         cd build
         qmake .. 
-        make -j4
+        make CC=$CC CXX=$CXX -j4
 
   build-linux:
 
@@ -272,7 +289,7 @@ jobs:
           - compiler: gcc-9
             packages: gcc-9 g++-9
             env: { 'CC': 'gcc-9', 'CXX': 'g++-9' }
-          - qt_version: "5.15.2"
+          - qt_version: "5.15.*"
             qt_packages: "libxkbcommon-dev libgstreamer-plugins-base1.0-0 libgstreamer-gl1.0-0"
 
     runs-on: ubuntu-latest
@@ -326,7 +343,7 @@ jobs:
 
     - name: Build qwt
       run: |
-        git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
+        git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         cd ../qwt
         qmake -r
         make -j4
@@ -364,7 +381,7 @@ jobs:
           - compiler: gcc-9
             packages: gcc-9 g++-9
             env: { 'CC': 'gcc-9', 'CXX': 'g++-9' }
-          - qt_version: "6.5.0"
+          - qt_version: "6.5.*"
             qt_modules: "qtmultimedia qt5compat"
             qt_packages: "libxkbcommon-dev libgstreamer-plugins-base1.0-0 libgstreamer-gl1.0-0"
 
@@ -419,7 +436,7 @@ jobs:
 
     - name: Build qwt
       run: |
-        git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
+        git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         cd ../qwt
         qmake -r
         make -j4
@@ -452,7 +469,7 @@ jobs:
 
     strategy:
       matrix:
-        qt_version: ["5.15.2"]
+        qt_version: ["5.15.*"]
 
     runs-on: windows-latest
 
@@ -504,7 +521,7 @@ jobs:
 
     - name: Download and configure qwt
       run: |
-        git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
+        git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         copy .github\workflows\qwtconfig.pri ..\qwt
         cd ../qwt
         qmake -r
@@ -586,7 +603,7 @@ jobs:
 
     - name: Download and configure qwt
       run: |
-        git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
+        git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         copy .github\workflows\qwtconfig.pri ..\qwt
         cd ../qwt
         qmake -r
@@ -613,7 +630,7 @@ jobs:
 
     strategy:
       matrix:
-        qt_version: ["5.15.2"]
+        qt_version: ["5.15.*"]
 
     runs-on: windows-latest
 
@@ -669,7 +686,7 @@ jobs:
 
     - name: Download and configure qwt
       run: |
-        git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
+        git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         copy .github\workflows\qwtconfig.pri ..\qwt
         cd ../qwt
         qmake -r
@@ -756,7 +773,7 @@ jobs:
 
     - name: Download and configure qwt
       run: |
-        git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
+        git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         copy .github\workflows\qwtconfig.pri ..\qwt
         cd ../qwt
         qmake -r

diff --git a/Source/Core/AudioCore.cpp b/Source/Core/AudioCore.cpp
@@ -92,23 +92,23 @@ struct per_group AudioPerGroup [Group_AudioMax]=
 const struct per_item AudioPerItem [Item_AudioMax]=
 {
     //Y
-    { Group_R128,         Group_AudioMax, "EBU R128 Momentary\nloudness","lavfi.r128.M",                        3,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_EbuR128 },
-    { Group_aphasemeter,  Group_AudioMax, "Audio Phase",                "lavfi.aphasemeter.phase",              3,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_aphasemeter },
-    { Group_astats_dc,    Group_AudioMax, "Audio DC Offset",            "lavfi.astats.Overall.DC_offset",       6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_levels,Group_AudioMax, "Audio Min Level",            "lavfi.astats.Overall.Min_level",       6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_levels,Group_AudioMax, "Audio Max Level",            "lavfi.astats.Overall.Max_level",       6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_lvlchs,Group_AudioMax, "Audio Min Level (Ch2)",      "lavfi.astats.2.Min_level",             6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_lvlchs,Group_AudioMax, "Audio Max Level (Ch2)",      "lavfi.astats.2.Max_level",             6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_lvlchs,Group_AudioMax, "Audio Min Level (Ch1)",      "lavfi.astats.1.Min_level",             6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_lvlchs,Group_AudioMax, "Audio Max Level (Ch1)",      "lavfi.astats.1.Max_level",             6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_zeros, Group_AudioMax, "Audio Zero\nCrossing (ch 2)", "lavfi.astats.2.Zero_crossings_rate",  6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_zeros, Group_AudioMax, "Audio Zero\nCrossing (ch 1)", "lavfi.astats.1.Zero_crossings_rate",  6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_adif,         Group_AudioMax, "Difference Min",             "lavfi.astats.Overall.Min_difference",  6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_adif,         Group_AudioMax, "Difference Max",             "lavfi.astats.Overall.Max_difference",  6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_adif,         Group_AudioMax, "Difference Mean",            "lavfi.astats.Overall.Mean_difference", 6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_RMS,   Group_AudioMax, "Peak Level",                 "lavfi.astats.Overall.Peak_level",      6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_RMS,   Group_AudioMax, "RMS Peak",                   "lavfi.astats.Overall.RMS_peak",        6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
-    { Group_astats_RMS,   Group_AudioMax, "RMS Trough",                 "lavfi.astats.Overall.RMS_trough",      6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats },
+    { Group_R128,         Group_AudioMax, "EBU R128 Momentary\nloudness","lavfi.r128.M",                        3,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_EbuR128, nullptr, -1  },
+    { Group_aphasemeter,  Group_AudioMax, "Audio Phase",                "lavfi.aphasemeter.phase",              3,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_aphasemeter, nullptr, -1  },
+    { Group_astats_dc,    Group_AudioMax, "Audio DC Offset",            "lavfi.astats.Overall.DC_offset",       6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_levels,Group_AudioMax, "Audio Min Level",            "lavfi.astats.Overall.Min_level",       6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_levels,Group_AudioMax, "Audio Max Level",            "lavfi.astats.Overall.Max_level",       6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_lvlchs,Group_AudioMax, "Audio Min Level (Ch2)",      "lavfi.astats.2.Min_level",             6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_lvlchs,Group_AudioMax, "Audio Max Level (Ch2)",      "lavfi.astats.2.Max_level",             6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_lvlchs,Group_AudioMax, "Audio Min Level (Ch1)",      "lavfi.astats.1.Min_level",             6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_lvlchs,Group_AudioMax, "Audio Max Level (Ch1)",      "lavfi.astats.1.Max_level",             6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_zeros, Group_AudioMax, "Audio Zero\nCrossing (ch 2)", "lavfi.astats.2.Zero_crossings_rate",  6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_zeros, Group_AudioMax, "Audio Zero\nCrossing (ch 1)", "lavfi.astats.1.Zero_crossings_rate",  6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_adif,         Group_AudioMax, "Difference Min",             "lavfi.astats.Overall.Min_difference",  6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_adif,         Group_AudioMax, "Difference Max",             "lavfi.astats.Overall.Max_difference",  6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_adif,         Group_AudioMax, "Difference Mean",            "lavfi.astats.Overall.Mean_difference", 6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_RMS,   Group_AudioMax, "Peak Level",                 "lavfi.astats.Overall.Peak_level",      6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_RMS,   Group_AudioMax, "RMS Peak",                   "lavfi.astats.Overall.RMS_peak",        6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
+    { Group_astats_RMS,   Group_AudioMax, "RMS Trough",                 "lavfi.astats.Overall.RMS_trough",      6,   false,  DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1  },
     //{ Group_R128,   Group_AudioMax,       "R128.S",         "lavfi.r128.S",             0,   false,  DBL_MAX, DBL_MAX },
     //{ Group_R128,   Group_AudioMax,       "R128.I",         "lavfi.r128.I",             0,   true,   DBL_MAX, DBL_MAX },
     //U

diff --git a/Source/Core/Core.h b/Source/Core/Core.h
@@ -63,6 +63,8 @@ struct per_item
     const   double      DefaultLimit;
     const   double      DefaultLimit2;
     const   activefilter Filter;
+    const   char*       color;
+    const   int         thickness;
 };
 
 struct stream_info