last works ...

Experts/x-test-strategies.ea.mq5

@@ -145,6 +145,13 @@ void OnTick()
     HandleStrategiesOnTick();
 }
 
+//
+// Handle On Trade Event ...
+void OnTrade()
+{
+    eaTrader.HandleOnTrade();
+}
+
 //
 // On Timer ...
 void OnTimer()
@@ -212,7 +219,14 @@ bool InitialEA()
         eaSlippage,
         eaMagicNumber //
     );
+    eaTrader.AddOnStopLossEventHandler(OnStopLossTriggered);
+    eaTrader.AddOnTakeProfitEventHandler(OnTakeProfitTriggered);
+    eaTrader.AddOnForceClosePositionEventHandler(OnPositionForceClosed);
+
+    //
     eaTradeHandler = new XSCXTradeHandler(eaTrader);
+    eaTradeHandler.SaveTrades(true);
+    eaTradeHandler.SaveSignals(true);
 
     //
     XSymbolParser symbolParser;
@@ -324,7 +338,7 @@ void HandleTradeState()
 {
     //
     // Implement All Trade States here ...
-    eaTradeHandler.UpdateData();    
+    eaTradeHandler.UpdateData();
 }
 
 //
@@ -388,6 +402,36 @@ void OnSignalRecieved(XSignal &signal)
 }
 
 //
-// Custom Testing Functions ...
+// Trader Event Handlers for Trade Handling ...
+
+//
+void OnStopLossTriggered(const XDeal &deal)
+{
+    // Finish ...
+    eaTradeHandler.Finish(deal);
+}
+
+//
+void OnTakeProfitTriggered(const XDeal &deal)
+{
+    // Finish ...
+    eaTradeHandler.Finish(deal);
+}
+
+//
+void OnPositionForceClosed(
+    const ulong ticket,
+    const XPosition &position,
+    const string comment //
+)
+{
+    //
+    // Finish ...
+    eaTradeHandler.Finish(
+        ticket,
+        position,
+        comment //
+    );
+}
 
 //