gavindiaz/mtapi
1
0
Fork 0
mirror of https://github.com/vdemydiuk/mtapi.git synced 2026-08-16 12:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #290: provide information about Period (Timeframe) in event Mt5TimeBar

Browse Source
This commit is contained in:
Viacheslav Demydiuk
2026-04-06 21:55:59 +03:00
parent 9d178280d0
commit 3699b73cf7
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MtApi5/Mt5TimeBarArgs.cs
+3 -1
View File
@@ -4,15 +4,17 @@ namespace MtApi5
{ {
public class Mt5TimeBarArgs: EventArgs public class Mt5TimeBarArgs: EventArgs
{ {
internal Mt5TimeBarArgs(int expertHandle, string symbol, MqlRates rates) internal Mt5TimeBarArgs(int expertHandle, string symbol, ENUM_TIMEFRAMES timeframe, MqlRates rates)
{ {
ExpertHandle = expertHandle; ExpertHandle = expertHandle;
Rates = rates; Rates = rates;
Symbol = symbol; Symbol = symbol;
Timeframe = timeframe;
} }
public int ExpertHandle { get; } public int ExpertHandle { get; }
public string Symbol { get; } public string Symbol { get; }
public ENUM_TIMEFRAMES Timeframe { get; }
public MqlRates Rates { get; } public MqlRates Rates { get; }
} }
} }
MtApi5/MtApi5Client.cs
+1 -1
View File
@@ -3546,7 +3546,7 @@ namespace MtApi5
var e = JsonConvert.DeserializeObject<OnLastTimeBarEvent>(payload); var e = JsonConvert.DeserializeObject<OnLastTimeBarEvent>(payload);
if (e == null || string.IsNullOrEmpty(e.Instrument) || e.Rates == null) if (e == null || string.IsNullOrEmpty(e.Instrument) || e.Rates == null)
return; return;
OnLastTimeBar?.Invoke(this, new Mt5TimeBarArgs(expertHandle, e.Instrument, e.Rates)); OnLastTimeBar?.Invoke(this, new Mt5TimeBarArgs(expertHandle, e.Instrument, e.Timeframe, e.Rates));
} }
private void ReceivedOnLockTicksEvent(int expertHandle, string payload) private void ReceivedOnLockTicksEvent(int expertHandle, string payload)
MtApi5/MtProtocol/OnLastTimeBarEvent.cs
+1
View File
@@ -4,6 +4,7 @@
{ {
public MqlRates? Rates { get; set; } public MqlRates? Rates { get; set; }
public string? Instrument { get; set; } public string? Instrument { get; set; }
public ENUM_TIMEFRAMES Timeframe { get; set; }
public int ExpertHandle { get; set; } public int ExpertHandle { get; set; }
} }
} }
TestClients/MtApi5TestClient/ViewModel.cs
+1 -1
View File
@@ -1873,7 +1873,7 @@ namespace MtApi5TestClient
private void _mtApiClient_OnLastTimeBar(object sender, Mt5TimeBarArgs e) private void _mtApiClient_OnLastTimeBar(object sender, Mt5TimeBarArgs e)
{ {
AddLog($"OnLastTimeBarEvent: ExpertHandle = {e.ExpertHandle}, Symbol = {e.Symbol}, open = {e.Rates.open}, close = {e.Rates.close}, time = {e.Rates.time}, high = {e.Rates.high}, low = {e.Rates.low}"); AddLog($"OnLastTimeBarEvent: ExpertHandle = {e.ExpertHandle}, Symbol = {e.Symbol}, Timeframe = {e.Timeframe}, open = {e.Rates.open}, close = {e.Rates.close}, time = {e.Rates.time}, high = {e.Rates.high}, low = {e.Rates.low}");
} }
private void _mtApiClient_OnLockTicks(object sender, Mt5LockTicksEventArgs e) private void _mtApiClient_OnLockTicks(object sender, Mt5LockTicksEventArgs e)