Merge pull request #198 from KptKuck/dev

Add switchable Events / fix typo in AddLog()

TestClients/MtApi5TestClient/ViewModel.cs

@@ -1676,7 +1676,7 @@ namespace MtApi5TestClient
 
         private void _mtApiClient_OnLastTimeBar(object sender, Mt5TimeBarArgs e)
         {
-            AddLog($"OnBookEvent: 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}, 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)

mq5/MtApi5.mq5

@@ -50,6 +50,12 @@ enum LockTickType
 
 input int Port = 8228;
 input LockTickType BacktestingLockTicks = NO_LOCK;
+input group           "Disable Events "
+input bool Enable_OnBookEvent = true;                 
+input bool Enable_OnTickEvent = true;                 
+input bool Enable_OnTradeTransactionEvent = true;     
+input bool Enable_OnLastBarEvent = true;    
+
 
 int ExpertHandle;
 
@@ -90,6 +96,8 @@ void OnTick()
    if (_last_bar_open_time != lastbar_time)
    {
       if (_last_bar_open_time != 0 )
+      {
+         if(Enable_OnLastBarEvent)
          {
            MqlRates rates_array[];
            CopyRates(symbol, Period(), 1, 1, rates_array);
@@ -97,19 +105,21 @@ void OnTick()
            MtTimeBarEvent* time_bar = new MtTimeBarEvent(symbol, rates_array[0]);
            SendMtEvent(ON_LAST_TIME_BAR_EVENT, time_bar);
            delete time_bar;
-         
+         }
         lastbar_time_changed = true;
       }
       
       _last_bar_open_time = lastbar_time;
    }
-
+   if (Enable_OnTickEvent)
+     {
        MqlTick last_tick;
        SymbolInfoTick(Symbol(),last_tick);
    
        MtOnTickEvent * tick_event = new MtOnTickEvent(symbol, last_tick);
        SendMtEvent(ON_TICK_EVENT, tick_event);
        delete tick_event; 
+     }
    
    if (IsTesting())
    {
@@ -133,17 +143,23 @@ void  OnTradeTransaction(
    const MqlTradeResult&         result        // result structure 
    )
    {
+      if(!Enable_OnTradeTransactionEvent) return;
+      
       #ifdef __DEBUG_LOG__
        PrintFormat("%s:", __FUNCTION__);
       #endif 
       
+       
       MtOnTradeTransactionEvent* trans_event = new MtOnTradeTransactionEvent(trans, request, result);
       SendMtEvent(ON_TRADE_TRANSACTION_EVENT, trans_event);
       delete trans_event;
-}
        
+   }
 void OnBookEvent(const string& symbol)
    {
+   
+    if(!Enable_OnBookEvent) return;
+    
     #ifdef __DEBUG_LOG__
       PrintFormat("%s: %s", __FUNCTION__, symbol);
     #endif 
@@ -151,6 +167,7 @@ void OnBookEvent(const string& symbol)
     MtOnBookEvent * book_event = new MtOnBookEvent(symbol);
     SendMtEvent(ON_BOOK_EVENT, book_event);
     delete book_event;
+      
    }
 
 int preinit()
@@ -7521,6 +7538,7 @@ void SendMtEvent(MtEventTypes eventType, MtEvent* mtEvent)
    if (sendEvent(ExpertHandle, (int)eventType, json.toString(), _error))
    {
 #ifdef __DEBUG_LOG__
+      PrintFormat("%s: event = %s", __FUNCTION__, EnumToString(eventType));
       PrintFormat("%s: payload = %s", __FUNCTION__, json.toString());
 #endif
    }