Add method SymbolInfoSession()

MT5Connector/MT5Handler.h

@@ -11,12 +11,12 @@ ref class MT5Handler: IMetaTraderHandler
 public:
     MT5Handler()
     {
-		msgId = WM_USER + 4096;
+        msgId = WM_TIMER;
     }
 
     virtual void SendTickToMetaTrader(int handle)
     {
-		PostMessage((HWND)handle, msgId, 0x00000011, 0);
+        PostMessage((HWND)handle, msgId, 0, 0);
     }
 
 private:

MTConnector/MT4Handler.h

@@ -11,13 +11,11 @@ ref class MT4Handler: IMetaTraderHandler
 public:
     MT4Handler()
     {
-        //msgId = RegisterWindowMessage("MetaTrader4_Internal_Message");
         msgId = WM_TIMER;
     }
 
     virtual void SendTickToMetaTrader(int handle)
     {
-        //PostMessage((HWND)handle, msgId, 2, 1);
         PostMessage((HWND)handle, msgId, 0, 0);
     }
 

MtApi/MtApi.csproj

@@ -72,6 +72,7 @@
     <Compile Include="MtOrder.cs" />
     <Compile Include="MtQuote.cs" />
     <Compile Include="MtQuoteEventArgs.cs" />
+    <Compile Include="MtSession.cs" />
     <Compile Include="MtTimeBar.cs" />
     <Compile Include="MtTypes.cs" />
     <Compile Include="Monitors\TradeMonitor.cs" />
@@ -90,6 +91,7 @@
     <Compile Include="Requests\OrderDeleteRequest.cs" />
     <Compile Include="Requests\OrderModifyRequest.cs" />
     <Compile Include="Requests\OrderSendRequest.cs" />
+    <Compile Include="Requests\SessionRequest.cs" />
     <Compile Include="Requests\RequestBase.cs" />
     <Compile Include="Requests\RequestType.cs" />
     <Compile Include="Responses\CopyRatesResponse.cs" />
@@ -97,6 +99,7 @@
     <Compile Include="Responses\GetOrdersResponse.cs" />
     <Compile Include="Responses\ICustomResponse.cs" />
     <Compile Include="Responses\OrderSendResponse.cs" />
+    <Compile Include="Responses\SessionResponce.cs" />
     <Compile Include="Responses\ResponseBase.cs" />
     <Compile Include="SeriesIdentifier.cs" />
     <Compile Include="TimeBarArgs.cs" />

MtApi/MtApiClient.cs

@@ -1422,6 +1422,12 @@ namespace MtApi
             var commandParameters = new ArrayList { name, (int)prop_id };
             return SendCommand<string>(MtCommandType.SymbolInfoString, commandParameters); ;
         }
+
+        public MtSession SymbolInfoSession(string symbol, DayOfWeek dayOfWeek, uint index, SessionType type)
+        {
+            var responce = SendRequest<SessionResponce>(new SessionRequest { Symbol = symbol, DayOfWeek = dayOfWeek, SessionIndex = (int)index, SessionType = type });
+            return responce != null ? responce.Session : null;
+        }
         #endregion
 
         #region Private Methods

MtApi/MtSession.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MtApi
+{
+    public class MtSession
+    {
+        public string Symbol { get; set; }
+        public DayOfWeek DayOfWeek { get; set; }
+        public uint Index { get; set; }
+        public int MtFromTime { get; set; }
+        public DateTime From
+        {
+            get { return MtApiTimeConverter.ConvertFromMtTime(MtFromTime); }
+        }
+        public int MtToTime { get; set; }
+        public DateTime To
+        {
+            get { return MtApiTimeConverter.ConvertFromMtTime(MtToTime); }
+        }
+        public bool HasData { get; set; }
+        public SessionType Type { get; set; }
+    }
+
+    public enum SessionType { Quote, Trade }
+}

MtApi/Requests/RequestType.cs

@@ -11,6 +11,7 @@
         OrderDelete     = 6,
         OrderModify     = 7,
         iCustom         = 8,
-        CopyRates       = 9
+        CopyRates       = 9,
+        Session         = 10,
     }
 }

MtApi/Requests/SessionRequest.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace MtApi.Requests
+{
+    public class SessionRequest : RequestBase
+    {
+        public string Symbol { get; set; }
+        public DayOfWeek DayOfWeek { get; set; }
+        public int SessionIndex { get; set; }
+        public SessionType SessionType { get; set; }
+
+        public override RequestType RequestType
+        {
+            get { return RequestType.Session; }
+        }
+    }
+}

MtApi/Responses/SessionResponce.cs

