From 7671008aac458a2adec5b33e700316a21642c144 Mon Sep 17 00:00:00 2001 From: Toh4iem9 Date: Fri, 2 Jan 2026 13:43:26 +0100 Subject: [PATCH] refactor(indicators): Wrapper using CMO_Engine + MA Engine --- Indicators/MyIndicators/CMO_Pro.mq5 | 134 +++++++++++++++++++++------- 1 file changed, 100 insertions(+), 34 deletions(-) diff --git a/Indicators/MyIndicators/CMO_Pro.mq5 b/Indicators/MyIndicators/CMO_Pro.mq5 index ad8cb21..d12c000 100644 --- a/Indicators/MyIndicators/CMO_Pro.mq5 +++ b/Indicators/MyIndicators/CMO_Pro.mq5 @@ -3,37 +3,71 @@ //| Copyright 2025, xxxxxxxx| //+------------------------------------------------------------------+ #property copyright "Copyright 2025, xxxxxxxx" -#property version "2.00" // Optimized for incremental calculation -#property description "Chande Momentum Oscillator (CMO) with selectable" -#property description "price source (Standard and Heikin Ashi)." +#property version "3.00" // Refactored to match RSI_Pro architecture +#property description "Chande Momentum Oscillator (CMO) with selectable price source," +#property description "a flexible MA signal line, and optional Bollinger Bands." //--- Indicator Window and Plot Properties --- #property indicator_separate_window -#property indicator_buffers 1 -#property indicator_plots 1 +#property indicator_buffers 4 +#property indicator_plots 4 +#property indicator_minimum -100 +#property indicator_maximum 100 +#property indicator_level1 50.0 +#property indicator_level2 0.0 +#property indicator_level3 -50.0 + +#include + +//--- Plot Properties --- +#property indicator_label1 "CMO" #property indicator_type1 DRAW_LINE #property indicator_color1 clrDodgerBlue #property indicator_style1 STYLE_SOLID #property indicator_width1 1 -#property indicator_label1 "CMO" -//--- Indicator Levels --- -#property indicator_level1 50.0 -#property indicator_level2 0.0 -#property indicator_level3 -50.0 -#property indicator_levelstyle STYLE_DOT +#property indicator_label2 "Signal" +#property indicator_type2 DRAW_LINE +#property indicator_color2 clrOrangeRed +#property indicator_style2 STYLE_DOT +#property indicator_width2 1 -//--- Include the calculator engine --- -#include +#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 + +//--- Enum for Display Mode +enum ENUM_DISPLAY_MODE + { + DISPLAY_CMO_ONLY, + DISPLAY_CMO_AND_MA, + DISPLAY_CMO_AND_BANDS + }; //--- Input Parameters --- +input group "CMO Settings" input int InpPeriodCMO = 14; input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD; -//--- Indicator Buffers --- -double BufferCMO[]; +input group "Overlay Settings" +input ENUM_DISPLAY_MODE InpDisplayMode = DISPLAY_CMO_AND_BANDS; +input int InpPeriodMA = 20; +// UPDATED: Use ENUM_MA_TYPE +input ENUM_MA_TYPE InpMethodMA = SMA; +input double InpBandsDev = 2.0; -//--- Global calculator object (as a base class pointer) --- +//--- Indicator Buffers --- +double BufferCMO[], BufferSignalMA[], BufferUpperBand[], BufferLowerBand[]; + +//--- Global calculator object --- CCMOCalculator *g_calculator; //+------------------------------------------------------------------+ @@ -41,27 +75,45 @@ CCMOCalculator *g_calculator; //+------------------------------------------------------------------+ int OnInit() { - SetIndexBuffer(0, BufferCMO, INDICATOR_DATA); - ArraySetAsSeries(BufferCMO, false); +//--- Binding Buffers + SetIndexBuffer(0, BufferCMO, INDICATOR_DATA); + SetIndexBuffer(1, BufferSignalMA, INDICATOR_DATA); + SetIndexBuffer(2, BufferUpperBand, INDICATOR_DATA); + SetIndexBuffer(3, BufferLowerBand, INDICATOR_DATA); +//--- Setting Series flags + ArraySetAsSeries(BufferCMO, false); + ArraySetAsSeries(BufferSignalMA, false); + ArraySetAsSeries(BufferUpperBand, false); + ArraySetAsSeries(BufferLowerBand, false); + +//--- Initialize Calculator based on Price Source if(InpSourcePrice <= PRICE_HA_CLOSE) { g_calculator = new CCMOCalculator_HA(); - IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CMO HA(%d)", InpPeriodCMO)); + IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CMO Pro HA(%d)", InpPeriodCMO)); } else { g_calculator = new CCMOCalculator(); - IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CMO(%d)", InpPeriodCMO)); + IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CMO Pro(%d)", InpPeriodCMO)); } - if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpPeriodCMO)) +//--- Initialize Calculator Parameters + if(CheckPointer(g_calculator) == POINTER_INVALID || + !g_calculator.Init(InpPeriodCMO, InpPeriodMA, InpMethodMA, InpBandsDev)) { - Print("Failed to create or initialize CMO Calculator object."); + Print("Failed to initialize CMO Pro Calculator."); return(INIT_FAILED); } +//--- Set Draw Begin + int draw_begin = InpPeriodCMO + InpPeriodMA - 1; PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, InpPeriodCMO); + PlotIndexSetInteger(1, PLOT_DRAW_BEGIN, draw_begin); + PlotIndexSetInteger(2, PLOT_DRAW_BEGIN, draw_begin); + PlotIndexSetInteger(3, PLOT_DRAW_BEGIN, draw_begin); + IndicatorSetInteger(INDICATOR_DIGITS, 2); return(INIT_SUCCEEDED); @@ -80,7 +132,7 @@ void OnDeinit(const int reason) //| Custom indicator calculation function | //+------------------------------------------------------------------+ int OnCalculate(const int rates_total, - const int prev_calculated, // <--- Now used! + const int prev_calculated, const datetime &time[], const double &open[], const double &high[], @@ -90,19 +142,33 @@ int OnCalculate(const int rates_total, const long &volume[], const int &spread[]) { - if(CheckPointer(g_calculator) == POINTER_INVALID) - return 0; + if(CheckPointer(g_calculator) != POINTER_INVALID) + { + ENUM_APPLIED_PRICE price_type; + if(InpSourcePrice <= PRICE_HA_CLOSE) + price_type = (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice); + else + price_type = (ENUM_APPLIED_PRICE)InpSourcePrice; - 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 calculation with prev_calculated optimization - g_calculator.Calculate(rates_total, prev_calculated, price_type, open, high, low, close, BufferCMO); + //--- Main Calculation + g_calculator.Calculate(rates_total, prev_calculated, price_type, open, high, low, close, + BufferCMO, BufferSignalMA, BufferUpperBand, BufferLowerBand); + //--- Handle Display Modes (Hide unused buffers) + if(InpDisplayMode == DISPLAY_CMO_ONLY) + { + ArrayInitialize(BufferSignalMA, EMPTY_VALUE); + ArrayInitialize(BufferUpperBand, EMPTY_VALUE); + ArrayInitialize(BufferLowerBand, EMPTY_VALUE); + } + else + if(InpDisplayMode == DISPLAY_CMO_AND_MA) + { + ArrayInitialize(BufferUpperBand, EMPTY_VALUE); + ArrayInitialize(BufferLowerBand, EMPTY_VALUE); + } + } return(rates_total); } //+------------------------------------------------------------------+ -//+------------------------------------------------------------------+ +//+------------------------------------------------------------------+ \ No newline at end of file