Skip to content

Commit

Permalink
#403 Allow entering OSC value range (no persistence yet)
Browse files Browse the repository at this point in the history
  • Loading branch information
@helgoboss
helgoboss committed Apr 4, 2022
1 parent 7730e85 commit 2a16786
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 19 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions main/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ strum = "0.23"
strum_macros = "0.23"
metrics = "0.18.0"
metrics-exporter-prometheus = { version = "0.8.0", default-features = false }
# For parsing OSC argument value ranges
nom = "7.0.0"

[target.'cfg(windows)'.dependencies]
# For detecting the Windows version (to determine whether special charactes can be displayed)
Expand Down
2 changes: 1 addition & 1 deletion main/lib/helgoboss-learn
Submodule helgoboss-learn updated 1 files
+10 −0 src/source/osc_source.rs
10 changes: 10 additions & 0 deletions main/src/application/source_model.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@ impl SourceModel {
self.osc_arg_is_relative
}

pub fn osc_arg_value_range(&self) -> Interval<f64> {
self.osc_arg_value_range
}

pub fn osc_feedback_args(&self) -> &[String] {
&self.osc_feedback_args
}
Expand Down Expand Up @@ -681,6 +685,12 @@ impl SourceModel {
self.midi_source_type.supports_channel()
}

pub fn supports_osc_arg_value_range(&self) -> bool {
self.category == SourceCategory::Osc
&& self.osc_arg_index.is_some()
&& self.osc_arg_type_tag.supports_value_range()
}

pub fn display_count(&self) -> u8 {
self.display_type.display_count()
}
Expand Down
10 changes: 10 additions & 0 deletions main/src/application/target_model.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,10 @@ impl TargetModel {
self.osc_arg_type_tag
}

pub fn osc_arg_value_range(&self) -> Interval<f64> {
self.osc_arg_value_range
}

pub fn osc_dev_id(&self) -> Option<OscDeviceId> {
self.osc_dev_id
}
Expand Down Expand Up @@ -1936,6 +1940,12 @@ impl TargetModel {
self.supports_track_apart_from_type()
}

pub fn supports_osc_arg_value_range(&self) -> bool {
self.category == TargetCategory::Reaper
&& self.osc_arg_index.is_some()
&& self.osc_arg_type_tag.supports_value_range()
}

