gavindiaz/mql5
1
0
Fork 0
mirror of https://github.com/softwaredevelop/mql5.git synced 2026-07-27 20:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(indicators):

Browse Source
This commit is contained in:
Toh4iem9
2025-12-28 10:37:05 +01:00
parent 5eef5f7195
commit 7dd14180ca
1 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Indicators/MyIndicators/CCI_Oscillator_Pro.mq5
+13 -33
View File
@@ -1,11 +1,9 @@
//+------------------------------------------------------------------+
//| CCI_Oscillator_Pro.mq5 |
//| Copyright 2025, xxxxxxxx|
//| |
//+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx"
#property link ""
#property version "2.01" // Final unified architecture
#property version "3.00" // Refactored to use CCI Engine
#property description "CCI Oscillator (Histogram of CCI vs Signal Line) with selectable"
#property description "price source (Standard and Heikin Ashi)."
@@ -28,44 +26,35 @@ input int InpCCIPeriod = 20;
input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_TYPICAL_STD;
input group "Signal Line Settings"
input int InpMAPeriod = 14;
input ENUM_MA_METHOD InpMAMethod = MODE_SMA;
// UPDATED: Use ENUM_MA_TYPE
input ENUM_MA_TYPE InpMAMethod = SMA;
//--- Indicator Buffers ---
double BufferOscillator[];
//--- Global calculator object (as a base class pointer) ---
//--- Global calculator object ---
CCCI_OscillatorCalculator *g_calculator;
//+------------------------------------------------------------------+
//| Custom indicator initialization function. |
//+------------------------------------------------------------------+
int OnInit()
{
//--- Map the buffer and set as non-timeseries
SetIndexBuffer(0, BufferOscillator, INDICATOR_DATA);
ArraySetAsSeries(BufferOscillator, false);
//--- Dynamically create the appropriate calculator instance
if(InpSourcePrice <= PRICE_HA_CLOSE) // Heikin Ashi source selected
{
g_calculator = new CCCI_OscillatorCalculator_HA();
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI Osc HA(%d, %d)", InpCCIPeriod, InpMAPeriod));
}
else // Standard price source selected
{
//--- CORRECTED: Instantiate the concrete class, not the abstract one
g_calculator = new CCCI_OscillatorCalculator_Std();
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI Osc(%d, %d)", InpCCIPeriod, InpMAPeriod));
}
g_calculator = new CCCI_OscillatorCalculator();
//--- Check if creation was successful and initialize
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpCCIPeriod, InpMAPeriod, InpMAMethod))
bool use_ha = (InpSourcePrice <= PRICE_HA_CLOSE);
if(CheckPointer(g_calculator) == POINTER_INVALID ||
!g_calculator.Init(InpCCIPeriod, InpMAPeriod, InpMAMethod, use_ha))
{
Print("Failed to create or initialize CCI Oscillator Calculator object.");
return(INIT_FAILED);
}
//--- Set indicator display properties
string type = use_ha ? " HA" : "";
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI Osc%s(%d,%d)", type, InpCCIPeriod, InpMAPeriod));
int draw_begin = InpCCIPeriod + InpMAPeriod - 2;
PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, draw_begin);
IndicatorSetInteger(INDICATOR_DIGITS, 2);
@@ -73,18 +62,13 @@ int OnInit()
return(INIT_SUCCEEDED);
}
//+------------------------------------------------------------------+
//| Custom indicator deinitialization function. |
//+------------------------------------------------------------------+
void OnDeinit(const int reason)
{
//--- Free the calculator object to prevent memory leaks
if(CheckPointer(g_calculator) != POINTER_INVALID)
delete g_calculator;
}
//+------------------------------------------------------------------+
//| Custom indicator calculation function. |
//+------------------------------------------------------------------+
int OnCalculate(const int rates_total,
const int prev_calculated,
@@ -97,21 +81,17 @@ int OnCalculate(const int rates_total,
const long &volume[],
const int &spread[])
{
//--- Ensure the calculator object is valid
if(CheckPointer(g_calculator) == POINTER_INVALID)
return 0;
//--- Convert our custom enum to the standard ENUM_APPLIED_PRICE
ENUM_APPLIED_PRICE price_type;
if(InpSourcePrice <= PRICE_HA_CLOSE)
price_type = (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice);
else
price_type = (ENUM_APPLIED_PRICE)InpSourcePrice;
//--- Delegate the entire calculation to our calculator object
g_calculator.Calculate(rates_total, open, high, low, close, price_type, BufferOscillator);
g_calculator.Calculate(rates_total, prev_calculated, price_type, open, high, low, close, BufferOscillator);
//--- Return rates_total for a full recalculation, ensuring stability
return(rates_total);
}
//+------------------------------------------------------------------+