diff --git a/Indicators/MyIndicators/CCI_Pro.mq5 b/Indicators/MyIndicators/CCI_Pro.mq5 index 72cb365..a9dd917 100644 --- a/Indicators/MyIndicators/CCI_Pro.mq5 +++ b/Indicators/MyIndicators/CCI_Pro.mq5 @@ -4,151 +4,163 @@ //| | //+------------------------------------------------------------------+ #property copyright "Copyright 2025, xxxxxxxx" -#property link "" -#property version "3.02" // Final unified architecture -#property description "Professional Commodity Channel Index (CCI) with a signal line and" -#property description "selectable price source (Standard and Heikin Ashi)." +#property version "4.00" +#property description "Professional CCI with MA signal line and optional Bollinger Bands." -//--- Indicator Window and Plot Properties --- #property indicator_separate_window -#property indicator_buffers 2 // CCI and Signal Line -#property indicator_plots 2 +#property indicator_buffers 4 +#property indicator_plots 4 #property indicator_level1 -100.0 #property indicator_level2 100.0 #property indicator_level3 0.0 #property indicator_levelstyle STYLE_DOT -//--- Plot 1: CCI line +#include + +//--- Plot Properties --- #property indicator_label1 "CCI" #property indicator_type1 DRAW_LINE #property indicator_color1 clrLightSeaGreen #property indicator_style1 STYLE_SOLID #property indicator_width1 1 - -//--- Plot 2: Signal line #property indicator_label2 "Signal" #property indicator_type2 DRAW_LINE #property indicator_color2 clrOrangeRed #property indicator_style2 STYLE_DOT #property indicator_width2 1 +#property indicator_label3 "Upper Band" +#property indicator_type3 DRAW_LINE +#property indicator_color3 clrGray +#property indicator_style3 STYLE_DOT +#property indicator_width3 1 +#property indicator_label4 "Lower Band" +#property indicator_type4 DRAW_LINE +#property indicator_color4 clrGray +#property indicator_style4 STYLE_DOT +#property indicator_width4 1 -//--- Include the calculator engine --- -#include +//--- Enum for Display Mode +enum ENUM_DISPLAY_MODE + { + DISPLAY_CCI_ONLY, + DISPLAY_CCI_AND_MA, + DISPLAY_CCI_AND_BANDS + }; -//--- Custom Enum for Price Source, including Heikin Ashi --- +//--- Custom Enum for Price Source, including Heikin Ashi enum ENUM_APPLIED_PRICE_HA_ALL { -//--- Heikin Ashi Prices (negative values for easy identification) - PRICE_HA_CLOSE = -1, - PRICE_HA_OPEN = -2, - PRICE_HA_HIGH = -3, - PRICE_HA_LOW = -4, - PRICE_HA_MEDIAN = -5, - PRICE_HA_TYPICAL = -6, +//--- Heikin Ashi Prices + PRICE_HA_CLOSE = -1, + PRICE_HA_OPEN = -2, + PRICE_HA_HIGH = -3, + PRICE_HA_LOW = -4, + PRICE_HA_MEDIAN = -5, + PRICE_HA_TYPICAL = -6, PRICE_HA_WEIGHTED = -7, -//--- Standard Prices (using built-in ENUM_APPLIED_PRICE values) - PRICE_CLOSE_STD = PRICE_CLOSE, - PRICE_OPEN_STD = PRICE_OPEN, - PRICE_HIGH_STD = PRICE_HIGH, - PRICE_LOW_STD = PRICE_LOW, - PRICE_MEDIAN_STD = PRICE_MEDIAN, +//--- Standard Prices + PRICE_CLOSE_STD = PRICE_CLOSE, + PRICE_OPEN_STD = PRICE_OPEN, + PRICE_HIGH_STD = PRICE_HIGH, + PRICE_LOW_STD = PRICE_LOW, + PRICE_MEDIAN_STD = PRICE_MEDIAN, PRICE_TYPICAL_STD = PRICE_TYPICAL, - PRICE_WEIGHTED_STD= PRICE_WEIGHTED + PRICE_WEIGHTED_STD = PRICE_WEIGHTED }; //--- Input Parameters --- +input group "CCI Settings" input int InpCCIPeriod = 20; input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_TYPICAL_STD; -input group "Signal Line Settings" +input group "Overlay Settings" +input ENUM_DISPLAY_MODE InpDisplayMode = DISPLAY_CCI_AND_BANDS; input int InpMAPeriod = 14; input ENUM_MA_METHOD InpMAMethod = MODE_SMA; +input int InpBandsPeriod = 14; +input double InpBandsDev = 2.0; -//--- Indicator Buffers --- -double BufferCCI[]; -double BufferSignal[]; +//--- Buffers --- +double BufferCCI[], BufferSignal[], BufferUpper[], BufferLower[]; -//--- Global calculator object (as a base class pointer) --- +//--- Global calculator --- CCCI_Calculator *g_calculator; //+------------------------------------------------------------------+ -//| Custom indicator initialization function. | +//| OnInit | //+------------------------------------------------------------------+ int OnInit() { -//--- Map the buffers and set as non-timeseries SetIndexBuffer(0, BufferCCI, INDICATOR_DATA); SetIndexBuffer(1, BufferSignal, INDICATOR_DATA); + SetIndexBuffer(2, BufferUpper, INDICATOR_DATA); + SetIndexBuffer(3, BufferLower, INDICATOR_DATA); ArraySetAsSeries(BufferCCI, false); ArraySetAsSeries(BufferSignal, false); + ArraySetAsSeries(BufferUpper, false); + ArraySetAsSeries(BufferLower, false); -//--- Dynamically create the appropriate calculator instance - if(InpSourcePrice <= PRICE_HA_CLOSE) // Heikin Ashi source selected - { + if(InpSourcePrice <= PRICE_HA_CLOSE) g_calculator = new CCCI_Calculator_HA(); - IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI HA(%d, %d)", InpCCIPeriod, InpMAPeriod)); - } - else // Standard price source selected - { - //--- CORRECTED: Instantiate the concrete class, not the abstract one - g_calculator = new CCCI_Calculator_Std(); - IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI(%d, %d)", InpCCIPeriod, InpMAPeriod)); - } + else + g_calculator = new CCCI_Calculator(); -//--- Check if creation was successful and initialize - if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpCCIPeriod, InpMAPeriod, InpMAMethod)) + if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpCCIPeriod, InpMAPeriod, InpMAMethod, InpBandsPeriod, InpBandsDev)) { Print("Failed to create or initialize CCI Calculator object."); return(INIT_FAILED); } -//--- Set indicator display properties int cci_draw_begin = InpCCIPeriod - 1; + int ma_draw_begin = cci_draw_begin + InpMAPeriod - 1; + int bands_draw_begin = cci_draw_begin + InpBandsPeriod - 1; + PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, cci_draw_begin); - PlotIndexSetInteger(1, PLOT_DRAW_BEGIN, cci_draw_begin + InpMAPeriod - 1); + PlotIndexSetInteger(1, PLOT_DRAW_BEGIN, ma_draw_begin); + PlotIndexSetInteger(2, PLOT_DRAW_BEGIN, bands_draw_begin); + PlotIndexSetInteger(3, PLOT_DRAW_BEGIN, bands_draw_begin); IndicatorSetInteger(INDICATOR_DIGITS, 2); + IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI Pro(%d)", InpCCIPeriod)); return(INIT_SUCCEEDED); } //+------------------------------------------------------------------+ -//| Custom indicator deinitialization function. | +//| OnDeinit | //+------------------------------------------------------------------+ -void OnDeinit(const int reason) - { -//--- Free the calculator object to prevent memory leaks - if(CheckPointer(g_calculator) != POINTER_INVALID) - delete g_calculator; - } +void OnDeinit(const int reason) { if(CheckPointer(g_calculator) != POINTER_INVALID) delete g_calculator; } //+------------------------------------------------------------------+ -//| Custom indicator calculation function. | +//| OnCalculate | //+------------------------------------------------------------------+ -int OnCalculate(const int rates_total, - const int prev_calculated, - 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[]) +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&[]) { -//--- 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, BufferCCI, BufferSignal); + g_calculator.Calculate(rates_total, open, high, low, close, price_type, BufferCCI, BufferSignal, BufferUpper, BufferLower); + + for(int i=0; i