last ...

Classes/x-saherelm.x-bar.analyser.class.mq5

@@ -1851,52 +1851,44 @@ class XCBarAnalyser : public XCBase
      */
     bool HasFiboPressure(
         XOHCL &bar,
-        ENUM_X_DIRECTION &dir //
+        ENUM_X_DIRECTION forDir,
+        ENUM_X_FIBO_LEVELS level //
     )
     {
         //
         bool result = false;
 
         //
-        dir = X_DIRECTION_NONE;
-
-        //
-        result = bar.IsValid();
+        result = bar.IsValid() &&
+                 HasDirection(forDir);
         if (!result)
         {
             return result;
         }
 
         //
-        double bearishFib382 = GetFibonacciLevel(
+        bool isBullish = IsBullish(forDir);
+        bool isBearish = IsBearish(forDir);
+
+        //
+        double fiboLevelValue = GetFibonacciLevel(
             bar.high,
             bar.low,
-            0.382,
-            1 //
-        );
-        double bullishFib382 = GetFibonacciLevel(
-            bar.high,
-            bar.low,
-            0.382,
-            -1 //
+            level,
+            forDir //
         );
 
         //
-        bool isBullish = bar.GetDown() > bearishFib382;
-        bool isBearish = bar.GetUp() < bullishFib382;
+        bool isBullishPressured =
+            isBullish &&
+            bar.GetDown() > fiboLevelValue;
+        bool isBearishPressured =
+            isBearish &&
+            bar.GetUp() < fiboLevelValue;
 
         //
-        result = isBullish ||
-                 isBearish;
-        if (!result)
-        {
-            return result;
-        }
-
-        //
-        dir = isBullish
-                  ? X_DIRECTION_BULLISH
-                  : X_DIRECTION_BEARISH;
+        result = isBullishPressured ||
+                 isBearishPressured;
 
         //
         return result;