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

Issue #93: Added event OnTradeTransaction. Udpated json.mqh to fix JSONNumber for correct serialization zero integer value".

Browse Source
This commit is contained in:
vdemydiuk
2018-03-01 11:20:25 +02:00
parent 0086b02bc8
commit ad6bad5187
13 changed files with 385 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestClients/MtApi5TestClient/ViewModel.cs
+10 -12
View File
@@ -174,6 +174,7 @@ namespace MtApi5TestClient
_mtApiClient.QuoteAdded += mMtApiClient_QuoteAdded;
_mtApiClient.QuoteRemoved += mMtApiClient_QuoteRemoved;
_mtApiClient.QuoteUpdated += mMtApiClient_QuoteUpdated;
_mtApiClient.OnTradeTransaction += mMtApiClient_OnTradeTransaction;
_quotesMap = new Dictionary<string, QuoteViewModel>();
@@ -554,14 +555,6 @@ namespace MtApi5TestClient
private async void ExecuteIndicatorCreate(object o)
{
//const string symbol = "EURUSD";
//const ENUM_TIMEFRAMES timeframe = ENUM_TIMEFRAMES.PERIOD_H1;
//const string name = @"Examples\c";
//int[] parameters = { 0, 21, (int)ENUM_APPLIED_PRICE.PRICE_CLOSE };
//var retVal = await Execute(() => _mtApiClient.iCustom(symbol, timeframe, name, parameters));
//AddLog($"Custom Moving Average: result - {retVal}");
var parameters = new List<MqlParam>
{
new MqlParam
@@ -586,10 +579,10 @@ namespace MtApi5TestClient
}
};
const string symbol = "EURUSD";
const ENUM_TIMEFRAMES timeframe = ENUM_TIMEFRAMES.PERIOD_H1;
const ENUM_INDICATOR indicatorType = ENUM_INDICATOR.IND_MACD;
var retVal = await Execute(() => _mtApiClient.IndicatorCreate(symbol, timeframe, indicatorType, parameters));
var retVal = await Execute(() =>
_mtApiClient.IndicatorCreate(TimeSeriesValues.SymbolValue,
TimeSeriesValues.TimeFrame, TimeSeriesValues.IndicatorType, parameters));
TimeSeriesValues.IndicatorHandle = retVal;
AddLog($"IndicatorCreate [IND_MA]: result - {retVal}");
}
@@ -1016,6 +1009,11 @@ namespace MtApi5TestClient
}
}
private void mMtApiClient_OnTradeTransaction(object sender, Mt5TradeTransactionEventArgs e)
{
AddLog($"OnTradeTransaction: ExpertHandle = {e.ExpertHandle}.{Environment.NewLine}Transaction = {e.Trans}.{Environment.NewLine}Request = {e.Request}.{Environment.NewLine}Result = {e.Result}.");
}
private void AddQuote(Mt5Quote quote)
{
if (quote == null)