From 96972931a7212f6113ae5870ab1420ff1def30d7 Mon Sep 17 00:00:00 2001
From: Hadi Khazaee Asl <hadi_khazaee_asl@yahoo.com>
Date: Wed, 8 Oct 2025 00:44:29 +0330
Subject: [PATCH] last ...

---
 Classes/x-saherelm.x-market.pattern.class.mq5 |  2 +-
 Libraries/x-saherelm.x-poi.extensions.lib.mq5 | 30 +++++++------------
 .../x-saherelm.xfima.signaller.class.mq5      | 20 ++++++-------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/Classes/x-saherelm.x-market.pattern.class.mq5 b/Classes/x-saherelm.x-market.pattern.class.mq5
index 776cba52..344b00a3 100644
--- a/Classes/x-saherelm.x-market.pattern.class.mq5
+++ b/Classes/x-saherelm.x-market.pattern.class.mq5
@@ -2006,7 +2006,7 @@ class XCMarketPatternDetector : public XCBase
         double momentumBarApprovedMultiplier = 3,
         //
         // TrueGap ...
-        double trueGapApprovedStrength = 2,
+        double trueGapApprovedStrength = 1,
         //
         // Pin ...
         double pinBarShadowApprovedMultiplier = 3,
diff --git a/Libraries/x-saherelm.x-poi.extensions.lib.mq5 b/Libraries/x-saherelm.x-poi.extensions.lib.mq5
index 3c02577b..f4c50c90 100644
--- a/Libraries/x-saherelm.x-poi.extensions.lib.mq5
+++ b/Libraries/x-saherelm.x-poi.extensions.lib.mq5
@@ -3930,11 +3930,11 @@ bool ToBox(
             iUpper =
                 isBullish
                     ? valePrice
-                    : peakPrice;
+                    : tmpBar.GetPrice(valePriceType);
             iLower =
                 isBullish
                     ? tmpBar.GetPrice(peakPriceType)
-                    : tmpBar.GetPrice(valePriceType);
+                    : peakPrice;
         }
     }
     break;
@@ -3986,18 +3986,16 @@ bool ToBox(
         );
         if (has)
         {
+            //
             iFrom = tmpBar.time;
+
+            //
+            int idx = -1;
+            int mLength = tmpBar.Index() - bar.Index();
+            iLower = bar.FindLowest(idx, mLength, valePriceType);
+            iUpper = bar.FindHighest(idx, mLength, peakPriceType);
         }
 
-        //
-        iUpper =
-            isBullish
-                ? peakPrice
-                : valePrice;
-        iLower =
-            isBullish
-                ? peakPrice
-                : valePrice;
     }
     break;
 
@@ -4021,14 +4019,8 @@ bool ToBox(
         }
 
         //
-        iUpper =
-            isBullish
-                ? peakPrice
-                : valePrice;
-        iLower =
-            isBullish
-                ? peakPrice
-                : valePrice;
+        iUpper = valePrice;
+        iLower = valePrice;
     }
     break;
 
diff --git a/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5 b/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5
index 0e5f3f39..8e0a7632 100644
--- a/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5
+++ b/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5
@@ -1248,7 +1248,7 @@ class XCXFIMAStrategy1Signaller : public XCXFIMABaseSignaller
                 IsXBullish(_patternDir)
                     ? ANCHOR_TOP
                     : ANCHOR_BOTTOM,
-                "Pivot_" + _pivot.prefix + "_" + ToXString(TimeToSeconds(_pivot.time)),
+                _pivot.prefix + "_Pivot_" + ToXString(TimeToSeconds(_pivot.time)),
                 true,          // Ignore Bar Tag ...
                 arrowThreshold // Threshold ...
             );
@@ -1271,7 +1271,7 @@ class XCXFIMAStrategy1Signaller : public XCXFIMABaseSignaller
                 _zone,
                 iObj,
                 ignoreBoxAt,
-                "Zone_" + _zone.type + "_" + ToXString(TimeToSeconds(_zone.from)) //
+                _zone.type + "_Zone_" + ToXString(TimeToSeconds(_zone.from)) //
             );
             if (has)
             {
@@ -1329,32 +1329,32 @@ class XCXFIMAStrategy1Signaller : public XCXFIMABaseSignaller
         XClean(config.allowedDrawPivots);
 
         //
-        // MOMENTUM ...
+        // X_BAR_PATTERN_PIERCING ...
         Add(
-            X_BAR_PATTERN_MOMENTUM,
+            X_BAR_PATTERN_PIERCING,
             config.allowedDraws //
         );
         Add(
-            X_BAR_PATTERN_MOMENTUM,
+            X_BAR_PATTERN_PIERCING,
             config.allowedDrawZones //
         );
         Add(
-            X_BAR_PATTERN_MOMENTUM,
+            X_BAR_PATTERN_PIERCING,
             config.allowedDrawPivots //
         );
 
         //
-        // ENGULFED ...
+        // X_BAR_PATTERN_STAR ...
         Add(
-            X_BAR_PATTERN_ENGULFED,
+            X_BAR_PATTERN_STAR,
             config.allowedDraws //
         );
         Add(
-            X_BAR_PATTERN_ENGULFED,
+            X_BAR_PATTERN_STAR,
             config.allowedDrawZones //
         );
         Add(
-            X_BAR_PATTERN_ENGULFED,
+            X_BAR_PATTERN_STAR,
             config.allowedDrawPivots //
         );