@@ -0,0 +1,7 @@
+namespace MtApi.Responses
+{
+    public class SessionResponce : ResponseBase
+    {
+        public MtSession Session { get; set; }
+    }
+}

MtApi5/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.9.0")]
+[assembly: AssemblyVersion("1.0.10.0")]
-[assembly: AssemblyFileVersion("1.0.9.0")]
+[assembly: AssemblyFileVersion("1.0.10.0")]

MtApi5Installer/Product.wxs

@@ -12,7 +12,7 @@
         <?define PlatformSystemFolder = "SystemFolder" ?>
     <?endif ?>
 
-    <?define ProductVersion="1.0.9" ?>
+    <?define ProductVersion="1.0.10" ?>
     <?define Manufacturer="DW"?>
     <?define ProductPath="..\build\products\$(var.Configuration)\"?>
     

mq5/MtApi5.mq5

@@ -3,6 +3,8 @@
 
 #include <Trade\SymbolInfo.mqh>
 #include <trade/trade.mqh>
+#property version   "1.1"
+#property description "MtApi (MT5) connection expert"
 
 #import "MT5Connector.dll"
    bool initExpert(int expertHandle, int port, string symbol, double bid, double ask, string& err);
@@ -32,8 +34,6 @@
    bool getDoubleValue(int expertHandle, int paramIndex, double& res);
    bool getStringValue(int expertHandle, int paramIndex, string& res);
    bool getBooleanValue(int expertHandle, int paramIndex, bool& res);
-   
-//   void verify(bool isDemo, string accountName, long accountNumber);   
 #import
 
 input int Port = 8228;
@@ -46,9 +46,6 @@ bool isCrashed = false;
 string symbolValue;
 string commentValue;
 
-double myBid;
-double myAsk;
-
 string PARAM_SEPARATOR = ";";
 
 int OnInit()
@@ -69,9 +66,9 @@ void OnTick()
 
 int preinit()
 {
-   message        = "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" + "";
+   StringInit(message, 1000, 0);
-   symbolValue    = "222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222" + "";
+   StringInit(symbolValue, 1000, 0);
-   commentValue   = "333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333" + "";
+   StringInit(commentValue, 1000, 0);
 
    return (0);
 }
@@ -88,8 +85,6 @@ int init()
 {
    preinit();  
 
-//   verify(IsDemo(), AccountInfoString(ACCOUNT_NAME), AccountInfoInteger(ACCOUNT_LOGIN));
-
    if (TerminalInfoInteger(TERMINAL_DLLS_ALLOWED) == false) 
    {
       MessageBox("Dlls not allowed.", "MtApi", 0);
@@ -111,16 +106,13 @@ int init()
    }
 
    long chartID = ChartID();
-   ExpertHandle = ChartGetInteger(chartID, CHART_WINDOW_HANDLE);
+   ExpertHandle = (int) ChartGetInteger(chartID, CHART_WINDOW_HANDLE);
    
    MqlTick last_tick;
    SymbolInfoTick(Symbol(),last_tick);
    double Bid = last_tick.bid;
    double Ask = last_tick.ask;
    
-   myBid = Bid;
-   myAsk = Ask;
-
    if (!initExpert(ExpertHandle, Port, Symbol(), Bid, Ask, message))
    {
        MessageBox(message, "MtApi", 0);
@@ -153,43 +145,33 @@ int deinit()
 }
 
 int start() 
-{
-   if (isCrashed == 0) 
 {
    MqlTick last_tick;
    SymbolInfoTick(Symbol(),last_tick);
    double Bid = last_tick.bid;
    double Ask = last_tick.ask;
    
-      if (executeCommand() != 0)
-      {  
-         CSymbolInfo mysymbol;
-         mysymbol.Name (_Symbol);
-         mysymbol.RefreshRates();
-
-         Bid = mysymbol.Bid();
-         Ask =  mysymbol.Ask();
-                           
-         if (myBid == Bid && myAsk == Ask)
-         {         
-            return (0);
-         }
-      }      
-      
    if (!updateQuote(ExpertHandle, Symbol(), Bid, Ask, message)) 
    {
-         MessageBox(message, "MtApi", 0);
+      Print("updateQuote: [ERROR] ", message);
-         isCrashed = true;
-         return (1);
-      }
-      
-      myBid = Bid;
-      myAsk = Ask;
    }
 
    return (0);
 }
 
+void OnTimer()
+{
+   while(true)
+   {
+      int executedCommand = executeCommand();
+      if (executedCommand == 0)
+      {   
+         return;
+      }
+   }
+}
+
+
 int executeCommand()
 {
    int commandType = 0;