added ENGRAVING_PAINT_DEBUGGER_ENABLED cmake option

musescore · Sep 6, 2021 · 8b7313a · 8b7313a
1 parent 0268999
commit 8b7313a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,6 +75,7 @@ option(BUILD_DIAGNOSTICS "Build diagnostic code" ON)
 set(YOUTUBE_API_KEY "" CACHE STRING "YouTube API key")
 
 option(ENGRAVING_BUILD_ACCESSIBLE_TREE "Build score accessible tree" OFF)
+option(ENGRAVING_PAINT_DEBUGGER_ENABLED "Enable diagnostic engraving paint debugger" OFF)
 # Temporary flags for MU3 compatibility to make testing easier.
 option(ENGRAVING_COMPAT_WRITESTYLE_302 "Write style to score xml file" ON)
 option(ENGRAVING_COMPAT_WRITEEXCERPTS_302 "Write excerpts to score xml file" ON)

diff --git a/build/config.h.in b/build/config.h.in
@@ -66,6 +66,7 @@
 #cmakedefine BUILD_DIAGNOSTICS
 
 #cmakedefine ENGRAVING_BUILD_ACCESSIBLE_TREE
+#cmakedefine ENGRAVING_PAINT_DEBUGGER_ENABLED
 #cmakedefine ENGRAVING_COMPAT_WRITESTYLE_302
 #cmakedefine ENGRAVING_COMPAT_WRITEEXCERPTS_302
 

diff --git a/src/engraving/libmscore/engravingitem.cpp b/src/engraving/libmscore/engravingitem.cpp
@@ -167,6 +167,7 @@ EngravingItem::EngravingItem(const EngravingItem& e)
     itemDiscovered = false;
 
 #ifdef ENGRAVING_BUILD_ACCESSIBLE_TREE
+    //! TODO Please don't remove (igor.korsukov@gmail.com)
     //m_accessible = e.m_accessible->clone(this);
 #endif
 }
@@ -184,14 +185,16 @@ void EngravingItem::init()
 #ifdef ENGRAVING_BUILD_ACCESSIBLE_TREE
     m_accessible = createAccessible();
     m_accessible->setElement(this);
-#else
-    UNUSED(access);
 #endif
 }
 
 mu::engraving::AccessibleElement* EngravingItem::createAccessible() const
 {
+#ifdef ENGRAVING_BUILD_ACCESSIBLE_TREE
     return new mu::engraving::AccessibleElement();
+#else
+    return nullptr;
+#endif
 }
 
 //---------------------------------------------------------

diff --git a/src/engraving/paint/paint.cpp b/src/engraving/paint/paint.cpp
@@ -32,8 +32,6 @@
 
 #include "log.h"
 
-#define PAINT_DEBUGGER_ENABLED
-
 using namespace mu::engraving;
 using namespace mu::accessibility;
 using namespace Ms;
@@ -123,7 +121,9 @@ void Paint::paintPage(mu::draw::Painter& painter, Ms::Page* page, const RectF& r
     QList<EngravingItem*> elements = page->items(rect);
     paintElements(painter, elements);
 
+#ifdef ENGRAVING_PAINT_DEBUGGER_ENABLED
     paintPageDiagnostic(painter, page);
+#endif
 
     painter.translate(-pagePosition);
     painter.setClipping(false);
@@ -154,15 +154,12 @@ void Paint::paintChildren(mu::draw::Painter& painter, const std::list<const Ms::
         if (el->treeParent() == parent) {
             const Ms::EngravingItem* item = Ms::toEngravingItem(el);
 
-#ifdef PAINT_DEBUGGER_ENABLED
             initDebugger(painter, item);
-#endif
 
             paintElement(painter, item);
 
-#ifdef PAINT_DEBUGGER_ENABLED
             deinitDebugger(painter);
-#endif
+
             if (elementsProvider()->isSelected(item)) {
                 static mu::draw::Pen borderPen(DEBUG_ELTREE_SELECTED_COLOR, 4);