fn supports_track_apart_from_type(&self) -> bool {
match self.r#type {
ReaperTargetType::ClipTransport => {
Expand Down
134 changes: 116 additions & 18 deletions main/src/infrastructure/ui/mapping_panel.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ use rxrust::prelude::*;
use helgoboss_learn::{
check_mode_applicability, format_percentage_without_unit, AbsoluteMode, AbsoluteValue,
ButtonUsage, ControlValue, DetailedSourceCharacter, DisplayType, EncoderUsage, FeedbackType,
FireMode, GroupInteraction, MackieSevenSegmentDisplayScope, MidiClockTransportMessage,
ModeApplicabilityCheckInput, ModeParameter, OscTypeTag, OutOfRangeBehavior, PercentIo,
RgbColor, SoftSymmetricUnitValue, SourceCharacter, TakeoverMode, Target, UnitValue,
ValueSequence, VirtualColor,
FireMode, GroupInteraction, Interval, MackieSevenSegmentDisplayScope,
MidiClockTransportMessage, ModeApplicabilityCheckInput, ModeParameter, OscTypeTag,
OutOfRangeBehavior, PercentIo, RgbColor, SoftSymmetricUnitValue, SourceCharacter, TakeoverMode,
Target, UnitValue, ValueSequence, VirtualColor, DEFAULT_OSC_ARG_VALUE_RANGE,
};
use swell_ui::{
DialogUnits, MenuBar, Point, SharedView, SwellStringArg, View, ViewContext, WeakView, Window,
Expand Down Expand Up @@ -255,12 +255,14 @@ impl MappingPanel {
}
P::OscArgIndex => {
view.invalidate_source_line_4(initiator);
view.invalidate_source_line_5(initiator);
view.invalidate_mode_controls();
view.invalidate_help();
}
P::CustomCharacter |
P::OscArgTypeTag => {
view.invalidate_source_line_4_combo_box_2();
view.invalidate_source_line_5(initiator);
view.invalidate_mode_controls();
view.invalidate_help();
}
Expand Down Expand Up @@ -461,6 +463,7 @@ impl MappingPanel {
P::OscArgIndex |
P::OscArgTypeTag => {
view.invalidate_target_line_4(initiator);
view.invalidate_target_line_5(initiator);
view.invalidate_target_value_controls();
view.invalidate_mode_controls();
}
Expand Down Expand Up @@ -1467,6 +1470,23 @@ impl<'a> MutableMappingPanel<'a> {
};
}

fn handle_source_line_5_edit_control_change(&mut self) {
let edit_control_id = root::ID_SOURCE_LINE_5_EDIT_CONTROL;
let c = self.view.require_control(edit_control_id);
let text = c.text().unwrap_or_default();
use SourceCategory::*;
match self.mapping.source_model.category() {
Osc => {
let v = parse_osc_arg_value_range(&text);
self.change_mapping_with_initiator(
MappingCommand::ChangeSource(SourceCommand::SetOscArgValueRange(v)),
Some(edit_control_id),
);
}
_ => {}
};
}

#[allow(clippy::single_match)]
fn handle_source_line_3_edit_control_change(&mut self) {
let edit_control_id = root::ID_SOURCE_LINE_3_EDIT_CONTROL;
Expand Down Expand Up @@ -2754,6 +2774,25 @@ impl<'a> MutableMappingPanel<'a> {
}
}

fn handle_target_line_5_edit_control_change(&mut self) {
let edit_control_id = root::ID_TARGET_LINE_5_EDIT_CONTROL;
let control = self.view.require_control(edit_control_id);
match self.target_category() {
TargetCategory::Reaper => match self.reaper_target_type() {
ReaperTargetType::SendOsc => {
let text = control.text().unwrap_or_default();
let v = parse_osc_arg_value_range(&text);
self.change_mapping_with_initiator(
MappingCommand::ChangeTarget(TargetCommand::SetOscArgValueRange(v)),
Some(edit_control_id),
);
}
_ => {}
},
TargetCategory::Virtual => {}
}
}

fn target_category(&self) -> TargetCategory {
self.mapping.target_model.category()
}
Expand Down Expand Up @@ -3486,7 +3525,7 @@ impl<'a> ImmutableMappingPanel<'a> {
_ => None,
}
}
Osc => None,
Osc if self.source.supports_osc_arg_value_range() => Some("Range"),
_ => None,
};
self.view
Expand Down Expand Up @@ -3540,15 +3579,25 @@ impl<'a> ImmutableMappingPanel<'a> {
};
}

#[allow(clippy::single_match)]
fn invalidate_source_line_5_edit_control(&self, initiator: Option<u32>) {
if initiator == Some(root::ID_SOURCE_LINE_5_EDIT_CONTROL) {
return;
}
let control = self
.view
.require_control(root::ID_SOURCE_LINE_5_EDIT_CONTROL);
// TODO-high CONTINUE
control.hide();
use SourceCategory::*;
let text = match self.source.category() {
Osc if self.source.supports_osc_arg_value_range() => {
let text = format_osc_arg_value_range(
self.source.osc_arg_value_range(),
self.source.osc_arg_type_tag(),
);
Some(text)
}
_ => None,
};
self.view
.require_control(root::ID_SOURCE_LINE_5_EDIT_CONTROL)
.set_text_or_hide(text);
}

