gavindiaz/mql5
1
0
Fork 0
mirror of https://github.com/softwaredevelop/mql5.git synced 2026-08-25 10:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(indicators): Supports Original Ehlers Mode

Browse Source
This commit is contained in:
Toh4iem9
2026-01-04 12:35:57 +01:00
parent 0b1e990175
commit 98bd0ae391
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Indicators/MyIndicators/Authors/Ehlers/2_Oscillators/CG_Oscillator_Pro.mq5
+12 -13
View File
@@ -1,10 +1,9 @@
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| CG_Oscillator_Pro.mq5 | //| CG_Oscillator_Pro.mq5 |
//| Copyright 2025, xxxxxxxx| //| Copyright 2025, xxxxxxxx|
//| |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2025, xxxxxxxx"
#property version "1.00" #property version "2.10" // Supports Original Ehlers Mode
#property description "John Ehlers' Center of Gravity (CG) Oscillator." #property description "John Ehlers' Center of Gravity (CG) Oscillator."
#property indicator_separate_window #property indicator_separate_window
@@ -27,16 +26,16 @@
#include <MyIncludes\CG_Oscillator_Calculator.mqh> #include <MyIncludes\CG_Oscillator_Calculator.mqh>
//--- Enum for selecting the candle source for calculation ---
enum ENUM_CANDLE_SOURCE enum ENUM_CANDLE_SOURCE
{ {
SOURCE_STANDARD, // Use standard OHLC data SOURCE_STANDARD,
SOURCE_HEIKIN_ASHI // Use Heikin Ashi smoothed data SOURCE_HEIKIN_ASHI
}; };
//--- Input Parameters --- //--- Input Parameters ---
input int InpPeriod = 10; // Observation Period input int InpPeriod = 10; // Observation Period
input ENUM_CANDLE_SOURCE InpSource = SOURCE_STANDARD; input ENUM_CANDLE_SOURCE InpSource = SOURCE_STANDARD;
input bool InpOriginalMode = true; // True = Ehlers' Raw Values (Negative), False = Center around 0.0
//--- Indicator Buffers --- //--- Indicator Buffers ---
double BufferCG[]; double BufferCG[];
@@ -56,15 +55,16 @@ int OnInit()
if(InpSource == SOURCE_HEIKIN_ASHI) if(InpSource == SOURCE_HEIKIN_ASHI)
{ {
g_calculator = new CCGOscillatorCalculator_HA(); g_calculator = new CCGOscillatorCalculator_HA();
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CG HA(%d)", InpPeriod)); IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CG HA(%d)%s", InpPeriod, InpOriginalMode ? " Orig" : " Pro"));
} }
else else
{ {
g_calculator = new CCGOscillatorCalculator(); g_calculator = new CCGOscillatorCalculator();
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CG(%d)", InpPeriod)); IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CG(%d)%s", InpPeriod, InpOriginalMode ? " Orig" : " Pro"));
} }
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpPeriod)) // Pass the Original Mode flag to Init
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpPeriod, InpOriginalMode))
{ {
Print("Failed to initialize CG Oscillator Calculator."); Print("Failed to initialize CG Oscillator Calculator.");
return(INIT_FAILED); return(INIT_FAILED);
@@ -85,13 +85,12 @@ void OnDeinit(const int reason)
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnCalculate(const int rates_total, const int, const datetime&[], const double &open[], const double &high[], const double &low[], const double &close[], const long&[], const long&[], const int&[]) int OnCalculate(const int rates_total, const int prev_calculated, const datetime&[], const double &open[], const double &high[], const double &low[], const double &close[], const long&[], const long&[], const int&[])
{ {
if(CheckPointer(g_calculator) == POINTER_INVALID) if(CheckPointer(g_calculator) == POINTER_INVALID)
return 0; return 0;
// The calculator is hard-coded to use Median Price as per Ehlers' article g_calculator.Calculate(rates_total, prev_calculated, PRICE_MEDIAN, open, high, low, close, BufferCG, BufferSignal);
g_calculator.Calculate(rates_total, PRICE_MEDIAN, open, high, low, close, BufferCG, BufferSignal);
return(rates_total); return(rates_total);
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+