Ladder/Ticket/Studio - display DynamicOrder template param names in 'Title Case'
This commit is contained in:
1 parent
404b5a9146
commit
dc920f18c3
2 files changed
+36
-32
No files matched your search
@@ -3,6 +3,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:ord="clr-namespace:bts.api.orderman;assembly=spark_api"
|
||||
xmlns:u="clr-namespace:mbts.ui"
|
||||
xmlns:ut="clr-namespace:mbts.ui.utilities"
|
||||
xmlns:c="clr-namespace:mbts.ui.controls"
|
||||
xmlns:usp="clr-namespace:mbts.ui.spark"
|
||||
xmlns:uag="clr-namespace:mbts.ui.spark.algo"
|
||||
@@ -177,7 +178,7 @@
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush1}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<CheckBox Grid.ColumnSpan="3" VerticalAlignment="Center" IsEnabled="{Binding can_edit_values}" IsChecked="{Binding detach_on_toward}">Detach on Toward</CheckBox>
|
||||
@@ -279,8 +280,6 @@
|
||||
<DataTemplate>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush3}}"/>
|
||||
<RowDefinition Height="*"/>
|
||||
@@ -355,9 +354,9 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush3}}"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush3}}"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -656,12 +655,10 @@
|
||||
</usp:AlgoContentTemplateSelector.SpreaderTemplate>
|
||||
<usp:AlgoContentTemplateSelector.DynamicOrderTemplate>
|
||||
<DataTemplate>
|
||||
<Grid Grid.IsSharedSizeScope="True" >
|
||||
<Grid Grid.IsSharedSizeScope="True">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}" />
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}" />
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush3}}"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -680,7 +677,7 @@
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding descriptor.ParamName}"/>
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding descriptor.ParamName, Converter={x:Static ut:DisplayNameHelper.SnakeToTitleCaseConverter}}"/>
|
||||
<CheckBox HorizontalAlignment="Stretch" Grid.Column="2" IsChecked="{Binding value, UpdateSourceTrigger=PropertyChanged}" />
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
@@ -693,7 +690,7 @@
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding descriptor.ParamName}"/>
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding descriptor.ParamName, Converter={x:Static ut:DisplayNameHelper.SnakeToTitleCaseConverter}}"/>
|
||||
<c:TickUpDownDouble Grid.Column="2" Value="{Binding value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
@@ -706,7 +703,7 @@
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding descriptor.ParamName}"/>
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding descriptor.ParamName, Converter={x:Static ut:DisplayNameHelper.SnakeToTitleCaseConverter}}"/>
|
||||
<c:TickUpDownInt Grid.Column="2" Value="{Binding value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
@@ -719,7 +716,7 @@
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding descriptor.ParamName}"/>
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding descriptor.ParamName, Converter={x:Static ut:DisplayNameHelper.SnakeToTitleCaseConverter}}"/>
|
||||
<c:TickUpDownUInt Grid.Column="2" Value="{Binding value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
@@ -732,7 +729,7 @@
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding descriptor.ParamName}"/>
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding descriptor.ParamName, Converter={x:Static ut:DisplayNameHelper.SnakeToTitleCaseConverter}}"/>
|
||||
<TextBox HorizontalAlignment="Stretch" Grid.Column="2" Text="{Binding value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
@@ -745,7 +742,7 @@
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding descriptor.ParamName}"/>
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding descriptor.ParamName, Converter={x:Static ut:DisplayNameHelper.SnakeToTitleCaseConverter}}"/>
|
||||
<ComboBox Grid.Column="2" ItemsSource="{Binding descriptor.ParamType.Enumerated.Element}" SelectedItem="{Binding value}" />
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
@@ -766,15 +763,6 @@
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
<!--<uag:AlgoPickerNodeView
|
||||
Grid.Row="2"
|
||||
Grid.ColumnSpan="3"
|
||||
ItemsSource="{Binding child_algo_vm.child_order_types}"
|
||||
SelectedItem="{Binding child_algo_vm.child_order}"
|
||||
ContentTemplateSelector="{DynamicResource AlgoTemplateSelector}"
|
||||
OrderKind="{x:Static usp:AlgoContentTemplateSelector.ChildKind}"
|
||||
OrderKindTemplate="{StaticResource OrderKindTemplate}"
|
||||
/>-->
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</usp:AlgoContentTemplateSelector.DynamicOrderTemplate>
|
||||
|
||||
@@ -17,18 +17,34 @@ namespace mbts.ui.utilities {
|
||||
}
|
||||
|
||||
static class DisplayNameHelper {
|
||||
public static IValueConverter CamelCaseSpacesConverter =
|
||||
new AnonymousValueConverter(obj => obj == null ? string.Empty : _insert_spaces_to_camel_case(obj.ToString()));
|
||||
public static IValueConverter
|
||||
CamelCaseSpacesConverter = ValueConverter.create(obj => _insert_spaces_to_camel_case(obj?.ToString())),
|
||||
SnakeToTitleCaseConverter = ValueConverter.create(obj => snake_to_title_case(obj?.ToString()));
|
||||
|
||||
// Adds spaces to CamelCase => "Camel Case"
|
||||
public static string camel_to_title_case(string name, TextCapitalizationFormat capitalization_format = TextCapitalizationFormat.Default) {
|
||||
string with_spaces = _insert_spaces_to_camel_case(name);
|
||||
switch (capitalization_format) {
|
||||
case TextCapitalizationFormat.FirstLetterFirstWord: return Regex.Replace(with_spaces, @"\b \b\w(?![A-Z])", m => _first_letter_lower_case(m.Value));
|
||||
case TextCapitalizationFormat.FirstLetterEveryWord: return Regex.Replace(with_spaces, @"\b\w(?![A-Z])", m => _first_letter_lower_case(m.Value));
|
||||
case TextCapitalizationFormat.Default:
|
||||
default: return with_spaces;
|
||||
if (name != null) {
|
||||
string with_spaces = _insert_spaces_to_camel_case(name);
|
||||
switch (capitalization_format) {
|
||||
case TextCapitalizationFormat.FirstLetterFirstWord: return Regex.Replace(with_spaces, @"\b \b\w(?![A-Z])", m => _first_letter_lower_case(m.Value));
|
||||
case TextCapitalizationFormat.FirstLetterEveryWord: return Regex.Replace(with_spaces, @"\b\w(?![A-Z])", m => _first_letter_lower_case(m.Value));
|
||||
case TextCapitalizationFormat.Default:
|
||||
default: return with_spaces;
|
||||
}
|
||||
}
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
public static string snake_to_title_case(string name) {
|
||||
if (name != null) {
|
||||
var m = Regex.Match(name, @"[A-Za-z1-9_\-]*");
|
||||
if (m.Success) {
|
||||
name = Regex.Replace(m.Value, @"(_|-)*(.*)", "$+");
|
||||
name = name.Replace('_', ' ');
|
||||
return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(name);
|
||||
}
|
||||
}
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
public static int compare_alpha_numeric(string a, string b) {
|
||||
|
||||
Reference in new issue
Block a user