vtest config for small screens

Author: mikekirin

.github/workflows/check_visual_tests.yml

@@ -181,6 +181,12 @@ jobs:
       run: |
         echo "VTEST_DIFF_FOUND=false" >> $GITHUB_ENV
         ./vtest/vtest-compare-pngs.sh --ci 1
+    - name: Compare PNGs small
+      run: |
+        ./vtest/vtest-compare-pngs.sh --ci 1 -c ./current_pngs_small -r ./reference_pngs_small
+#    - name: Compare PNGs gp
+#      run: |
+#        ./vtest/vtest-compare-pngs.sh --ci 1 -c ./current_pngs_gp_small -r ./reference_pngs_gp_small
     - name: Upload comparison
       if: env.VTEST_DIFF_FOUND == 'true'
       uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -69,6 +69,7 @@ option(MUE_BUILD_ENGRAVING_TESTS "Build engraving tests" ON)
 option(MUE_BUILD_ENGRAVING_DEVTOOLS "Build engraving devtools" ON)
 option(MUE_BUILD_ENGRAVING_PLAYBACK "Build engraving playback" ON)
 option(MUE_BUILD_IMPORTEXPORT_MODULE "Build importexport module" ON)
+option(MUE_BUILD_GP_MODULE "Build guitar pro module without import export module" OFF)
 option(MUE_BUILD_IMPORTEXPORT_TESTS "Build importexport tests" ON)
 option(MUE_BUILD_VIDEOEXPORT_MODULE "Build videoexport module" OFF)
 option(MUE_BUILD_IMAGESEXPORT_MODULE "Build imagesexport module" ON)

SetupConfigure.cmake

@@ -200,6 +200,7 @@ if(BUILD_CONFIGURATION MATCHES "VTEST")
 
     set(MUE_BUILD_IMPORTEXPORT_MODULE OFF)
     set(MUE_BUILD_VIDEOEXPORT_MODULE OFF)
+    set(MUE_BUILD_GP_MODULE ON)
 
     set(MUE_INSTALL_SOUNDFONT OFF)
 
@@ -328,6 +329,7 @@ def_opt(MUE_BUILD_PALETTE_MODULE ${MUE_BUILD_PALETTE_MODULE})
 def_opt(MUE_BUILD_PLAYBACK_MODULE ${MUE_BUILD_PLAYBACK_MODULE})
 def_opt(MUE_BUILD_PROJECT_MODULE ${MUE_BUILD_PROJECT_MODULE})
 def_opt(MUE_BUILD_IMPORTEXPORT_MODULE ${MUE_BUILD_IMPORTEXPORT_MODULE})
+def_opt(MUE_BUILD_GP_MODULE ${MUE_BUILD_GP_MODULE})
 def_opt(MUE_BUILD_VIDEOEXPORT_MODULE ${MUE_BUILD_VIDEOEXPORT_MODULE})
 def_opt(MUE_BUILD_IMAGESEXPORT_MODULE ${MUE_BUILD_IMAGESEXPORT_MODULE})
 

buildscripts/ci/vtests/generate_pngs.sh

@@ -42,6 +42,10 @@ echo =======================
 
 echo Generate reference pngs: 
 ./vtest/vtest-generate-pngs.sh -o ./reference_pngs -m $REF_BIN
+./vtest/vtest-generate-pngs.sh -o ./reference_pngs_small -m $REF_BIN -s ./vtest/scores_small -d 460 -S ./vtest/small.mss
+#./vtest/vtest-generate-pngs.sh -o ./reference_pngs_gp_small -m $REF_BIN -s ./vtest/gp_small -d 460 -S ./vtest/small.mss --gp-linked
 
 echo Generate current pngs: 
 ./vtest/vtest-generate-pngs.sh -o ./current_pngs -m $CUR_BIN
+./vtest/vtest-generate-pngs.sh -o ./current_pngs_small -m $REF_BIN -s ./vtest/scores_small -d 460 -S ./vtest/small.mss
+#./vtest/vtest-generate-pngs.sh -o ./current_pngs_gp_small -m $REF_BIN -s ./vtest/gp_small -d 460 -S ./vtest/small.mss --gp-linked

src/app/CMakeLists.txt

@@ -171,6 +171,9 @@ if (MUE_BUILD_IMPORTEXPORT_MODULE)
         list(APPEND LINK_LIB iex_videoexport)
     endif()
 else()
+    if (MUE_BUILD_GP_MODULE)
+        list(APPEND LINK_LIB iex_guitarpro)
+    endif()
     if (MUE_BUILD_IMAGESEXPORT_MODULE)
         list(APPEND LINK_LIB iex_imagesexport)
     endif()

src/app/appfactory.cpp

@@ -152,6 +152,9 @@
 #include "importexport/videoexport/videoexportmodule.h"
 #endif
 #else
+#ifdef MUE_BUILD_GP_MODULE
+#include "importexport/guitarpro/guitarpromodule.h"
+#endif
 #ifdef MUE_BUILD_IMAGESEXPORT_MODULE
 #include "importexport/imagesexport/imagesexportmodule.h"
 #endif
@@ -300,6 +303,9 @@ std::shared_ptr<muse::IApplication> AppFactory::newGuiApp(const CmdOptions& opti
     app->addModule(new mu::iex::videoexport::VideoExportModule());
 #endif
 #else
+#ifdef MUE_BUILD_GP_MODULE
+    app->addModule(new mu::iex::guitarpro::GuitarProModule());
+#endif
 #ifdef MUE_BUILD_IMAGESEXPORT_MODULE
     app->addModule(new mu::iex::imagesexport::ImagesExportModule());
 #endif
@@ -417,6 +423,9 @@ std::shared_ptr<muse::IApplication> AppFactory::newConsoleApp(const CmdOptions&
     app->addModule(new mu::iex::videoexport::VideoExportModule());
 #endif
 #else
+#ifdef MUE_BUILD_GP_MODULE
+    app->addModule(new mu::iex::guitarpro::GuitarProModule());
+#endif
 #ifdef MUE_BUILD_IMAGESEXPORT_MODULE
     app->addModule(new mu::iex::imagesexport::ImagesExportModule());
 #endif

src/app/internal/consoleapp.cpp

@@ -252,6 +252,10 @@ void ConsoleApp::applyCommandLineOptions(const CmdOptions& options, IApplication
     musicXmlConfiguration()->setNeedUseDefaultFontOverride(options.importMusicXml.useDefaultFont);
     musicXmlConfiguration()->setInferTextTypeOverride(options.importMusicXml.inferTextType);
 #endif
+#ifdef MUE_BUILD_GP_MODULE
+    guitarProConfiguration()->setLinkedTabStaffCreated(options.guitarPro.linkedTabStaffCreated);
+    guitarProConfiguration()->setExperimental(options.guitarPro.experimental);
+#endif
 
     if (options.app.revertToFactorySettings) {
         appshellConfiguration()->revertToFactorySettings(options.app.revertToFactorySettings.value());

src/importexport/CMakeLists.txt

@@ -36,6 +36,9 @@ if (MUE_BUILD_IMPORTEXPORT_MODULE)
         add_subdirectory(videoexport)
     endif()
 else()
+    if (MUE_BUILD_GP_MODULE)
+        add_subdirectory(guitarpro)
+    endif()
     if (MUE_BUILD_IMAGESEXPORT_MODULE)
         add_subdirectory(imagesexport)
     endif()