last ...

X121SMCEA/Signals/x-121.smc.xwz.signal.class.mq5

@@ -164,15 +164,12 @@ class XCX121SMCXWZSignalDetector : public XCBase
         double targets[];
         double reward = 0;
         XBoxZone signalBox;
+        XBoxZone signalHolderBox;
         bool hasPriority = false;
-        int activatedFVGIDX = -1;
-        int activatedZoneIDX = -1;
         double amountPercent = -1;
         bool hasSignalBox = false;
-        bool hasWaitingZones = false;
         bool hasWaitingBoxes = false;
         bool hasRewardAmount = false;
-        bool isSignalBoxReversal = false;
         bool hasWorkingZoneOveralDirection = false;
         ENUM_X_DIRECTION wzOveralDir = X_DIRECTION_NONE;
         ENUM_X_DIRECTION signalBoxDir = X_DIRECTION_NONE;
@@ -214,15 +211,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
             hasWorkingZoneOveralDirection = workingZone
                                                 .DetectOveralDirection(wzOveralDir);
 
-            //
-            // Detect Zones and Boxes ...
-            // hasWaitingZones = workingZone.DetectZone(
-            //     provider //
-            // );
-
-            //
-            hasWaitingBoxes = workingZone.HasWaitingBoxes();
-
             //
             // Checking Working Zone Destory or not ...
             bool isWorkingZoneDestroyed = workingZone.IsDestroyed(
@@ -284,6 +272,7 @@ class XCX121SMCXWZSignalDetector : public XCBase
             hasWorkingZone &&
             workingZone.DetectSignalConditions(
                 signalBox,
+                signalHolderBox,
                 signalBoxDir,
                 signalProvider,
                 provider,
@@ -327,16 +316,6 @@ class XCX121SMCXWZSignalDetector : public XCBase
         //
         //
 
-        //
-        // Remove Invalidate Zones ...
-        if (hasWaitingZones)
-        {
-            //
-            // Validate Waiting Zones ...
-            workingZone.ValidateWaitingZones(zIndex);
-            hasWaitingZones = workingZone.HasWaitingZones();
-        }
-
         //
         // Remove InValidate Boxes ...
         if (hasWaitingBoxes)
@@ -357,6 +336,7 @@ class XCX121SMCXWZSignalDetector : public XCBase
         {
             //
             signalBox.Clean();
+            signalHolderBox.Clean();
             signalBoxDir = X_DIRECTION_NONE;
         }
 
@@ -387,20 +367,37 @@ class XCX121SMCXWZSignalDetector : public XCBase
             bool has = false;
 
             //
-            XCBoxObject *iObj;
+            // Draw Signal Box ...
+            XCBoxObject *iSignalBoxObj;
             has = drawer.DrawBox(
                 signalBox,
-                iObj //
+                iSignalBoxObj //
             );
             if (has)
             {
                 //
-                iObj.BoxWidth(1);
-                iObj.BoxColor(clrYellow);
-                iObj.BoxStyle(STYLE_SOLID);
+                iSignalBoxObj.BoxWidth(1);
+                iSignalBoxObj.BoxColor(clrYellow);
+                iSignalBoxObj.BoxStyle(STYLE_SOLID);
 
                 //
-                workingZone.mDrawnObjects.Add(iObj);
+                workingZone.mDrawnObjects.Add(iSignalBoxObj);
+            }
+
+            //
+            // Draw Signal Holder Box if Exists ...
+            if (signalHolderBox.IsValid())
+            {
+                //
+                XCBoxObject *iSignalHolderBoxObj;
+                has = drawer.DrawBox(
+                    signalHolderBox,
+                    iSignalHolderBoxObj //
+                );
+                if (has)
+                {
+                    workingZone.mDrawnObjects.Add(iSignalHolderBoxObj);
+                }
             }
 
             //
@@ -847,6 +844,7 @@ class XCX121SMCXWZSignalDetector : public XCBase
 
         //
         signalBox.Clean();
+        signalHolderBox.Clean();
         consolidationZBar.Clean();
 
         //