last ...

Experts/x-saherelm.xfima.backtester.ea.mq5

@@ -362,7 +362,7 @@ int OnInit()
         eaSignallerRiskInPoint, // Default Risk In Points ...
         eaSignallerVolume       // Defaul Volume ...
     );
-    fima1Signaller.slAdditionDistance = 15; 
+    fima1Signaller.slAdditionDistance = 15;
     fima1Signaller.AddOnSignalEventHandler(OnSignalTriggered);
 
     //
@@ -728,7 +728,8 @@ void OnStopLossTriggered(const XDeal &deal)
 
     //
     HandleBalanceReport();
-    HandleLoosingPosition(deal.positionId, deal.profit);
+    HandleWinTrade(deal.positionId, deal.profit);
+    HandleLoseTrade(deal.positionId, deal.profit);
 }
 
 /**
@@ -743,6 +744,7 @@ void OnTakeProfitTriggered(const XDeal &deal)
 
     //
     HandleBalanceReport();
+    HandleWinTrade(deal.positionId, deal.profit);
 }
 
 /**
@@ -767,7 +769,8 @@ void OnPositionForceClosed(
 
     //
     HandleBalanceReport();
-    HandleLoosingPosition(ticket, position.profit);
+    HandleWinTrade(ticket, position.profit);
+    HandleLoseTrade(ticket, position.profit);
 }
 
 /**
@@ -856,8 +859,9 @@ void OnTradeStateChanged(const XOnTradeHandlerState &state)
  * Test Resting Signals ...
  *
  * @param  ticket: ulong, Position Ticket ...
+ * @param  profit: double, Position Profit ...
  */
-void HandleLoosingPosition(
+void HandleLoseTrade(
     ulong ticket = 0,
     double profit = 0 //
 )
@@ -879,7 +883,30 @@ void HandleLoosingPosition(
 
     //
     // Increase Resting Signals of Signallers ...
-    fima1Signaller.restingSignals++;
+    fima1Signaller.LoseTrade();
+}
+
+/**
+ * Handle Win Trade ...
+ *
+ * @param  ticket: ulong, Position Ticket ...
+ * @param  profit: double, Position Profit ...
+ */
+void HandleWinTrade(
+    ulong ticket = 0,
+    double profit = 0 //
+)
+{
+    //
+    bool has = ticket > 0 &&
+               profit > 0;
+    if (!has)
+    {
+        return;
+    }
+
+    //
+    fima1Signaller.WinTrade();
 }
 
 /**