gavindiaz/mtapi
1
0
Fork 0
mirror of https://github.com/vdemydiuk/mtapi.git synced 2026-07-27 18:47:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

MtApi5: Remove redundant classes (requests)

Browse Source
This commit is contained in:
Viacheslav Demydiuk
2024-02-23 18:10:48 +02:00
parent b9d99da7a8
commit 2871ddf07a
25 changed files with 18 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MtApi5/MtApi5Client.cs
+5 -5
View File
@@ -1,8 +1,8 @@
using System.Collections;
using MtApi5.Requests;
using Newtonsoft.Json;
using MtClient;
using MtApi5.MtProtocol;
using MtApi5.MtProtocol.ICustomRequest;
namespace MtApi5
{
@@ -2965,7 +2965,7 @@ namespace MtApi5
{
Dictionary<string, object> cmdParams = new() { { "Symbol", symbol }, { "Period", (int)period },
{ "Name", name }, { "Parameters", parameters },
{ "ParamsType", ICustomRequest.ParametersType.Double} };
{ "ParamsType", ParametersType.Double} };
return SendCommand<int>(ExecutorHandle, Mt5CommandType.iCustom, cmdParams);
}
@@ -2980,7 +2980,7 @@ namespace MtApi5
{
Dictionary<string, object> cmdParams = new() { { "Symbol", symbol }, { "Period", (int)period },
{ "Name", name }, { "Parameters", parameters },
{ "ParamsType", ICustomRequest.ParametersType.Int } };
{ "ParamsType", ParametersType.Int } };
return SendCommand<int>(ExecutorHandle, Mt5CommandType.iCustom, cmdParams);
}
@@ -2995,7 +2995,7 @@ namespace MtApi5
{
Dictionary<string, object> cmdParams = new() { { "Symbol", symbol }, { "Period", (int)period },
{ "Name", name }, { "Parameters", parameters },
{ "ParamsType", ICustomRequest.ParametersType.String } };
{ "ParamsType", ParametersType.String } };
return SendCommand<int>(ExecutorHandle, Mt5CommandType.iCustom, cmdParams);
}
@@ -3010,7 +3010,7 @@ namespace MtApi5
{
Dictionary<string, object> cmdParams = new() { { "Symbol", symbol }, { "Period", (int)period },
{ "Name", name }, { "Parameters", parameters },
{ "ParamsType", ICustomRequest.ParametersType.Boolean } };
{ "ParamsType", ParametersType.Boolean } };
return SendCommand<int>(ExecutorHandle, Mt5CommandType.iCustom, cmdParams);
}
MtApi5/MtProtocol/ICustomRequest.cs
Executable
+13
View File
@@ -0,0 +1,13 @@
namespace MtApi5.MtProtocol
{
namespace ICustomRequest
{
public enum ParametersType
{
Int = 0,
Double = 1,
String = 2,
Boolean = 3
}
}
}
MtApi5/Requests/BuyRequest.cs
-14
View File
@@ -1,14 +0,0 @@
namespace MtApi5.Requests
{
internal class BuyRequest : RequestBase
{
public override RequestType RequestType => RequestType.Buy;
public double Volume { get; set; }
public string? Symbol { get; set; }
public double Price { get; set; }
public double Sl { get; set; }
public double Tp { get; set; }
public string? Comment { get; set; }
}
}
MtApi5/Requests/ChartTimePriceToXyRequest.cs
-16
View File
@@ -1,16 +0,0 @@
using System;
namespace MtApi5.Requests
{
internal class ChartTimePriceToXyRequest : RequestBase
{
public override RequestType RequestType => RequestType.ChartTimePriceToXY;
public long ChartId { get; set; }
public int SubWindow { get; set; }
public DateTime? Time { get; set; }
public double Price { get; set; }
public int MtTime => Mt5TimeConverter.ConvertToMtTime(Time);
}
}
MtApi5/Requests/ChartTimePriceToXyResult.cs
-9
View File
@@ -1,9 +0,0 @@
namespace MtApi5.Requests
{
internal class ChartTimePriceToXyResult
{
public bool RetVal { get; set; }
public int X { get; set; }
public int Y { get; set; }
}
}
MtApi5/Requests/ChartXyToTimePriceRequest.cs
-13
View File
@@ -1,13 +0,0 @@
using System;
namespace MtApi5.Requests
{
internal class ChartXyToTimePriceRequest : RequestBase
{
public override RequestType RequestType => RequestType.ChartXYToTimePrice;
public long ChartId { get; set; }
public int X { get; set; }
public int Y { get; set; }
}
}
MtApi5/Requests/ChartXyToTimePriceResult.cs
-14
View File
@@ -1,14 +0,0 @@
using System;
namespace MtApi5.Requests
{
internal class ChartXyToTimePriceResult
{
public bool RetVal { get; set; }
public int SubWindow { get; set; }
public DateTime? Time => Mt5TimeConverter.ConvertFromMtTime(MtTime);
public double Price { get; set; }
public int MtTime { get; set; }
}
}
MtApi5/Requests/CopyTicksRequest.cs
-12
View File
@@ -1,12 +0,0 @@
namespace MtApi5.Requests
{
internal class CopyTicksRequest: RequestBase
{
public override RequestType RequestType => RequestType.CopyTicks;
public string? SymbolName { get; set; }
public int Flags { get; set; }
public ulong From { get; set; }
public uint Count { get; set; }
}
}
MtApi5/Requests/ICustomRequest.cs
-23
View File
@@ -1,23 +0,0 @@
using System.Collections;
namespace MtApi5.Requests
{
internal class ICustomRequest : RequestBase
{
public enum ParametersType
{
Int = 0,
Double = 1,
String = 2,
Boolean = 3
}
public required string Symbol { get; set; }
public int Timeframe { get; set; }
public string? Name { get; set; }
public ArrayList? Params { get; set; }
public ParametersType ParamsType { get; set; }
public override RequestType RequestType => RequestType.iCustom;
}
}
MtApi5/Requests/IndicatorCreateRequest.cs
-12
View File
@@ -1,12 +0,0 @@
namespace MtApi5.Requests
{
internal class IndicatorCreateRequest: RequestBase
{
public override RequestType RequestType => RequestType.IndicatorCreate;
public string? Symbol { get; set; }
public ENUM_TIMEFRAMES Period { get; set; }
public ENUM_INDICATOR IndicatorType { get; set; }
public List<MqlParam>? Parameters { get; set; }
}
}
MtApi5/Requests/MarketBookGetRequest.cs
-9
View File
@@ -1,9 +0,0 @@
namespace MtApi5.Requests
{
internal class MarketBookGetRequest: RequestBase
{
public override RequestType RequestType => RequestType.MarketBookGet;
public string? Symbol { get; set; }
}
}
MtApi5/Requests/OrderCheckRequest.cs
-10
View File
@@ -1,10 +0,0 @@
namespace MtApi5.Requests
{
internal class OrderCheckRequest: RequestBase
{
public override RequestType RequestType => RequestType.OrderCheck;
public MqlTradeRequest? TradeRequest { get; set; }
}
}
MtApi5/Requests/OrderCheckResult.cs
-8
View File
@@ -1,8 +0,0 @@
namespace MtApi5.Requests
{
public class OrderCheckResult
{
public bool RetVal { get; set; }
public MqlTradeCheckResult? TradeCheckResult { get; set; }
}
}
MtApi5/Requests/OrderSendAsyncRequest.cs
-9
View File
@@ -1,9 +0,0 @@
namespace MtApi5.Requests
{
internal class OrderSendAsyncRequest : RequestBase
{
public override RequestType RequestType => RequestType.OrderSendAsync;
public MqlTradeRequest? TradeRequest { get; set; }
}
}
MtApi5/Requests/OrderSendRequest.cs
-9
View File
@@ -1,9 +0,0 @@
namespace MtApi5.Requests
{
internal class OrderSendRequest: RequestBase
{
public override RequestType RequestType => RequestType.OrderSend;
public MqlTradeRequest? TradeRequest { get; set; }
}
}
MtApi5/Requests/OrderSendResult.cs
-8
View File
@@ -1,8 +0,0 @@
namespace MtApi5.Requests
{
internal class OrderSendResult
{
public bool RetVal { get; set; }
public MqlTradeResult? TradeResult { get; set; }
}
}
MtApi5/Requests/PositionCloseRequest.cs
-10
View File
@@ -1,10 +0,0 @@
namespace MtApi5.Requests
{
internal class PositionCloseRequest : RequestBase
{
public override RequestType RequestType => RequestType.PositionClose;
public ulong Ticket { get; set; }
public ulong Deviation { get; set; }
}
}
MtApi5/Requests/PositionCloseResult.cs
-8
View File
@@ -1,8 +0,0 @@
namespace MtApi5.Requests
{
internal class PositionCloseResult
{
public bool RetVal { get; set; }
public MqlTradeResult? TradeResult { get; set; }
}
}
MtApi5/Requests/PositionOpenRequest.cs
-15
View File
@@ -1,15 +0,0 @@
namespace MtApi5.Requests
{
internal class PositionOpenRequest: RequestBase
{
public override RequestType RequestType => RequestType.PositionOpen;
public string? Symbol { get; set; }
public ENUM_ORDER_TYPE OrderType { get; set; }
public double Volume { get; set; }
public double Price { get; set; }
public double Sl { get; set; }
public double Tp { get; set; }
public string? Comment { get; set; }
}
}
MtApi5/Requests/RequestBase.cs
-7
View File
@@ -1,7 +0,0 @@
namespace MtApi5.Requests
{
internal abstract class RequestBase
{
public abstract RequestType RequestType { get; }
}
}
MtApi5/Requests/RequestType.cs
-24
View File
@@ -1,24 +0,0 @@
// ReSharper disable InconsistentNaming
namespace MtApi5.Requests
{
internal enum RequestType
{
Unknown = 0,
CopyTicks = 1,
iCustom = 2,
OrderSend = 3,
PositionOpen = 4,
OrderCheck = 5,
MarketBookGet = 6,
IndicatorCreate = 7,
SymbolInfoString = 8,
ChartTimePriceToXY = 9,
ChartXYToTimePrice = 10,
PositionClose = 11,
SymbolInfoTick = 12,
Buy = 13,
Sell = 14,
OrderSendAsync = 15
}
}
MtApi5/Requests/SellRequest.cs
-14
View File
@@ -1,14 +0,0 @@
namespace MtApi5.Requests
{
internal class SellRequest : RequestBase
{
public override RequestType RequestType => RequestType.Sell;
public double Volume { get; set; }
public string? Symbol { get; set; }
public double Price { get; set; }
public double Sl { get; set; }
public double Tp { get; set; }
public string? Comment { get; set; }
}
}
MtApi5/Requests/SymbolInfoStringRequest.cs
-10
View File
@@ -1,10 +0,0 @@
namespace MtApi5.Requests
{
internal class SymbolInfoStringRequest : RequestBase
{
public override RequestType RequestType => RequestType.SymbolInfoString;
public string? SymbolName { get; set; }
public ENUM_SYMBOL_INFO_STRING PropId { get; set; }
}
}
MtApi5/Requests/SymbolInfoStringResult.cs
-8
View File
@@ -1,8 +0,0 @@
namespace MtApi5.Requests
{
internal class SymbolInfoStringResult
{
public bool RetVal { get; set; }
public string? StringVar { get; set; }
}
}
MtApi5/Requests/SymbolInfoTickRequest.cs
-9
View File
@@ -1,9 +0,0 @@
namespace MtApi5.Requests
{
internal class SymbolInfoTickRequest : RequestBase
{
public override RequestType RequestType => RequestType.SymbolInfoTick;
public string? SymbolName { get; set; }
}
}