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

Added field Swap to MtOrder class. Mark function OrderSwap as obsolete

Browse Source
This commit is contained in:
DW
2016-04-29 19:31:35 +03:00
parent 36965bd02c
commit 4511a64a39
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MtApi/MtApiClient.cs
+6 -5
View File
@@ -211,6 +211,12 @@ namespace MtApi
return (TradeOperation)retVal; return (TradeOperation)retVal;
} }
[Obsolete("OrderSwap is deprecated, please use GetOrder instead.")]
public double OrderSwap()
{
return SendCommand<double>(MtCommandType.OrderSwap, null);
}
#endregion #endregion
#region Trading functions #region Trading functions
@@ -440,11 +446,6 @@ namespace MtApi
return SendCommand<int>(MtCommandType.OrdersTotal, null); return SendCommand<int>(MtCommandType.OrdersTotal, null);
} }
public double OrderSwap()
{
return SendCommand<double>(MtCommandType.OrderSwap, null);
}
public bool OrderCloseAll() public bool OrderCloseAll()
{ {
return SendCommand<bool>(MtCommandType.OrderCloseAll, null); return SendCommand<bool>(MtCommandType.OrderCloseAll, null);
MtApi/MtOrder.cs
+1
View File
@@ -16,6 +16,7 @@ namespace MtApi
public string Comment { get; set; } public string Comment { get; set; }
public double Commission { get; set; } public double Commission { get; set; }
public int MagicNumber { get; set; } public int MagicNumber { get; set; }
public double Swap { get; set; }
public DateTime OpenTime public DateTime OpenTime
{ {
TestApiClientUI/Form1.cs
+4 -4
View File
@@ -875,8 +875,8 @@ namespace TestApiClientUI
{ {
var result = var result =
string.Format( string.Format(
"Order: Ticket = {0}, Symbol = {1}, Operation = {2}, OpenPrice = {3}, ClosePrice = {4}, Lots = {5}, Profit = {6}, Comment = {7}, Commission = {8}, MagicNumber = {9}, OpenTime = {10}, CloseTime = {11}", "Order: Ticket = {0}, Symbol = {1}, Operation = {2}, OpenPrice = {3}, ClosePrice = {4}, Lots = {5}, Profit = {6}, Comment = {7}, Commission = {8}, MagicNumber = {9}, OpenTime = {10}, CloseTime = {11}, Swap = {12}",
order.Ticket, order.Symbol, order.Operation, order.OpenPrice, order.ClosePrice, order.Lots, order.Profit, order.Comment, order.Commission, order.MagicNumber, order.OpenTime, order.CloseTime); order.Ticket, order.Symbol, order.Operation, order.OpenPrice, order.ClosePrice, order.Lots, order.Profit, order.Comment, order.Commission, order.MagicNumber, order.OpenTime, order.CloseTime, order.Swap);
AddToLog(result); AddToLog(result);
} }
} }
@@ -895,8 +895,8 @@ namespace TestApiClientUI
{ {
var result = var result =
string.Format( string.Format(
"Order: Ticket = {0}, Symbol = {1}, Operation = {2}, OpenPrice = {3}, ClosePrice = {4}, Lots = {5}, Profit = {6}, Comment = {7}, Commission = {8}, MagicNumber = {9}, OpenTime = {10}, CloseTime = {11}", "Order: Ticket = {0}, Symbol = {1}, Operation = {2}, OpenPrice = {3}, ClosePrice = {4}, Lots = {5}, Profit = {6}, Comment = {7}, Commission = {8}, MagicNumber = {9}, OpenTime = {10}, CloseTime = {11}, Swap = {12}",
order.Ticket, order.Symbol, order.Operation, order.OpenPrice, order.ClosePrice, order.Lots, order.Profit, order.Comment, order.Commission, order.MagicNumber, order.OpenTime, order.CloseTime); order.Ticket, order.Symbol, order.Operation, order.OpenPrice, order.ClosePrice, order.Lots, order.Profit, order.Comment, order.Commission, order.MagicNumber, order.OpenTime, order.CloseTime, order.Swap);
AddToLog(result); AddToLog(result);
} }
} }
mq4/MtApi.ex4
BIN
View File
Binary file not shown.
mq4/MtApi.mq4
+2
View File
@@ -3461,6 +3461,7 @@ JSONObject* GetOrderJson(int index, int select, int pool)
int magicNumber = OrderMagicNumber(); int magicNumber = OrderMagicNumber();
datetime openTime = OrderOpenTime(); datetime openTime = OrderOpenTime();
datetime closeTime = OrderCloseTime(); datetime closeTime = OrderCloseTime();
double swap = OrderSwap();
JSONObject *joOrder = new JSONObject(); JSONObject *joOrder = new JSONObject();
joOrder.put("Ticket", new JSONNumber(ticket)); joOrder.put("Ticket", new JSONNumber(ticket));
@@ -3477,6 +3478,7 @@ JSONObject* GetOrderJson(int index, int select, int pool)
joOrder.put("MagicNumber", new JSONNumber(magicNumber)); joOrder.put("MagicNumber", new JSONNumber(magicNumber));
joOrder.put("MtOpenTime", new JSONNumber(openTime)); joOrder.put("MtOpenTime", new JSONNumber(openTime));
joOrder.put("MtCloseTime", new JSONNumber(closeTime)); joOrder.put("MtCloseTime", new JSONNumber(closeTime));
joOrder.put("Swap", new JSONNumber(swap));
return joOrder; return joOrder;
} }