last works ...

Classes/x-saherelm.x-backtester.expert.class.mq5

@@ -23,7 +23,8 @@
 #include "../Classes/x-saherelm.base.class.mq5"
 #include "../Classes/x-saherelm.x-alert.class.mq5"
 #include "../Classes/x-saherelm.x-chart.helper.class.mq5"
-#include "../Classes/x-saherelm.x-target.manager.class.mq5"
+#include "../Classes/x-saherelm.x-guard.class.mq5"
+#include "../Classes/x-saherelm.x-target.class.mq5"
 #include "../Classes/x-saherelm.x-trade.class.mq5"
 #include "../Classes/x-saherelm.x-volume.class.mq5"
 
@@ -81,9 +82,9 @@ class XCBackTesterEA : public XCBase
     double volume;                // Default volume Per Trade ...
 
     //
-    XCAlert *eaAlert;                 // EA Scope Alert Handler ...
-    XCTrade *eaTrader;                // EA Scope Trade Handler ...
-    XCTargetManager *eaTargetManager; // EA Scope Target Manager ...
+    XCAlert *eaAlert;   // EA Scope Alert Handler ...
+    XCTrade *eaTrader;  // EA Scope Trade Handler ...
+    XCTarget *eaTarget; // EA Scope Target Manager ...
 
     //
     XCChartHelper *eaChartHelper; // Chart Helper Class ...
@@ -292,7 +293,7 @@ class XCBackTesterEA : public XCBase
 
         //
         // Init Target Managers ...
-        eaTargetManager = new XCTargetManager(eaTrader);
+        eaTarget = new XCTarget(eaTrader, eaAlert);
 
         //
         // Initial GUI ...
@@ -316,9 +317,9 @@ class XCBackTesterEA : public XCBase
     void HandleOnDeInit()
     {
         //
-        eaTargetManager.Destroy();
-        delete eaTargetManager;
-        ZeroMemory(eaTargetManager);
+        eaTarget.Destroy();
+        delete eaTarget;
+        ZeroMemory(eaTarget);
 
         //
         delete eaTrader;
@@ -357,7 +358,7 @@ class XCBackTesterEA : public XCBase
 
         //
         // Managing Targets ...
-        eaTargetManager.Manage();
+        eaTarget.Manage();
     }
 
     /**
@@ -428,7 +429,7 @@ class XCBackTesterEA : public XCBase
         UpdatePositionButtons();
 
         //
-        eaTargetManager.HandleOnStopLossTriggered(deal);
+        eaTarget.HandleOnStopLossTriggered(deal);
     }
 
     /**
@@ -443,7 +444,7 @@ class XCBackTesterEA : public XCBase
         UpdatePositionButtons();
 
         //
-        eaTargetManager.HandleOnTakeProfitTriggered(deal);
+        eaTarget.HandleOnTakeProfitTriggered(deal);
     }
 
     /**
@@ -464,7 +465,7 @@ class XCBackTesterEA : public XCBase
         UpdatePositionButtons();
 
         //
-        eaTargetManager.HandleOnPositionForceClosed(
+        eaTarget.HandleOnPositionForceClosed(
             ticket,
             position,
             comment //
@@ -571,7 +572,7 @@ class XCBackTesterEA : public XCBase
      */
     void HandleOnSignalExecuted(XSignal &signal)
     {
-        eaTargetManager.AddExecutedSignal(signal);
+        eaTarget.AddExecutedSignal(signal);
     }
 
     //