Make ld-json-converter convert PAL-M and fix nix environment to ensure SVG icons are displayed in ld-analyse

Author: Simon Inns

CMakeLists.txt

@@ -119,7 +119,7 @@ set(CMAKE_AUTOMOC ON)
 include(GNUInstallDirs)
 set(CMAKE_AUTOUIC ON)
 
-find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Sql)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Sql Svg)
 message(STATUS "Qt Version: ${QT_VERSION}")
 
 find_package(PkgConfig REQUIRED)

flake.nix

@@ -77,6 +77,9 @@
             python3Packages.numpy
           ];
           EZPWD_DIR = "${ezpwdSrc}/c++";
+          shellHook = ''
+            export QT_PLUGIN_PATH=${pkgs.qt6.qtsvg}/lib/qt-6/plugins''${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
+          '';
         };
       }
     );

src/ld-analyse/CMakeLists.txt

@@ -40,7 +40,7 @@ target_include_directories(ld-analyse PRIVATE
 )
 
 target_link_libraries(ld-analyse PRIVATE
-    Qt::Core Qt::Gui Qt::Widgets
+    Qt::Core Qt::Gui Qt::Widgets Qt::Svg
     lddecode-library lddecode-chroma
 )
 

src/ld-json-converter/lddecodemetadata.cpp

@@ -96,6 +96,9 @@ static const VideoSystemDefaults &getSystemDefaults(const LdDecodeMetaData::Vide
 // Return true and set system if found; if not found, return false.
 bool parseVideoSystemName(QString name, VideoSystem &system)
 {
+    // Accept "PAL-M" as an alias for "PAL_M"
+    if (name == "PAL-M") name = "PAL_M";
+
     // Search VIDEO_SYSTEM_DEFAULTS for a matching name
     for (const auto &defaults: VIDEO_SYSTEM_DEFAULTS) {
         if (name == defaults.name) {