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

refactor(indicators): Refactored to use MovingAverage_Engine

Browse Source
This commit is contained in:
Toh4iem9
2026-01-01 21:35:24 +01:00
parent 34ce413549
commit 624ebd710b
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Indicators/MyIndicators/UltimateOscillator_Pro.mq5
+18 -15
View File
@@ -1,11 +1,9 @@
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| UltimateOscillator_Pro.mq5 | //| UltimateOscillator_Pro.mq5 |
//| Copyright 2025, xxxxxxxx| //| Copyright 2025, xxxxxxxx|
//| |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2025, xxxxxxxx"
#property link "" #property version "3.00" // Refactored to use MovingAverage_Engine
#property version "2.10" // Added optional signal line
#property description "Professional Ultimate Oscillator with an optional signal line and" #property description "Professional Ultimate Oscillator with an optional signal line and"
#property description "selectable candle source (Standard or Heikin Ashi)." #property description "selectable candle source (Standard or Heikin Ashi)."
@@ -60,17 +58,16 @@ input ENUM_CANDLE_SOURCE InpCandleSource = CANDLE_STANDARD;
input group "Signal Line Settings" input group "Signal Line Settings"
input ENUM_DISPLAY_MODE InpDisplayMode = DISPLAY_UO_AND_SIGNAL; input ENUM_DISPLAY_MODE InpDisplayMode = DISPLAY_UO_AND_SIGNAL;
input int InpSignalPeriod = 9; input int InpSignalPeriod = 9;
input ENUM_MA_METHOD InpSignalMAType = MODE_SMA; // UPDATED: Use ENUM_MA_TYPE
input ENUM_MA_TYPE InpSignalMAType = SMA;
//--- Indicator Buffers --- //--- Indicator Buffers ---
double BufferUO[]; double BufferUO[];
double BufferSignal[]; double BufferSignal[];
//--- Global calculator object (as a base class pointer) --- //--- Global calculator object ---
CUltimateOscillatorCalculator *g_calculator; CUltimateOscillatorCalculator *g_calculator;
//+------------------------------------------------------------------+
//| Custom indicator initialization function. |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnInit() int OnInit()
{ {
@@ -85,7 +82,7 @@ int OnInit()
g_calculator = new CUltimateOscillatorCalculator_HA(); g_calculator = new CUltimateOscillatorCalculator_HA();
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("UO HA(%d,%d,%d)", InpPeriod1, InpPeriod2, InpPeriod3)); IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("UO HA(%d,%d,%d)", InpPeriod1, InpPeriod2, InpPeriod3));
break; break;
default: // CANDLE_STANDARD default:
g_calculator = new CUltimateOscillatorCalculator(); g_calculator = new CUltimateOscillatorCalculator();
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("UO(%d,%d,%d)", InpPeriod1, InpPeriod2, InpPeriod3)); IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("UO(%d,%d,%d)", InpPeriod1, InpPeriod2, InpPeriod3));
break; break;
@@ -105,8 +102,6 @@ int OnInit()
return(INIT_SUCCEEDED); return(INIT_SUCCEEDED);
} }
//+------------------------------------------------------------------+
//| Custom indicator deinitialization function. |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
void OnDeinit(const int reason) void OnDeinit(const int reason)
{ {
@@ -115,18 +110,26 @@ void OnDeinit(const int reason)
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| Custom indicator calculation function. | int OnCalculate(const int rates_total,
//+------------------------------------------------------------------+ const int prev_calculated,
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&[]) const datetime &time[],
const double &open[],
const double &high[],
const double &low[],
const double &close[],
const long &tick_volume[],
const long &volume[],
const int &spread[])
{ {
if(CheckPointer(g_calculator) == POINTER_INVALID) if(CheckPointer(g_calculator) == POINTER_INVALID)
return 0; return 0;
g_calculator.Calculate(rates_total, open, high, low, close, BufferUO, BufferSignal); g_calculator.Calculate(rates_total, prev_calculated, open, high, low, close, BufferUO, BufferSignal);
if(InpDisplayMode == DISPLAY_UO_ONLY) if(InpDisplayMode == DISPLAY_UO_ONLY)
{ {
for(int i=0; i<rates_total; i++) int start = (prev_calculated > 0) ? prev_calculated - 1 : 0;
for(int i = start; i < rates_total; i++)
BufferSignal[i] = EMPTY_VALUE; BufferSignal[i] = EMPTY_VALUE;
} }