fixes #87, showing bar number on each bar

Author: yjpark

crates/notation_bevy/src/bar/bar_plugin.rs

@@ -12,7 +12,8 @@ impl Plugin for BarPlugin {
         BarViewDoLayoutEvent::setup(app);
         app.add_system_set(
             SystemSet::on_update(NotationAssetsStates::Loaded)
-                .with_system(BarView::do_layout.system()),
+                .with_system(BarView::do_layout.system())
+                .with_system(BarView::update_number_text.system())
         );
     }
 }

crates/notation_bevy/src/bar/bar_view.rs

@@ -71,6 +71,22 @@ impl BarView {
             }
         }
     }
+    pub fn update_number_text(
+        theme: Res<NotationTheme>,
+        settings: Res<NotationSettings>,
+        mut evts: EventReader<BarViewDoLayoutEvent>,
+        mut text_query: Query<(&Parent, &mut Transform), With<Text>>,
+    ) {
+        if !settings.hide_bar_number {
+            for evt in evts.iter() {
+                for (parent, mut transform) in text_query.iter_mut() {
+                    if parent.0 == evt.entity {
+                        theme.texts.tab.update_bar_number_x(&mut transform, evt.layout.size.width);
+                    }
+                }
+            }
+        }
+    }
     pub fn spawn(
         commands: &mut Commands,
         assets: &NotationAssets,
@@ -113,6 +129,12 @@ impl BarView {
             let data = BarBeatData::new(bar, BarBeatValue::new(bar, &signature, beat));
             data.create(commands, theme, bar_entity);
         }
+        if !settings.hide_bar_number {
+            theme
+                .texts
+                .tab
+                .spawn_bar_number(commands, assets, bar_entity, &bar.props.bar_ordinal.to_string());
+        }
         bar_entity
     }
 }

crates/notation_bevy/src/mini/mini_bar.rs

@@ -112,8 +112,8 @@ impl MiniBar {
             section_separator_data.create(commands, theme, bar_entity);
             theme.texts.mini_map.spawn_bar_text(
                 commands,
-                shape_entity,
                 assets,
+                shape_entity,
                 bar.props.bar_ordinal.to_string().as_str(),
             );
         }

crates/notation_bevy/src/rhythm/rhythm_bar.rs

@@ -102,7 +102,7 @@ impl RhythmBarData {
         theme
             .texts
             .rhythm
-            .spawn_bar_text(commands, bar_entity, assets, "0");
+            .spawn_bar_text(commands, assets, bar_entity, "0");
         bar_entity
     }
     pub fn update_rhythm(

crates/notation_bevy/src/settings/notation_settings.rs

@@ -11,6 +11,7 @@ pub struct NotationSettings {
     pub layout: LayoutSettings,
     pub should_loop: bool,
     pub speed_factor: f32,
+    pub hide_bar_number: bool,
     pub always_show_fret: bool,
     pub melody_piano_mode: bool,
     pub mouse_dragged_panning: bool,
@@ -22,6 +23,7 @@ impl Default for NotationSettings {
             layout: LayoutSettings::default(),
             should_loop: false,
             speed_factor: 1.0,
+            hide_bar_number: false,
             always_show_fret: false,
             melody_piano_mode: false,
             mouse_dragged_panning: false,

crates/notation_bevy/src/theme/theme_texts.rs

@@ -11,10 +11,57 @@ use crate::prelude::{NotationAssets, ThemeColors};
 #[derive(Copy, Clone, PartialEq, Serialize, Deserialize, Debug, Default)]
 #[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub struct ThemeTexts {
+    pub tab: TabTexts,
     pub rhythm: RhythmTexts,
     pub mini_map: MiniMapTexts,
 }
 
+#[derive(Copy, Clone, PartialEq, Serialize, Deserialize, Debug)]
+#[cfg_attr(feature = "inspector", derive(Inspectable))]
+pub struct TabTexts {
+    pub bar_font_size: f32,
+    pub bar_font_color: Color,
+    pub bar_x: f32,
+    pub bar_y: f32,
+}
+impl Default for TabTexts {
+    fn default() -> Self {
+        Self {
+            bar_font_size: 18.0,
+            bar_font_color: ThemeColors::hex_linear("00000066"),
+            bar_x: -6.0,
+            bar_y: -6.0,
+        }
+    }
+}
+impl TabTexts {
+    pub fn spawn_bar_number(
+        &self,
+        commands: &mut Commands,
+        assets: &NotationAssets,
+        entity: Entity,
+        text: &str,
+    ) {
+        //NOTE: not sure why, using HorizontalAlign::Right here got the left behaviour
+        BevyUtil::spawn_text(
+            commands,
+            entity,
+            text,
+            assets.en_font.clone(),
+            self.bar_font_size,
+            self.bar_font_color,
+            HorizontalAlign::Left,
+            VerticalAlign::Center,
+            self.bar_x,
+            self.bar_y,
+            3.0,
+        );
+    }
+    pub fn update_bar_number_x(&self, transform: &mut Transform, bar_width: f32) {
+        transform.translation.x = bar_width + self.bar_x;
+    }
+}
+
 #[derive(Copy, Clone, PartialEq, Serialize, Deserialize, Debug)]
 #[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub struct RhythmTexts {
@@ -35,8 +82,8 @@ impl RhythmTexts {
     pub fn spawn_bar_text(
         &self,
         commands: &mut Commands,
-        entity: Entity,
         assets: &NotationAssets,
+        entity: Entity,
         text: &str,
     ) {
         //NOTE: not sure why, using HorizontalAlign::Right here got the left behaviour
@@ -74,8 +121,8 @@ impl MiniMapTexts {
     pub fn spawn_bar_text(
         &self,
         commands: &mut Commands,
-        entity: Entity,
         assets: &NotationAssets,
+        entity: Entity,
         text: &str,
     ) {
         //NOTE: not sure why, using HorizontalAlign::Right here got the left behaviour

crates/notation_bevy/src/viewer/control.rs

@@ -269,6 +269,11 @@ impl ControlView {
                             &mut play_control_evts,
                         )
                     }
+                    let hide_bar_number = settings.hide_bar_number;
+                    ui.checkbox(&mut settings.hide_bar_number, "Hide Bar Number");
+                    if hide_bar_number != settings.hide_bar_number {
+                        Self::reload_tab(&mut commands, &mut state, &viewer_query);
+                    }
                     if ui.button(format!("Begin: {}", midi_state.play_control.begin_bar_ordinal)).clicked() {
                         Self::set_begin_bar_ordinal(&mut midi_state, &mut play_control_evts);
                     }