gavindiaz/mtapi
1
0
Fork 0
mirror of https://github.com/vdemydiuk/mtapi.git synced 2026-08-17 04:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added field ExpertHandle into class Mt5Quote

Browse Source
This commit is contained in:
vdemydiuk
2018-03-19 15:09:02 +02:00
parent 486a1979a6
commit 95c55e90be
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MtApi5/Mt5Quote.cs
+11 -2
View File
@@ -1,16 +1,25 @@
namespace MtApi5 using MTApiService;
namespace MtApi5
{ {
public class Mt5Quote public class Mt5Quote
{ {
public string Instrument { get; } public string Instrument { get; }
public double Bid { get; } public double Bid { get; }
public double Ask { get; } public double Ask { get; }
public int ExpertHandle { get; set; }
public Mt5Quote(string instrument, double bid, double ask) private Mt5Quote(string instrument, double bid, double ask)
{ {
Instrument = instrument; Instrument = instrument;
Bid = bid; Bid = bid;
Ask = ask; Ask = ask;
} }
internal Mt5Quote(MtQuote quote)
:this(quote.Instrument, quote.Bid, quote.Ask)
{
ExpertHandle = quote.ExpertHandle;
}
} }
} }
MtApi5/MtApi5Client.cs
+4 -4
View File
@@ -82,7 +82,7 @@ namespace MtApi5
{ {
var client = Client; var client = Client;
var quotes = client?.GetQuotes(); var quotes = client?.GetQuotes();
return quotes?.Select(q => q.Convert()); return quotes?.Select(q => new Mt5Quote(q));
} }
///<summary> ///<summary>
@@ -3319,7 +3319,7 @@ namespace MtApi5
private void _client_QuoteUpdated(MtQuote quote) private void _client_QuoteUpdated(MtQuote quote)
{ {
if (quote == null) return; if (quote == null) return;
QuoteUpdate?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask))); QuoteUpdate?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote)));
QuoteUpdated?.Invoke(this, quote.Instrument, quote.Bid, quote.Ask); QuoteUpdated?.Invoke(this, quote.Instrument, quote.Bid, quote.Ask);
} }
@@ -3337,7 +3337,7 @@ namespace MtApi5
{ {
if (quote != null) if (quote != null)
{ {
QuoteRemoved?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask))); QuoteRemoved?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote)));
} }
} }
@@ -3345,7 +3345,7 @@ namespace MtApi5
{ {
if (quote != null) if (quote != null)
{ {
QuoteAdded?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask))); QuoteAdded?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote)));
} }
} }
MtApi5/MtConverters.cs
-4
View File
@@ -9,10 +9,6 @@ namespace MtApi5
private static readonly MtLog Log = LogConfigurator.GetLogger(typeof(MtConverters)); private static readonly MtLog Log = LogConfigurator.GetLogger(typeof(MtConverters));
#region Values Converters #region Values Converters
public static Mt5Quote Convert(this MtQuote quote)
{
return quote != null ? new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask) : null;
}
public static bool ParseResult(this string inputString, char separator, out double result) public static bool ParseResult(this string inputString, char separator, out double result)
{ {