fn invalidate_source_line_3_combo_box_2(&self) {
Expand Down Expand Up @@ -4015,11 +4064,22 @@ impl<'a> ImmutableMappingPanel<'a> {
if initiator == Some(root::ID_TARGET_LINE_5_EDIT_CONTROL) {
return;
}
let control = self
.view
.require_control(root::ID_TARGET_LINE_5_EDIT_CONTROL);
// TODO-high CONTINUE
control.hide();
let text = match self.target_category() {
TargetCategory::Reaper => match self.reaper_target_type() {
ReaperTargetType::SendOsc if self.target.supports_osc_arg_value_range() => {
let text = format_osc_arg_value_range(
self.target.osc_arg_value_range(),
self.target.osc_arg_type_tag(),
);
Some(text)
}
_ => None,
},
TargetCategory::Virtual => None,
};
self.view
.require_control(root::ID_TARGET_LINE_5_EDIT_CONTROL)
.set_text_or_hide(text);
}

fn invalidate_target_line_4_edit_control(&self, initiator: Option<u32>) {
Expand Down Expand Up @@ -4147,9 +4207,18 @@ impl<'a> ImmutableMappingPanel<'a> {
}

fn invalidate_target_line_5_label_1(&self) {
let control = self.view.require_control(root::ID_TARGET_LINE_5_LABEL_1);
// TODO-high CONTINUE
control.hide();
let text = match self.target_category() {
TargetCategory::Reaper => match self.reaper_target_type() {
ReaperTargetType::SendOsc if self.target.supports_osc_arg_value_range() => {
Some("Range")
}
_ => None,
},
TargetCategory::Virtual => None,
};
self.view
.require_control(root::ID_TARGET_LINE_5_LABEL_1)
.set_text_or_hide(text);
}

fn invalidate_target_line_4_label_1(&self) {
Expand Down Expand Up @@ -5890,6 +5959,9 @@ impl View for MappingPanel {
root::ID_SOURCE_NUMBER_EDIT_CONTROL => {
view.write(|p| p.handle_source_line_4_edit_control_change());
}
root::ID_SOURCE_LINE_5_EDIT_CONTROL => {
view.write(|p| p.handle_source_line_5_edit_control_change());
}
root::ID_SOURCE_OSC_ADDRESS_PATTERN_EDIT_CONTROL => {
view.write(|p| p.handle_source_line_7_edit_control_change());
}
Expand All @@ -5913,6 +5985,9 @@ impl View for MappingPanel {
root::ID_TARGET_LINE_4_EDIT_CONTROL => {
view.write(|p| p.handle_target_line_4_edit_control_change())
}
root::ID_TARGET_LINE_5_EDIT_CONTROL => {
view.write(|p| p.handle_target_line_5_edit_control_change())
}
root::ID_TARGET_VALUE_EDIT_CONTROL => {
let value = view.clone().write(|p| {
p.get_value_from_target_edit_control(root::ID_TARGET_VALUE_EDIT_CONTROL)
Expand Down Expand Up @@ -6691,3 +6766,26 @@ fn extract_remaining_name(text: &str) -> &str {
text
}
}

fn format_osc_arg_value_range(range: Interval<f64>, type_tag: OscTypeTag) -> String {
if type_tag.is_discrete() {
format!("{:.0} - {:.0}", range.min_val(), range.max_val())
} else {
format!("{:.4} - {:.4}", range.min_val(), range.max_val())
}
}

fn parse_osc_arg_value_range(text: &str) -> Interval<f64> {
use nom::character::complete::space0;
use nom::number::complete::double;
use nom::sequence::separated_pair;
use nom::{character::complete::char, sequence::tuple, IResult};
fn parse_range(input: &str) -> IResult<&str, Interval<f64>> {
let mut parser = separated_pair(double, tuple((space0, char('-'), space0)), double);
let (remainder, (from, to)) = parser(input)?;
Ok((remainder, Interval::new_auto(from, to)))
}
parse_range(text)
.map(|r| r.1)
.unwrap_or(DEFAULT_OSC_ARG_VALUE_RANGE)
}
Binary file modified main/src/infrastructure/ui/msvc/msvc.rc
View file
Binary file not shown.

0 comments on commit 2a16786

Please sign in to comment.