back up and remove all unnecessary objects ...

XCATBEA/Classes/xcatbea.signaller.class.mq5

@@ -1568,18 +1568,7 @@ class XCXCATBEASignaller : XCBase
             conditions.pivotZone.to = cTime;
 
             //
-            // Draw Box ...
-            XCBoxObject *iObj;
-            has = drawer
-                      .drawer
-                      .DrawBox(
-                          conditions.pivotZone,
-                          iObj //
-                      );
-            if (has)
-            {
-                mObjects.Add(iObj);
-            }
+            DrawPivotZone(conditions.pivotZone);
 
             //
             // Check atleast 3 Bars Close Outside of applied Edge ...
@@ -1636,11 +1625,9 @@ class XCXCATBEASignaller : XCBase
                 bool isMiddlePassed =
                     isBullish
                         ? (cConditions.bars[1].low < mid &&
-                           (cConditions.bars[1].GetDown() > mid ||
-                            cConditions.bars[1].close > mid))
+                           cConditions.bars[1].GetDown() > mid)
                         : (cConditions.bars[1].high > mid &&
-                           (cConditions.bars[1].GetUp() < mid ||
-                            cConditions.bars[1].close < mid));
+                           cConditions.bars[1].GetUp() < mid);
 
                 //
                 result =
@@ -2156,6 +2143,34 @@ class XCXCATBEASignaller : XCBase
         }
     }
 
+    /**
+     * Draw Pivot Zone ...
+     *
+     * @param box: XBoxZone instance Reference ...
+     */
+    void DrawPivotZone(XBoxZone &box)
+    {
+        //
+        bool has = box.IsValid();
+        if (!has)
+        {
+            return;
+        }
+
+        //
+        XCBoxObject *iObj;
+        has = drawer
+                  .drawer
+                  .DrawBox(
+                      box,
+                      iObj //
+                  );
+        if (has)
+        {
+            mObjects.Add(iObj);
+        }
+    }
+
     //
     // Private ...
   private: