From fc5b9aa74c8c4dbf7c6e0acd6c6e61a25bb12328 Mon Sep 17 00:00:00 2001
From: Toh4iem9 <Toh4iem9@forge.mql5.io>
Date: Thu, 27 Nov 2025 14:26:18 +0100
Subject: [PATCH] refactor: Added Percent mode

---
 Include/MyIncludes/ATR_Calculator.mqh | 29 +++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/Include/MyIncludes/ATR_Calculator.mqh b/Include/MyIncludes/ATR_Calculator.mqh
index 5108d37..e1d3450 100644
--- a/Include/MyIncludes/ATR_Calculator.mqh
+++ b/Include/MyIncludes/ATR_Calculator.mqh
@@ -1,6 +1,6 @@
 //+------------------------------------------------------------------+
 //|                                               ATR_Calculator.mqh |
-//|         Calculation engine for Standard and Heikin Ashi ATR.     |
+//|         VERSION 2.10: Added Percent mode.                        |
 //|                                        Copyright 2025, xxxxxxxx  |
 //+------------------------------------------------------------------+
 #property copyright "Copyright 2025, xxxxxxxx"
@@ -8,11 +8,10 @@
 #include <MyIncludes\HeikinAshi_Tools.mqh>
 
 //--- CORRECTED: Moved enum here to be accessible by other calculators ---
-enum ENUM_ATR_SOURCE
-  {
-   ATR_SOURCE_STANDARD,    // Calculate ATR from standard candles
-   ATR_SOURCE_HEIKIN_ASHI  // Calculate ATR from Heikin Ashi candles
-  };
+enum ENUM_CANDLE_SOURCE { CANDLE_STANDARD, CANDLE_HEIKIN_ASHI };
+
+//--- NEW: Enum for display mode ---
+enum ENUM_ATR_DISPLAY_MODE { ATR_POINTS, ATR_PERCENT };
 
 //+==================================================================+
 //|                                                                  |
@@ -23,6 +22,7 @@ class CATRCalculator
   {
 protected:
    int               m_atr_period;
+   ENUM_ATR_DISPLAY_MODE m_display_mode;
 
    //--- Virtual method for preparing the raw True Range values.
    virtual void      PrepareTrueRange(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], double &tr_buffer[]);
@@ -32,7 +32,7 @@ public:
    virtual          ~CATRCalculator(void) {};
 
    //--- Public methods
-   bool              Init(int period);
+   bool              Init(int period, ENUM_ATR_DISPLAY_MODE mode);
    int               GetPeriod(void) const { return m_atr_period; }
    void              Calculate(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], double &atr_buffer[]);
   };
@@ -40,9 +40,10 @@ public:
 //+------------------------------------------------------------------+
 //| CATRCalculator: Initialization                                   |
 //+------------------------------------------------------------------+
-bool CATRCalculator::Init(int period)
+bool CATRCalculator::Init(int period, ENUM_ATR_DISPLAY_MODE mode)
   {
    m_atr_period = (period < 1) ? 1 : period;
+   m_display_mode = mode;
    return true;
   }
 
@@ -74,6 +75,18 @@ void CATRCalculator::Calculate(int rates_total, const double &open[], const doub
             atr_buffer[i] = (atr_buffer[i-1] * (m_atr_period - 1) + tr[i]) / m_atr_period;
            }
      }
+
+//--- Step 3: Convert to percentage if requested ---
+   if(m_display_mode == ATR_PERCENT)
+     {
+      for(int i = m_atr_period; i < rates_total; i++)
+        {
+         if(close[i] > 0)
+            atr_buffer[i] = (atr_buffer[i] / close[i]) * 100.0;
+         else
+            atr_buffer[i] = 0;
+        }
+     }
   }
 
 //+------------------------------------------------------------------+