moved font provider and font metric users to local context

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "muse_framework"]
 	path = muse
-	url = https://github.com/musescore/muse_framework.git
+	url = https://github.com/alexpavlov96/muse_framework.git
+	branch = alex/fonts-context
 [submodule "muse_deps"]
 	path = muse_deps
 	url = https://github.com/musescore/muse_deps.git

src/app/internal/consoleapp.cpp

@@ -261,7 +261,7 @@ int MuseScoreConsoleApp::processConverter(const MuseScoreCmdOptions::ConverterTa
     return ret.code();
 }
 
-int MuseScoreConsoleApp::processDiagnostic(const MuseScoreCmdOptions::Diagnostic& task, const muse::modularity::ContextPtr&)
+int MuseScoreConsoleApp::processDiagnostic(const MuseScoreCmdOptions::Diagnostic& task, const muse::modularity::ContextPtr& ctx)
 {
     if (!diagnosticDrawProvider()) {
         return make_ret(Ret::Code::NotSupported);
@@ -286,24 +286,24 @@ int MuseScoreConsoleApp::processDiagnostic(const MuseScoreCmdOptions::Diagnostic
 
     switch (task.type) {
     case DiagnosticType::GenDrawData:
-        ret = diagnosticDrawProvider()->generateDrawData(input.front(), output);
+        ret = diagnosticDrawProvider()->generateDrawData(input.front(), output, ctx);
         break;
     case DiagnosticType::ComDrawData: {
         IF_ASSERT_FAILED(input.size() == 2) {
             return make_ret(Ret::Code::UnknownError);
         }
-        ret = diagnosticDrawProvider()->compareDrawData(input.at(0), input.at(1), output);
+        ret = diagnosticDrawProvider()->compareDrawData(input.at(0), input.at(1), output, ctx);
     } break;
     case DiagnosticType::DrawDataToPng:
-        ret = diagnosticDrawProvider()->drawDataToPng(input.front(), output);
+        ret = diagnosticDrawProvider()->drawDataToPng(input.front(), output, ctx);
         break;
     case DiagnosticType::DrawDiffToPng: {
         muse::io::path_t diffPath = input.at(0);
         muse::io::path_t refPath;
         if (input.size() > 1) {
             refPath = input.at(1);
         }
-        ret = diagnosticDrawProvider()->drawDiffToPng(diffPath, refPath, output);
+        ret = diagnosticDrawProvider()->drawDiffToPng(diffPath, refPath, output, ctx);
     } break;
     default:
         break;

src/braille/tests/environment.cpp

@@ -29,7 +29,7 @@
 #include "engraving/dom/instrtemplate.h"
 #include "engraving/dom/mscore.h"
 
-static muse::testing::SuiteEnvironment importexport_se(
+static muse::testing::SuiteEnvironment importexport_se = muse::testing::SuiteEnvironment(
 {
     new muse::draw::DrawModule(),
     new mu::engraving::EngravingModule()
@@ -46,4 +46,4 @@ static muse::testing::SuiteEnvironment importexport_se(
 
     mu::engraving::loadInstrumentTemplates(":/engraving/instruments/instruments.xml");
 }
-    );
+    ).setContext(mu::engraving::ScoreRW::iocContext());

src/converter/tests/environment.cpp

@@ -32,6 +32,7 @@
 static muse::testing::SuiteEnvironment converter_se
     = muse::testing::SuiteEnvironment()
       .setDependencyModules({ new muse::draw::DrawModule(), new mu::engraving::EngravingModule() })
+      .setContext(mu::engraving::ScoreRW::iocContext())
       .setPostInit([]() {
     LOGI() << "converter tests suite post init";
 

src/engraving/api/tests/environment.cpp

@@ -32,7 +32,7 @@
 
 #include "log.h"
 
-static muse::testing::SuiteEnvironment engraving_api_se(
+static muse::testing::SuiteEnvironment engraving_api_se = muse::testing::SuiteEnvironment(
 {
     new muse::draw::DrawModule(),
     new mu::engraving::EngravingModule()
@@ -49,4 +49,4 @@ static muse::testing::SuiteEnvironment engraving_api_se(
     // Load instrument templates for tests that need them
     mu::engraving::loadInstrumentTemplates(":/engraving/instruments/instruments.xml");
 }
-    );
+    ).setContext(mu::engraving::ScoreRW::iocContext());

src/engraving/devtools/drawdata/diagnosticdrawprovider.cpp

@@ -41,10 +41,11 @@ using namespace mu::engraving;
 // ./vtest/scores/accidental-1.mscx -o ./work/1_accidental-1.exp.png
 // ./vtest/scores/emmentaler-text-3.mscx -o ./work/emmentaler-text-3.png
 
-Ret DiagnosticDrawProvider::generateDrawData(const muse::io::path_t& dirOrFile, const muse::io::path_t& outDirOrFile, const GenOpt& opt)
+Ret DiagnosticDrawProvider::generateDrawData(const muse::io::path_t& dirOrFile, const muse::io::path_t& outDirOrFile,
+                                             const muse::modularity::ContextPtr& iocCtx, const GenOpt& opt)
 {
     LOGI() << "scoresDir: " << dirOrFile << ", outDir: " << outDirOrFile;
-    DrawDataGenerator g;
+    DrawDataGenerator g(iocCtx);
 
     if (io::FileInfo(dirOrFile).entryType() == io::EntryType::File) {
         return g.processFile(dirOrFile, outDirOrFile, opt);
@@ -54,7 +55,7 @@ Ret DiagnosticDrawProvider::generateDrawData(const muse::io::path_t& dirOrFile,
 }
 
 Ret DiagnosticDrawProvider::compareDrawData(const muse::io::path_t& ref, const muse::io::path_t& test, const muse::io::path_t& outDiff,
-                                            const ComOpt& opt)
+                                            const muse::modularity::ContextPtr& iocCtx, const ComOpt& opt)
 {
     LOGI() << "ref: " << ref << ", test: " << test << ", outDiff: " << outDiff;
     DrawDataComparator c;
@@ -72,7 +73,7 @@ Ret DiagnosticDrawProvider::compareDrawData(const muse::io::path_t& ref, const m
     }
 
     if (opt.isMakePng) {
-        DrawDataConverter c2;
+        DrawDataConverter c2(iocCtx);
         c2.drawDataToPng(ref, outDir + "/" + io::FileInfo(ref).completeBaseName() + ".ref.png");
         c2.drawDataToPng(test, outDir + "/" + io::FileInfo(test).completeBaseName() + ".png");
         c2.drawDiffToPng(outDiff, ref, outDir + "/" + io::FileInfo(outDiff).completeBaseName() + ".diff.png");
@@ -81,17 +82,18 @@ Ret DiagnosticDrawProvider::compareDrawData(const muse::io::path_t& ref, const m
     return ret;
 }
 
-Ret DiagnosticDrawProvider::drawDataToPng(const muse::io::path_t& dataFile, const muse::io::path_t& outFile)
+Ret DiagnosticDrawProvider::drawDataToPng(const muse::io::path_t& dataFile, const muse::io::path_t& outFile,
+                                          const muse::modularity::ContextPtr& iocCtx)
 {
     LOGI() << "dataFile: " << dataFile << ", outFile: " << outFile;
-    DrawDataConverter c;
+    DrawDataConverter c(iocCtx);
     return c.drawDataToPng(dataFile, outFile);
 }
 
 Ret DiagnosticDrawProvider::drawDiffToPng(const muse::io::path_t& diffFile, const muse::io::path_t& refFile,
-                                          const muse::io::path_t& outFile)
+                                          const muse::io::path_t& outFile, const muse::modularity::ContextPtr& iocCtx)
 {
     LOGI() << "diffFile: " << diffFile << ", refFile: " << refFile << ", outFile: " << outFile;
-    DrawDataConverter c;
+    DrawDataConverter c(iocCtx);
     return c.drawDiffToPng(diffFile, refFile, outFile);
 }

src/engraving/devtools/drawdata/diagnosticdrawprovider.h

@@ -29,10 +29,12 @@ class DiagnosticDrawProvider : public IDiagnosticDrawProvider
 {
 public:
     muse::Ret generateDrawData(const muse::io::path_t& dirOrFile, const muse::io::path_t& outDirOrFile,
-                               const GenOpt& opt = GenOpt()) override;
+                               const muse::modularity::ContextPtr& iocCtx, const GenOpt& opt = GenOpt()) override;
     muse::Ret compareDrawData(const muse::io::path_t& ref, const muse::io::path_t& test, const muse::io::path_t& outDiff,
-                              const ComOpt& opt = ComOpt()) override;
-    muse::Ret drawDataToPng(const muse::io::path_t& dataFile, const muse::io::path_t& outFile) override;
-    muse::Ret drawDiffToPng(const muse::io::path_t& diffFile, const muse::io::path_t& refFile, const muse::io::path_t& outFile) override;
+                              const muse::modularity::ContextPtr& iocCtx, const ComOpt& opt = ComOpt()) override;
+    muse::Ret drawDataToPng(const muse::io::path_t& dataFile, const muse::io::path_t& outFile,
+                            const muse::modularity::ContextPtr& iocCtx) override;
+    muse::Ret drawDiffToPng(const muse::io::path_t& diffFile, const muse::io::path_t& refFile, const muse::io::path_t& outFile,
+                            const muse::modularity::ContextPtr& iocCtx) override;
 };
 }

src/engraving/devtools/drawdata/drawdataconverter.cpp

@@ -37,6 +37,11 @@ using namespace muse::draw;
 static const Color REF_COLOR("#999999");
 static const Color ADDED_COLOR("#ff0000");
 
+DrawDataConverter::DrawDataConverter(const muse::modularity::ContextPtr& iocCtx)
+    : muse::Contextable(iocCtx)
+{
+}
+
 Ret DrawDataConverter::drawDataToPng(const muse::io::path_t& dataFile, const muse::io::path_t& outFile)
 {
     RetVal<DrawDataPtr> drawData = DrawDataRW::readData(dataFile);
@@ -93,7 +98,7 @@ Pixmap DrawDataConverter::drawDataToPixmap(const DrawDataPtr& data)
 
     image.fill(Qt::white);
 
-    Painter painter(&image, "DrawData");
+    Painter painter(&image, "DrawData", iocContext());
 
     DrawDataPaint::paint(&painter, data);
 
@@ -109,7 +114,7 @@ void DrawDataConverter::drawOnPixmap(Pixmap& px, const DrawDataPtr& data, const
     qim.setDotsPerMeterX(std::lrint((DrawData::CANVAS_DPI * 1000) / mu::engraving::INCH));
     qim.setDotsPerMeterY(std::lrint((DrawData::CANVAS_DPI * 1000) / mu::engraving::INCH));
 
-    Painter painter(&qim, "DrawData");
+    Painter painter(&qim, "DrawData", iocContext());
     DrawDataPaint::paint(&painter, data, overlay);
     painter.endDraw();
 

src/engraving/devtools/drawdata/drawdataconverter.h

@@ -26,12 +26,13 @@
 #include "global/io/path.h"
 #include "draw/types/drawdata.h"
 #include "draw/types/pixmap.h"
+#include "modularity/ioc.h"
 
 namespace mu::engraving {
-class DrawDataConverter
+class DrawDataConverter : public muse::Contextable
 {
 public:
-    DrawDataConverter() = default;
+    DrawDataConverter(const muse::modularity::ContextPtr& iocCtx);
 
     muse::Ret drawDataToPng(const muse::io::path_t& dataFile, const muse::io::path_t& outFile);
     muse::Ret drawDiffToPng(const muse::io::path_t& diffFile, const muse::io::path_t& refFile, const muse::io::path_t& outFile);

src/engraving/devtools/drawdata/drawdatagenerator.cpp

@@ -52,6 +52,11 @@ using namespace mu::engraving;
 
 static const std::vector<std::string> FILES_FILTER = { "*.mscz", "*.mscx", "*.gp", "*.gpx", "*.gp4", "*.gp5" };
 
+DrawDataGenerator::DrawDataGenerator(const muse::modularity::ContextPtr& iocCtx)
+    : muse::Contextable(iocCtx)
+{
+}
+
 Ret DrawDataGenerator::processDir(const muse::io::path_t& scoreDir, const muse::io::path_t& outDir, const GenOpt& opt)
 {
     io::Dir::mkpath(outDir);
@@ -102,7 +107,7 @@ Ret DrawDataGenerator::processFile(const muse::io::path_t& scoreFile, const muse
 
 DrawDataPtr DrawDataGenerator::genDrawData(const muse::io::path_t& scorePath, const GenOpt& opt) const
 {
-    MasterScore* score = compat::ScoreAccess::createMasterScoreWithBaseStyle(nullptr);
+    MasterScore* score = compat::ScoreAccess::createMasterScoreWithBaseStyle(iocContext());
     if (!loadScore(score, scorePath)) {
         LOGE() << "failed load score: " << scorePath;
         return nullptr;
@@ -140,7 +145,7 @@ DrawDataPtr DrawDataGenerator::genDrawData(const muse::io::path_t& scorePath, co
 Pixmap DrawDataGenerator::genImage(const muse::io::path_t& scorePath) const
 {
     LOGD() << "try: " << scorePath;
-    MasterScore* score = compat::ScoreAccess::createMasterScoreWithBaseStyle(nullptr);
+    MasterScore* score = compat::ScoreAccess::createMasterScoreWithBaseStyle(iocContext());
     if (!loadScore(score, scorePath)) {
         LOGE() << "failed load score: " << scorePath;
         return Pixmap();
@@ -164,7 +169,7 @@ Pixmap DrawDataGenerator::genImage(const muse::io::path_t& scorePath) const
 
     image.fill(Qt::white);
     {
-        Painter painter(&image, "DrawData");
+        Painter painter(&image, "DrawData", score->iocContext());
 
         rendering::IScoreRenderer::ScorePaintOptions opt;
         opt.fromPage = 0;

src/engraving/devtools/drawdata/drawdatagenerator.h

@@ -33,11 +33,13 @@
 
 namespace mu::engraving {
 class MasterScore;
-class DrawDataGenerator
+class DrawDataGenerator : public muse::Contextable
 {
     muse::GlobalInject<engraving::rendering::IScoreRenderer> scoreRenderer;
 
 public:
+    DrawDataGenerator(const muse::modularity::ContextPtr& iocCtx);
+
     muse::Ret processDir(const muse::io::path_t& scoreDir, const muse::io::path_t& outDir, const GenOpt& opt = GenOpt());
     muse::Ret processFile(const muse::io::path_t& scoreFile, const muse::io::path_t& outFile, const GenOpt& opt = GenOpt());
 

src/engraving/devtools/drawdata/idiagnosticdrawprovider.h

@@ -23,6 +23,7 @@
 #define MU_ENGRAVING_IDIAGNOSTICDRAWPROVIDER_H
 
 #include "modularity/imoduleinterface.h"
+#include "modularity/ioc.h"
 #include "global/types/ret.h"
 #include "global/io/path.h"
 
@@ -35,11 +36,14 @@ class IDiagnosticDrawProvider : MODULE_GLOBAL_INTERFACE
 public:
     virtual ~IDiagnosticDrawProvider() = default;
 
-    virtual muse::Ret generateDrawData(const muse::io::path_t& scoresDir, const muse::io::path_t& outDir, const GenOpt& opt = GenOpt()) = 0;
+    virtual muse::Ret generateDrawData(const muse::io::path_t& scoresDir, const muse::io::path_t& outDir,
+                                       const muse::modularity::ContextPtr& iocCtx, const GenOpt& opt = GenOpt()) = 0;
     virtual muse::Ret compareDrawData(const muse::io::path_t& ref, const muse::io::path_t& test, const muse::io::path_t& outDiff,
-                                      const ComOpt& opt = ComOpt()) = 0;
-    virtual muse::Ret drawDataToPng(const muse::io::path_t& dataFile, const muse::io::path_t& outFile) = 0;
-    virtual muse::Ret drawDiffToPng(const muse::io::path_t& diffFile, const muse::io::path_t& refFile, const muse::io::path_t& outFile) = 0;
+                                      const muse::modularity::ContextPtr& iocCtx, const ComOpt& opt = ComOpt()) = 0;
+    virtual muse::Ret drawDataToPng(const muse::io::path_t& dataFile, const muse::io::path_t& outFile,
+                                    const muse::modularity::ContextPtr& iocCtx) = 0;
+    virtual muse::Ret drawDiffToPng(const muse::io::path_t& diffFile, const muse::io::path_t& refFile, const muse::io::path_t& outFile,
+                                    const muse::modularity::ContextPtr& iocCtx) = 0;
 };
 }
 

src/engraving/dom/harmony.cpp

@@ -1185,22 +1185,22 @@ void Harmony::setColor(const Color& color)
 
 double TextSegment::width() const
 {
-    return FontMetrics::width(m_font, m_text);
+    return FontMetrics::width(m_font, m_text, m_iocCtx);
 }
 
 double TextSegment::capHeight() const
 {
-    return FontMetrics::capHeight(m_font);
+    return FontMetrics::capHeight(m_font, m_iocCtx);
 }
 
 RectF TextSegment::tightBoundingRect() const
 {
-    return FontMetrics::tightBoundingRect(m_font, m_text);
+    return FontMetrics::tightBoundingRect(m_font, m_text, m_iocCtx);
 }
 
 RectF TextSegment::boundingRect() const
 {
-    return FontMetrics::boundingRect(m_font, m_text);
+    return FontMetrics::boundingRect(m_font, m_text, m_iocCtx);
 }
 
 void TextSegment::setFont(const muse::draw::Font& f)
@@ -1211,7 +1211,7 @@ void TextSegment::setFont(const muse::draw::Font& f)
     }
 
     // Check all symbols in string are available in this font
-    FontMetrics fm(f);
+    FontMetrics fm(f, m_iocCtx);
     bool fail = false;
     for (size_t i = 0; i < m_text.size(); ++i) {
         const Char& c = m_text.at(i);

src/engraving/dom/harmony.h

@@ -131,12 +131,14 @@ struct TextSegment : HarmonyRenderItem {
 
     HarmonyRenderItemType type() const override { return HarmonyRenderItemType::TEXT; }
 
-    TextSegment(const String& s, const muse::draw::Font& f, double _x, double _y, bool align)
-        : HarmonyRenderItem(align, _x, _y) { setText(s); setFont(f); }
+    TextSegment(const String& s, const muse::draw::Font& f, double _x, double _y, bool align,
+                const muse::modularity::ContextPtr& iocCtx)
+        : HarmonyRenderItem(align, _x, _y), m_iocCtx(iocCtx) { setText(s); setFont(f); }
 
 private:
     muse::draw::Font m_font;
     String m_text;
+    muse::modularity::ContextPtr m_iocCtx;
 };
 
 class HDegree;

src/engraving/dom/note.cpp

@@ -1236,7 +1236,7 @@ double Note::tabHeadWidth(const StaffType* tab) const
     if (tab && tab->isTabStaff() && m_fret != INVALID_FRET_INDEX && m_string != INVALID_STRING_INDEX) {
         Font f = tab->fretFont();
         f.setPointSizeF(tab->fretFontSize());
-        val = FontMetrics::width(f, m_fretString) * magS();
+        val = FontMetrics::width(f, m_fretString, iocContext()) * magS();
     } else {
         val = headWidth();
     }

src/engraving/dom/score.h

@@ -279,7 +279,7 @@ class Score : public EngravingObject, public muse::Contextable
     DECLARE_CLASSOF(ElementType::SCORE)
 
     muse::GlobalInject<class IEngravingConfiguration> configuration;
-    muse::GlobalInject<class IEngravingFontsProvider> engravingFonts;
+    muse::ContextInject<class IEngravingFontsProvider> engravingFonts = { this };
     muse::ContextInject<class IEngravingContextConfiguration> contextConfiguration;
     muse::ContextInject<class IEngravingElementsProvider> elementsProvider;
     muse::ContextInject<class IPaletteScoreProvider> paletteScoreProvider;

src/engraving/dom/stafftype.cpp

@@ -406,7 +406,7 @@ void StaffType::setDurationMetrics()
 // use a scaled up font and then scale computed values down
     Font font(durationFont());
     font.setPointSizeF(m_durationFontSize);
-    FontMetrics fm(font);
+    FontMetrics fm(font, m_score->iocContext());
     String txt(m_durationFonts[m_durationFontIdx].displayValue, size_t(TabVal::NUM_OF));
     RectF bb(fm.tightBoundingRect(txt));
     // raise symbols by a default margin and, if marks are above lines, by half the line distance
@@ -428,7 +428,7 @@ void StaffType::setFretMetrics()
         return;
     }
 
-    FontMetrics fm(fretFont());
+    FontMetrics fm(fretFont(), m_score->iocContext());
     RectF bb;
     // compute vertical displacement
     if (m_useNumbers) {