SampleTradeOgre. Removed candles.

Author: mikasoukhov

Samples/TradeOgre/SampleTradeOgre/ChartWindow.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -129,9 +129,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ChartWindow.xaml.cs">
-      <DependentUpon>ChartWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
@@ -176,10 +173,6 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="ChartWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Samples/TradeOgre/SampleTradeOgre/ChartWindow.xaml.cs

@@ -127,9 +127,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ChartWindow.xaml.cs">
-      <DependentUpon>ChartWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
@@ -174,10 +171,6 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="ChartWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Samples/TradeOgre/SampleTradeOgre/SampleTradeOgre.csproj

@@ -127,9 +127,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ChartWindow.xaml.cs">
-      <DependentUpon>ChartWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
@@ -174,10 +171,6 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="ChartWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Samples/TradeOgre/SampleTradeOgre/SampleTradeOgreGitHub.csproj

@@ -23,8 +23,6 @@
 			<Button x:Name="NewStopOrder" Width="120" IsEnabled="False" Click="NewStopOrderClick">
 				<TextBlock><Run Text="{x:Static loc:LocalizedStrings.NewStopOrder}" />...</TextBlock>
 			</Button>
-			<Button x:Name="Candles" Content="{x:Static loc:LocalizedStrings.Candles}" Width="100" IsEnabled="False" Click="CandlesClick" />
-			<ComboBox x:Name="CandlesPeriods" Width="100" SelectionChanged="CandlesPeriods_SelectionChanged" />
 		</StackPanel>
 	</Grid>
 </Window>

Samples/TradeOgre/SampleTradeOgre/SampleTradeOgrePublic.csproj

@@ -25,9 +25,6 @@ public partial class SecuritiesWindow
 		public SecuritiesWindow()
 		{
 			InitializeComponent();
-
-			CandlesPeriods.ItemsSource = TradeOgreMessageAdapter.AllTimeFrames;
-			CandlesPeriods.SelectedIndex = 1;
 		}
 
 		protected override void OnClosed(EventArgs e)
@@ -51,8 +48,6 @@ protected override void OnClosed(EventArgs e)
 		private void SecurityPicker_OnSecuritySelected(Security security)
 		{
 			Quotes.IsEnabled = NewOrder.IsEnabled = NewStopOrder.IsEnabled = NewStopOrder.IsEnabled = Depth.IsEnabled = security != null;
-
-			TryEnableCandles();
 		}
 
 		private void NewOrderClick(object sender, RoutedEventArgs e)
@@ -88,27 +83,6 @@ private void NewStopOrderClick(object sender, RoutedEventArgs e)
 				MainWindow.Instance.Trader.RegisterOrder(newOrder.Order);
 		}
 
-		private void CandlesClick(object sender, RoutedEventArgs e)
-		{
-			foreach (var security in SecurityPicker.SelectedSecurities)
-			{
-				var tf = (TimeSpan)CandlesPeriods.SelectedItem;
-				var series = new CandleSeries(typeof(TimeFrameCandle), security, tf);
-
-				new ChartWindow(series, tf.Ticks == 1 ? DateTime.Today : DateTime.Now.Subtract(TimeSpan.FromTicks(tf.Ticks * 100))).Show();
-			}
-		}
-
-		private void CandlesPeriods_SelectionChanged(object sender, SelectionChangedEventArgs e)
-		{
-			TryEnableCandles();
-		}
-
-		private void TryEnableCandles()
-		{
-			Candles.IsEnabled = CandlesPeriods.SelectedItem != null && SecurityPicker.SelectedSecurity != null;
-		}
-
 		private void DepthClick(object sender, RoutedEventArgs e)
 		{
 			var trader = MainWindow.Instance.Trader;