BookParameters: separate Items and Processing topics

Audiveris · Feb 3, 2025 · 1c254b4 · 1c254b4
1 parent e284a58
commit 1c254b4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/app/src/main/java/org/audiveris/omr/score/ui/BookParameters.java b/app/src/main/java/org/audiveris/omr/score/ui/BookParameters.java
@@ -317,6 +317,15 @@ private List<XactTopic> buildTopics (Object scope,
             }
         }
 
+        { // Items
+            final XactTopic topic = new XactTopic(Topic.Items.name());
+            topics.add(topic);
+
+            for (ProcessingSwitch key : ProcessingSwitch.itemSwitches) {
+                topic.add(switchMap.get(key));
+            }
+        }
+
         { // Processing
             final XactTopic topic = new XactTopic(Topic.Processing.name());
             topics.add(topic);
@@ -920,6 +929,7 @@ private static enum Topic
         Binarization,
         Scaling,
         Staves,
+        Items,
         Processing;
     }
 

diff --git a/app/src/main/java/org/audiveris/omr/sheet/ProcessingSwitch.java b/app/src/main/java/org/audiveris/omr/sheet/ProcessingSwitch.java
@@ -52,8 +52,6 @@ public enum ProcessingSwitch
     drumNotation(ProcessingSwitches.constants.drumNotation),
     sixStringTablatures(ProcessingSwitches.constants.sixStringTablatures),
 
-    keepGrayImages(ProcessingSwitches.constants.keepGrayImages),
-    indentations(ProcessingSwitches.constants.indentations),
     smallHeads(ProcessingSwitches.constants.smallHeads),
     smallBeams(ProcessingSwitches.constants.smallBeams),
     crossHeads(ProcessingSwitches.constants.crossHeads),
@@ -63,12 +61,13 @@ public enum ProcessingSwitch
     pluckings(ProcessingSwitches.constants.pluckings),
     partialWholeRests(ProcessingSwitches.constants.partialWholeRests),
     multiWholeHeadChords(ProcessingSwitches.constants.multiWholeHeadChords),
-
     chordNames(ProcessingSwitches.constants.chordNames),
     lyrics(ProcessingSwitches.constants.lyrics),
     lyricsAboveStaff(ProcessingSwitches.constants.lyricsAboveStaff),
-
     articulations(ProcessingSwitches.constants.articulations),
+
+    keepGrayImages(ProcessingSwitches.constants.keepGrayImages),
+    indentations(ProcessingSwitches.constants.indentations),
     bothSharedHeadDots(ProcessingSwitches.constants.bothSharedHeadDots),
     implicitTuplets(ProcessingSwitches.constants.implicitTuplets),
 
@@ -93,7 +92,14 @@ public enum ProcessingSwitch
             sixStringTablatures);
 
     /**
-     * The standard (non-staff) switches.
+     * The item switches.
+     */
+    public static EnumSet<ProcessingSwitch> itemSwitches = EnumSet.range( //
+            smallHeads,
+            articulations);
+
+    /**
+     * The processing switches.
      */
     public static EnumSet<ProcessingSwitch> standardSwitches = EnumSet.range(
             keepGrayImages,