Spark builds. Now for the runtime errors

This commit is contained in:
Eric Harding committed 2017-08-24 16:22:10 -04:00
1 parent 666d04109b
commit efa448e596
7 files changed
+8 -181

No files matched your search

+7 -2
View File
@@ -4,13 +4,17 @@
<Authors>Blue Trading Systems</Authors>
<Company>Blue Trading Systems</Company>
<Product>Spark</Product>
<Description />
<Description>The game has changed. Make your Move.</Description>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Configurations>Debug;Release</Configurations>
<Platforms>x64</Platforms>
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
<PlatformTarget>AnyCPU</PlatformTarget>
<LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
<ApplicationIcon />
<OutputType>WinExe</OutputType>
<StartupObject />
<RootNamespace>bts</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../spark_api/spark_api.csproj" />
@@ -34,7 +38,8 @@
<PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
</ItemGroup>
<ItemGroup>
<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
<ApplicationDefinition Include="App.xaml" Generator="MSBuild:Compile" />
<Page Include="**\*.xaml" Exclude="App.xaml" SubType="Designer" Generator="MSBuild:Compile" />
<Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />
<Proto3 Include="uicore\Settings\UISettings.proto" />
</ItemGroup>
-2
View File
@@ -441,8 +441,6 @@
<TextBlock Text="{Binding Key}" Margin="4,6,4,4" />
</HierarchicalDataTemplate>
<shell:ShellModuleDataTemplateSelector x:Key="ShellModuleDataTemplateSelector" LaunchWithDeleteItemTemplate="{StaticResource ShellLaunchWithDeleteItemTemplate}" GroupItemTemplate="{StaticResource ShellHierarchicalGroupItemTemplate}"/>
<Style TargetType="{x:Type control:BTSListBoxItem}">
<Setter Property="Template">
<Setter.Value>
@@ -60,15 +60,4 @@
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ExpirationFilter" TargetType="control:MultiSelectDropDown" BasedOn="{StaticResource {x:Type control:MultiSelectDropDown}}">
<Setter Property="ItemTemplate">
<Setter.Value>
<DataTemplate>
<control:ExpirationLabel Security="{Binding security}" ExpDate="{Binding expiration}" />
</DataTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
@@ -21,8 +21,6 @@
<cv:CellPathConverter x:Key="CellPathConverter" />
<cv:CellKeyConverter x:Key="CellKeyConverter" />
<cv:SecurityDisplayTextConverter x:Key="SecurityTextConverter" ShowType="True" />
<cv:ExpirationDisplayTextConverter x:Key="ExpirationTextConverter" ShowType="False" ShowSymbol="True" MapExp="True" />
<cv:ExpirationDisplayTextConverter x:Key="ExpirationTypeTextConverter" ShowType="True" ShowSymbol="True" MapExp="True" />
<cv:SecurityTypeForegroundConverter x:Key="SecurityTypeForegroundConverter" />
<cv:SecurityTypeStringConverter x:Key="SecurityTypeStringConverter" />
<cv:NumericSignBrushConverter x:Key="NumericSignBrushConverter" />
@@ -1,133 +0,0 @@
<Window x:Class="mbts.ui.shell.EndOfDayPnLRolloverView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:converters="clr-namespace:mbts.ui.converters"
xmlns:controls="clr-namespace:mbts.ui.controls"
xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
Title="PnL Rollover"
SizeToContent="WidthAndHeight"
MaxWidth="500"
Style="{StaticResource BTSWindow}"
mc:Ignorable="d">
<Window.Resources>
<converters:CountToVisibilityConverter x:Key="count_vis_converter" VisibilityForZero="Collapsed" VisibilityForGreaterThanZero="Visible" />
<converters:BooleanToFontWeightConverter x:Key="font_weight_converter" />
<converters:SecurityTupleToInstrumentTypeFormattedStringConverter x:Key="sec_tup_converter" IncludeSecurityTypeForFutures="True" />
<converters:NanBackConverter x:Key="NanConverter" />
<CollectionViewSource x:Key="sorted_symbols_with_positions" Source="{Binding Path=symbols_with_positions}">
<CollectionViewSource.SortDescriptions>
<scm:SortDescription PropertyName="security_name"/>
</CollectionViewSource.SortDescriptions>
</CollectionViewSource>
<CollectionViewSource x:Key="sorted_driver_settlement_prices" Source="{Binding Path=driver_settlement_prices}">
<CollectionViewSource.SortDescriptions>
<scm:SortDescription PropertyName="symbol"/>
<scm:SortDescription PropertyName="expiration"/>
</CollectionViewSource.SortDescriptions>
</CollectionViewSource>
<!-- nothing using TickViewOnly at the moment -->
<Style TargetType="{x:Type controls:TickEntryControl}" x:Key="TickViewOnly" BasedOn="{StaticResource {x:Type controls:TickEntryControl}}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:TickEntryControl}">
<TextBox x:Name="_text" IsEnabled="False" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</Window.Resources>
<Border Padding="10">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<DataGrid Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0,10" RowHeaderWidth="0" ItemsSource="{Binding Source={StaticResource sorted_driver_settlement_prices}}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" SelectionUnit="FullRow" MaxHeight="300">
<DataGrid.Columns>
<DataGridTemplateColumn Header="Driver" Width="*">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<controls:ExpirationLabel Security="{Binding backing_security}" ExpDate="{Binding expiration}" ShowSymbol="True" HorizontalAlignment="Center" Padding="5" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Settlement" Width="*" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<controls:TickEntryControl Value="{Binding settlement_price, UpdateSourceTrigger=PropertyChanged}" Symbols="{Binding backing_security_as_enumerable}" TickType="Theo" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
<GroupBox Grid.Row="1" Margin="0,16,0,0" Padding="4">
<GroupBox.Header>
<StackPanel Orientation="Horizontal">
<TextBlock FontWeight="Bold">Symbols</TextBlock>
<controls:HelpButton ManPage="Admin-PnL-Rollover#symbols"></controls:HelpButton>
</StackPanel>
</GroupBox.Header>
<!-- This listbox will be populated top-to-bottom left-to-right as a result of the layout transforms -->
<ListBox VerticalAlignment="Top" Margin="0,10" ItemsSource="{Binding Source={StaticResource sorted_symbols_with_positions}}" SnapsToDevicePixels="True" UseLayoutRounding="True">
<ListBox.Resources>
<Style TargetType="ListBoxItem">
<Setter Property="LayoutTransform">
<Setter.Value>
<TransformGroup>
<RotateTransform Angle="-90" />
<ScaleTransform ScaleY="-1" />
</TransformGroup>
</Setter.Value>
</Setter>
</Style>
</ListBox.Resources>
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid IsItemsHost="True">
<UniformGrid.LayoutTransform>
<TransformGroup>
<RotateTransform Angle="90" />
<ScaleTransform ScaleX="-1" />
</TransformGroup>
</UniformGrid.LayoutTransform>
</UniformGrid>
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding Path=has_position}" >
<TextBlock Text="{Binding Path=backing_security_tuple, Converter={StaticResource sec_tup_converter}, Mode=OneTime}" FontWeight="{Binding has_position, Converter={StaticResource font_weight_converter}, Mode=OneTime}"/>
</CheckBox>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</GroupBox>
<TextBlock Grid.Row="2" VerticalAlignment="Center" Foreground="Red" TextWrapping="Wrap" Margin="0,10"
Visibility="{Binding Path=unexpired_expirations.Count, Converter={StaticResource count_vis_converter}}"
Text="You have expiring positions today. Please be sure to Expire them before rolling."/>
<controls:HelpButton Grid.Row="2" ManPage="Admin-PnL-Rollover#expiration" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,8,0"
Visibility="{Binding Path=unexpired_expirations.Count, Converter={StaticResource count_vis_converter}}"/>
<CheckBox Grid.Row="3" Content="I have already gone through expiration, enable rollover" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,10" Visibility="{Binding Path=unexpired_expirations.Count, Converter={StaticResource count_vis_converter}}" IsChecked="{Binding Path=is_rollover_with_unexpired_override_enabled}"/>
<Grid Grid.Row ="4" Margin="0,10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Button Grid.Column="0" Content="Roll Over" HorizontalAlignment="Center" VerticalAlignment="Center" Padding="5" Command="{Binding rollover_command}"/>
<Button Grid.Column="1" Content="Roll Back" HorizontalAlignment="Center" VerticalAlignment="Center" Padding="5" Command="{Binding rollback_command}"/>
</Grid>
</Grid>
</Border>
</Window>
@@ -1,30 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
namespace mbts.ui.shell
{
public partial class EndOfDayPnLRolloverView : Window
{
public EndOfDayPnLRolloverView(object vm)
{
DataContext = vm;
InitializeComponent();
}
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
IDisposable context = DataContext as IDisposable;
if (context != null)
{
context.Dispose();
}
DataContext = null;
}
}
}
+1 -1
View File
@@ -16,7 +16,7 @@
<ItemGroup>
<Proto3 Include="../../lib/sparkproto/SparkProtos.proto" />
<Proto2 Include="../../server/sparkd/md/protos/co2.proto" />
<Proto2 Include="../../lib/md/protos/co2.proto" />
</ItemGroup>
</Project>