fixes #147, can only show selected bars, also make empty bar as setting

yjpark · yjpark · commit 6d54ca2b3252 · 2022-01-14T15:03:20.000+08:00
diff --git a/apps/notation_kb/src/index_panel.rs b/apps/notation_kb/src/index_panel.rs
@@ -124,6 +124,7 @@ impl IndexPanel {
         theme.sizes.melody.note_height = 8.0;
         theme.sizes.melody.semitone_height = 8.0;
         theme.texts.melody.text_y = -18.0;
+        settings.add_ready_section = false;
         settings.hide_mini_map = true;
         settings.hide_bar_number = true;
         settings.layout.focus_bar_ease_ms = 0;
diff --git a/apps/notation_kb/src/kb.rs b/apps/notation_kb/src/kb.rs
@@ -41,12 +41,13 @@ impl NotationKnowledgeBase {
         mut windows: ResMut<Windows>,
         mut state: ResMut<NotationState>,
         mut theme: ResMut<NotationTheme>,
+        settings: Res<NotationSettings>,
         mut evts: EventWriter<AddTabEvent>,
         entities: Query<Entity, With<GlobalTransform>>,
         viewer_query: Query<(Entity, &TabViewer), With<TabViewer>>,
         index: Res<IndexPanel>,
     ) {
-        NotationApp::load_tab(&mut commands, &time, &mut windows, &mut state, &mut theme, &mut evts, &entities, &viewer_query, |tab_path| {
+        NotationApp::load_tab(&mut commands, &time, &mut windows, &mut state, &mut theme, &settings, &mut evts, &entities, &viewer_query, |tab_path| {
             index.make_tab(tab_path)
         })
     }
diff --git a/apps/notation_kb/src/theory/scale.rs b/apps/notation_kb/src/theory/scale.rs
@@ -137,7 +137,7 @@ impl ScalePage {
             new_bar(8),
             new_bar(12),
         ];
-        let section = ProtoSection::new("notes".to_owned(), SectionKind::Rest, bars);
+        let section = ProtoSection::new("notes".to_owned(), SectionKind::Ready, bars);
         ProtoTab::new(
             ProtoTab::new_uuid().as_str(),
             meta,
diff --git a/apps/notation_viewer/src/viewer.rs b/apps/notation_viewer/src/viewer.rs
@@ -36,17 +36,17 @@ impl NotationViewer {
         mut windows: ResMut<Windows>,
         mut state: ResMut<NotationState>,
         mut theme: ResMut<NotationTheme>,
+        settings: Res<NotationSettings>,
         mut evts: EventWriter<AddTabEvent>,
         entities: Query<Entity, With<GlobalTransform>>,
         viewer_query: Query<(Entity, &TabViewer), With<TabViewer>>,
         asset_server: Res<AssetServer>,
         assets: Res<Assets<TabAsset>>,
     ) {
-        NotationApp::load_tab(&mut commands, &time, &mut windows, &mut state, &mut theme, &mut evts, &entities, &viewer_query, |tab_path| {
+        NotationApp::load_tab(&mut commands, &time, &mut windows, &mut state, &mut theme, &settings, &mut evts, &entities, &viewer_query, |tab_path| {
             NotationApp::load_tab_from_assets(&asset_server, &assets, tab_path)
         })
     }
-
     fn handle_keyboard_inputs(
         keyboard_input: Res<Input<KeyCode>>,
         egui_ctx: Res<EguiContext>,
diff --git a/crates/notation_bevy/src/bar/bar_view.rs b/crates/notation_bevy/src/bar/bar_view.rs
@@ -137,7 +137,7 @@ impl BarView {
                 commands,
                 assets,
                 bar_entity,
-                &bar.props.bar_ordinal.to_string(),
+                bar.props.bar_number.to_string().as_str(),
             );
         }
         bar_entity
diff --git a/crates/notation_bevy/src/guitar/guitar_view.rs b/crates/notation_bevy/src/guitar/guitar_view.rs
@@ -355,7 +355,7 @@ impl GuitarView {
             }
         } else {
             let position = TabState::get_position(&tab_state_query, None);
-            if position.is_some() && position.unwrap().bar.bar_ordinal == 0 {
+            if settings.add_ready_section && position.is_some() && position.unwrap().bar.bar_ordinal == 0 {
                 for (finger_entity, mut finger_data) in finger_query.iter_mut() {
                     finger_data.reset();
                     finger_data.update(&mut commands, &theme, finger_entity);
diff --git a/crates/notation_bevy/src/midi/midi_control.rs b/crates/notation_bevy/src/midi/midi_control.rs
@@ -6,10 +6,9 @@ use notation_model::play::play_control::TickResult;
 use notation_model::prelude::{JumpToBarEvent, PlayControlEvent, BarPosition, Tab, Units};
 use notation_model::tab_bar::TabBar;
 
-use crate::settings::layout_settings::LayoutMode;
 use crate::tab::tab_plugin::{TabPlugin};
 
-use crate::prelude::{NotationState, NotationSettings, NotationTheme};
+use crate::prelude::{NotationSettings};
 
 pub struct MidiControl();
 
@@ -236,7 +235,7 @@ impl MidiControl {
         play_control_evts: &mut EventWriter<PlayControlEvent>,
     ) {
         midi_state.play_control.begin_bar_ordinal = 0;
-        midi_state.play_control.end_bar_ordinal = midi_state.play_control.get_last_car_ordinal();
+        midi_state.play_control.end_bar_ordinal = midi_state.play_control.get_last_bar_ordinal();
         Self::send_begin_end_evt(midi_state, play_control_evts);
     }
     pub fn set_begin_bar_ordinal(
diff --git a/crates/notation_bevy/src/midi/mod.rs b/crates/notation_bevy/src/midi/mod.rs
@@ -48,13 +48,21 @@ impl TabPlugin {
 impl ControlPanel {
     pub fn play_control_ui(
         ui: &mut Ui,
+        state: &mut NotationState,
+        theme: &mut NotationTheme,
         settings: &mut NotationSettings,
         midi_state: &mut MidiState,
         play_control_evts: &mut EventWriter<PlayControlEvent>,
     ) {
         CollapsingHeader::new("Play Control")
             .default_open(true)
             .show(ui, |ui| {
+                let add_ready_section = settings.add_ready_section;
+                ui.checkbox(&mut settings.add_ready_section, "Add Empty Bar");
+                if add_ready_section != settings.add_ready_section {
+                    state.bars_range = None;
+                    Control::reload_tab(state, theme);
+                }
                 let play_title = if midi_state.play_control.play_state.is_playing() {
                     "Pause"
                 } else {
@@ -69,24 +77,26 @@ impl ControlPanel {
                             MidiControl::send_play_state_evt(midi_state, play_control_evts);
                         }
                     }
-                });
-                let should_loop = settings.should_loop;
-                ui.horizontal(|ui| {
+                    let should_loop = settings.should_loop;
                     ui.checkbox(&mut settings.should_loop, "Loop");
                     if should_loop != settings.should_loop {
                         MidiControl::sync_should_loop(settings, midi_state, play_control_evts)
                     }
+                });
+                let begin_bar_number = state.calc_bar_number(settings.add_ready_section, midi_state.play_control.begin_bar_ordinal);
+                let end_bar_number = state.calc_bar_number(settings.add_ready_section, midi_state.play_control.end_bar_ordinal);
+                ui.horizontal(|ui| {
                     if ui
                         .button(format!(
                             "Begin: {}",
-                            midi_state.play_control.begin_bar_ordinal
+                            begin_bar_number
                         ))
                         .clicked()
                     {
                         MidiControl::set_begin_bar_ordinal(midi_state, play_control_evts);
                     }
                     if ui
-                        .button(format!("End: {}", midi_state.play_control.end_bar_ordinal))
+                        .button(format!("End: {}", end_bar_number))
                         .clicked()
                     {
                         MidiControl::set_end_bar_ordinal(midi_state, play_control_evts);
@@ -95,6 +105,23 @@ impl ControlPanel {
                         MidiControl::clear_begin_end(midi_state, play_control_evts);
                     }
                 });
+                if let Some((begin, end)) = state.bars_range {
+                    let (begin, end) = if settings.add_ready_section {
+                        (begin, end)
+                    } else {
+                        (begin + 1, end + 1)
+                    };
+                    if ui.button(format!("Clear Visible Bars: {} - {}", begin, end)).clicked() {
+                        state.bars_range = None;
+                        Control::reload_tab(state, theme);
+                    }
+                } else if midi_state.play_control.has_selection(settings.add_ready_section) {
+                    let bars_range = (midi_state.play_control.begin_bar_ordinal, midi_state.play_control.end_bar_ordinal);
+                    if ui.button(format!("Set Visible Bars: {} - {}", begin_bar_number, end_bar_number)).clicked() {
+                        state.bars_range = Some(bars_range);
+                        Control::reload_tab(state, theme);
+                    }
+                }
                 ui.separator();
                 let mut speed_factor = settings.speed_factor;
                 ui.add(Slider::new(&mut speed_factor, 0.1..=2.0).text("Speed"));
diff --git a/crates/notation_bevy/src/mini/mini_bar.rs b/crates/notation_bevy/src/mini/mini_bar.rs
@@ -7,7 +7,7 @@ use notation_bevy_utils::prelude::{
     BevyUtil, GridCell, LayoutAnchor, LayoutChangedQuery, OutlineRectangle, ShapeOp, View,
     ViewBundle,
 };
-use notation_model::prelude::{PlayingState, Syllable, TabBar};
+use notation_model::prelude::{PlayingState, Syllable, TabBar, SectionKind};
 
 use crate::prelude::{BarData, BarPlaying, NotationAssets, NotationTheme};
 use crate::prelude::NotationLayout;
@@ -105,15 +105,15 @@ impl MiniBar {
         commands
             .entity(shape_entity)
             .insert(BarPlaying::new(bar, PlayingState::Idle));
-        if bar.props.bar_index == 0 && bar.props.section_ordinal > 0 {
+        if bar.props.bar_index == 0 && bar.section.kind != SectionKind::Ready {
             let section_separator_data =
                 MiniSectionSeparatorData::new(bar, MiniSectionSeparatorValue::new(0.0));
             section_separator_data.create(commands, theme, bar_entity);
             theme.texts.mini_map.spawn_bar_text(
                 commands,
                 assets,
                 shape_entity,
-                bar.props.bar_ordinal.to_string().as_str(),
+                bar.props.bar_number.to_string().as_str(),
             );
         }
         bar_entity
diff --git a/crates/notation_bevy/src/notation/app.rs b/crates/notation_bevy/src/notation/app.rs
@@ -222,6 +222,7 @@ impl NotationApp {
         windows: &mut Windows,
         state: &mut NotationState,
         theme: &mut NotationTheme,
+        settings: &NotationSettings,
         evts: &mut EventWriter<AddTabEvent>,
         entities_query: &Query<Entity, With<GlobalTransform>>,
         viewer_query: &Query<(Entity, &TabViewer), With<TabViewer>>,
@@ -274,7 +275,7 @@ impl NotationApp {
             }
             println!("\nload_tab(): Loading: {}", state.tab_path);
             if let Some(tab) = load_tab(state.tab_path.clone()) {
-                match Tab::try_parse_arc(tab) {
+                match Tab::try_parse_arc(tab, settings.add_ready_section, state.bars_range) {
                     Ok(tab) => {
                         state.tab = Some(tab.clone());
                         if let Some(window) = windows.get_primary_mut() {
diff --git a/crates/notation_bevy/src/notation/control.rs b/crates/notation_bevy/src/notation/control.rs
@@ -1,7 +1,6 @@
 use bevy::prelude::*;
 
 use crate::settings::layout_settings::LayoutMode;
-use crate::tab::tab_plugin::{TabPlugin};
 
 use crate::prelude::{NotationState, NotationSettings, NotationTheme};
 
diff --git a/crates/notation_bevy/src/notation/control_panel.rs b/crates/notation_bevy/src/notation/control_panel.rs
@@ -313,7 +313,7 @@ impl ControlPanel {
         ui: &mut Ui,
         pathes: &mut TabPathes,
         state: &mut NotationState,
-        _settings: &mut NotationSettings,
+        settings: &mut NotationSettings,
         theme: &mut NotationTheme,
     ) {
         if theme._bypass_systems {
@@ -322,6 +322,7 @@ impl ControlPanel {
         }
         ui.horizontal(|ui| {
             if ui.button("Reload Tab").clicked() {
+                state.bars_range = None;
                 Control::reload_tab(state, theme);
             }
             ui.separator();
@@ -643,6 +644,8 @@ impl ControlPanel {
                     {
                         Self::play_control_ui(
                             ui,
+                            &mut state,
+                            &mut theme,
                             &mut settings,
                             &mut midi_state,
                             &mut play_control_evts,
diff --git a/crates/notation_bevy/src/notation/state.rs b/crates/notation_bevy/src/notation/state.rs
@@ -13,6 +13,7 @@ pub struct NotationState {
     pub scale_factor_override: Option<f64>,
     pub tab_path: String,
     pub tab: Option<Arc<Tab>>,
+    pub bars_range: Option<(usize, usize)>,
     pub show_control: bool,
     pub show_kb: bool,
     pub parse_error: Option<ParseError>,
@@ -30,6 +31,7 @@ impl NotationState {
             scale_factor_override: None,
             tab_path,
             tab: None,
+            bars_range: None,
             show_control: false,
 
             #[cfg(debug_assertions)]
@@ -47,6 +49,7 @@ impl NotationState {
     pub fn change_tab(&mut self, theme: &mut NotationTheme, tab_path: String) {
         theme._bypass_systems = true;
         self.tab_path = tab_path;
+        self.bars_range = None;
         self.parse_error = None;
         self.reload_tab()
     }
@@ -61,6 +64,22 @@ impl NotationState {
             pos.y - self.window_height / 2.0,
         )
     }
+    pub fn calc_bar_number(&self, add_ready_section: bool, bar_ordinal: usize) -> usize {
+        if let Some((begin, _end)) = self.bars_range {
+            if add_ready_section {
+                if bar_ordinal > 0 {
+                    return bar_ordinal + begin - 1;
+                }
+            } else {
+                return bar_ordinal + begin + 1;
+            }
+        } else {
+            if !add_ready_section {
+                return bar_ordinal + 1;
+            }
+        }
+        bar_ordinal
+    }
 }
 
 impl FromWorld for NotationState {
diff --git a/crates/notation_bevy/src/settings/notation_settings.rs b/crates/notation_bevy/src/settings/notation_settings.rs
@@ -9,6 +9,7 @@ use super::layout_settings::LayoutSettings;
 #[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub struct NotationSettings {
     pub layout: LayoutSettings,
+    pub add_ready_section: bool,
     pub should_loop: bool,
     pub speed_factor: f32,
     pub hide_bar_number: bool,
@@ -37,6 +38,7 @@ impl Default for NotationSettings {
     fn default() -> Self {
         Self {
             layout: LayoutSettings::default(),
+            add_ready_section: true,
             should_loop: false,
             speed_factor: 1.0,
             hide_bar_number: false,
diff --git a/crates/notation_model/src/form.rs b/crates/notation_model/src/form.rs
@@ -12,16 +12,18 @@ impl Display for Form {
         write!(f, "<Form>(S:{})", self.sections.len())
     }
 }
-impl From<(notation_proto::prelude::Form, &Vec<Arc<Section>>)> for Form {
-    fn from(v: (notation_proto::prelude::Form, &Vec<Arc<Section>>)) -> Self {
+impl Form {
+    pub fn new(add_ready_section: bool, proto: notation_proto::prelude::Form, tab_section: &Vec<Arc<Section>>) -> Self {
         let mut sections = Vec::new();
         let mut add_section =
-            |section_id: String| match v.1.iter().find(|x| x.id == section_id).cloned() {
+            |section_id: String| match tab_section.iter().find(|x| x.id == section_id).cloned() {
                 Some(section) => sections.push(section),
-                None => println!("Form::from(), bad setion: {}", section_id),
+                None => println!("Form::from(), bad section: {}", section_id),
             };
-        add_section(notation_proto::prelude::Section::REST_ID.to_string());
-        for section_id in v.0.sections {
+        if add_ready_section {
+            add_section(notation_proto::prelude::Section::READY_ID.to_string());
+        }
+        for section_id in proto.sections {
             add_section(section_id);
         }
         Self { sections }
diff --git a/crates/notation_model/src/parse.rs b/crates/notation_model/src/parse.rs
diff --git a/crates/notation_model/src/play/play_control.rs b/crates/notation_model/src/play/play_control.rs
diff --git a/crates/notation_model/src/tab_bar.rs b/crates/notation_model/src/tab_bar.rs
diff --git a/crates/notation_proto/src/section.rs b/crates/notation_proto/src/section.rs
diff --git a/crates/notation_proto/src/tab.rs b/crates/notation_proto/src/tab.rs

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ impl BarView {`
`137`	`137`	`commands,`
`138`	`138`	`assets,`
`139`	`139`	`bar_entity,`
`140`		`- &bar.props.bar_ordinal.to_string(),`
	`140`	`+ bar.props.bar_number.to_string().as_str(),`
`141`	`141`	`);`
`142`	`142`	`}`
`143`	`143`	`bar_entity`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ impl GuitarView {`
`355`	`355`	`}`
`356`	`356`	`} else {`
`357`	`357`	`let position = TabState::get_position(&tab_state_query, None);`
`358`		`- if position.is_some() && position.unwrap().bar.bar_ordinal == 0 {`
	`358`	`+ if settings.add_ready_section && position.is_some() && position.unwrap().bar.bar_ordinal == 0 {`
`359`	`359`	`for (finger_entity, mut finger_data) in finger_query.iter_mut() {`
`360`	`360`	`finger_data.reset();`
`361`	`361`	`finger_data.update(&mut commands, &theme, finger_entity);`