Skip to content

Commit 8bc935e

Browse files
committed
SampleFxcm. Removed MarketDepth requests.
1 parent 09282b9 commit 8bc935e

File tree

2 files changed

+64
-68
lines changed

2 files changed

+64
-68
lines changed

Samples/Fxcm/SampleFxcm/SecuritiesWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<TextBlock><Run Text="{x:Static loc:LocalizedStrings.Find}" />...</TextBlock>
1818
</Button>-->
1919
<Button x:Name="Level1" Content="Level1" Width="100" IsEnabled="False" Click="Level1Click" />
20-
<Button x:Name="Depth" Width="100" IsEnabled="False" Click="DepthClick">
20+
<!--<Button x:Name="Depth" Width="100" IsEnabled="False" Click="DepthClick">
2121
<TextBlock><Run Text="{x:Static loc:LocalizedStrings.MarketDepth}" />...</TextBlock>
22-
</Button>
22+
</Button>-->
2323
<Button x:Name="NewOrder" Width="100" IsEnabled="False" Click="NewOrderClick">
2424
<TextBlock><Run Text="{x:Static loc:LocalizedStrings.NewOrder}" />...</TextBlock>
2525
</Button>

Samples/Fxcm/SampleFxcm/SecuritiesWindow.xaml.cs

Lines changed: 62 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,19 @@ namespace SampleFxcm
1919
using System.Linq;
2020
using System.Windows;
2121
using System.Windows.Controls;
22-
23-
using Ecng.Collections;
24-
using Ecng.Xaml;
2522

26-
using MoreLinq;
23+
using Ecng.Xaml;
2724

2825
using StockSharp.Algo.Candles;
2926
using StockSharp.BusinessEntities;
3027
using StockSharp.Fxcm;
3128
using StockSharp.Messages;
3229
using StockSharp.Xaml;
33-
using StockSharp.Localization;
3430

3531
public partial class SecuritiesWindow
3632
{
37-
private readonly SynchronizedDictionary<Security, QuotesWindow> _quotesWindows = new SynchronizedDictionary<Security, QuotesWindow>();
38-
private bool _initialized;
33+
//private readonly SynchronizedDictionary<Security, QuotesWindow> _quotesWindows = new SynchronizedDictionary<Security, QuotesWindow>();
34+
//private bool _initialized;
3935

4036
public SecuritiesWindow()
4137
{
@@ -45,27 +41,27 @@ public SecuritiesWindow()
4541
CandlesPeriods.SelectedIndex = 1;
4642
}
4743

48-
protected override void OnClosed(EventArgs e)
49-
{
50-
_quotesWindows.SyncDo(d => d.Values.ForEach(w =>
51-
{
52-
w.DeleteHideable();
53-
w.Close();
54-
}));
55-
56-
var trader = MainWindow.Instance.Trader;
57-
if (trader != null)
58-
{
59-
if (_initialized)
60-
trader.MarketDepthChanged -= TraderOnMarketDepthChanged;
61-
}
62-
63-
base.OnClosed(e);
64-
}
44+
//protected override void OnClosed(EventArgs e)
45+
//{
46+
// _quotesWindows.SyncDo(d => d.Values.ForEach(w =>
47+
// {
48+
// w.DeleteHideable();
49+
// w.Close();
50+
// }));
51+
52+
// var trader = MainWindow.Instance.Trader;
53+
// if (trader != null)
54+
// {
55+
// if (_initialized)
56+
// trader.MarketDepthChanged -= TraderOnMarketDepthChanged;
57+
// }
58+
59+
// base.OnClosed(e);
60+
//}
6561

6662
private void SecurityPicker_OnSecuritySelected(Security security)
6763
{
68-
Level1.IsEnabled = NewStopOrder.IsEnabled = NewOrder.IsEnabled = Depth.IsEnabled = security != null;
64+
Level1.IsEnabled = NewStopOrder.IsEnabled = NewOrder.IsEnabled = /*Depth.IsEnabled =*/ security != null;
6965
TryEnableCandles();
7066
}
7167

@@ -102,41 +98,41 @@ private void NewStopOrderClick(object sender, RoutedEventArgs e)
10298
MainWindow.Instance.Trader.RegisterOrder(newOrder.Order);
10399
}
104100

105-
private void DepthClick(object sender, RoutedEventArgs e)
106-
{
107-
var trader = MainWindow.Instance.Trader;
108-
109-
foreach (var security in SecurityPicker.SelectedSecurities)
110-
{
111-
var window = _quotesWindows.SafeAdd(security, s =>
112-
{
113-
// subscribe on order book flow
114-
//trader.RegisterMarketDepth(security);
115-
116-
// create order book window
117-
var wnd = new QuotesWindow
118-
{
119-
Title = security.Id + " " + LocalizedStrings.MarketDepth
120-
};
121-
wnd.MakeHideable();
122-
return wnd;
123-
});
124-
125-
if (window.Visibility == Visibility.Visible)
126-
window.Hide();
127-
else
128-
{
129-
window.Show();
130-
window.DepthCtrl.UpdateDepth(trader.GetMarketDepth(security));
131-
}
132-
133-
if (!_initialized)
134-
{
135-
trader.MarketDepthChanged += TraderOnMarketDepthChanged;
136-
_initialized = true;
137-
}
138-
}
139-
}
101+
//private void DepthClick(object sender, RoutedEventArgs e)
102+
//{
103+
// var trader = MainWindow.Instance.Trader;
104+
105+
// foreach (var security in SecurityPicker.SelectedSecurities)
106+
// {
107+
// var window = _quotesWindows.SafeAdd(security, s =>
108+
// {
109+
// // subscribe on order book flow
110+
// //trader.RegisterMarketDepth(security);
111+
112+
// // create order book window
113+
// var wnd = new QuotesWindow
114+
// {
115+
// Title = security.Id + " " + LocalizedStrings.MarketDepth
116+
// };
117+
// wnd.MakeHideable();
118+
// return wnd;
119+
// });
120+
121+
// if (window.Visibility == Visibility.Visible)
122+
// window.Hide();
123+
// else
124+
// {
125+
// window.Show();
126+
// window.DepthCtrl.UpdateDepth(trader.GetMarketDepth(security));
127+
// }
128+
129+
// if (!_initialized)
130+
// {
131+
// trader.MarketDepthChanged += TraderOnMarketDepthChanged;
132+
// _initialized = true;
133+
// }
134+
// }
135+
//}
140136

141137
private void Level1Click(object sender, RoutedEventArgs e)
142138
{
@@ -151,13 +147,13 @@ private void Level1Click(object sender, RoutedEventArgs e)
151147
}
152148
}
153149

154-
private void TraderOnMarketDepthChanged(MarketDepth depth)
155-
{
156-
var wnd = _quotesWindows.TryGetValue(depth.Security);
150+
//private void TraderOnMarketDepthChanged(MarketDepth depth)
151+
//{
152+
// var wnd = _quotesWindows.TryGetValue(depth.Security);
157153

158-
if (wnd != null)
159-
wnd.DepthCtrl.UpdateDepth(depth);
160-
}
154+
// if (wnd != null)
155+
// wnd.DepthCtrl.UpdateDepth(depth);
156+
//}
161157

162158
//private void FindClick(object sender, RoutedEventArgs e)
163159
//{

0 commit comments

Comments
 (0)