diff --git a/Indicators/MyIndicators/Authors/Ehlers/1_Smoothers/Butterworth_Filter_Pro.mq5 b/Indicators/MyIndicators/Authors/Ehlers/1_Smoothers/Butterworth_Filter_Pro.mq5 index bfd9722..f4f637e 100644 --- a/Indicators/MyIndicators/Authors/Ehlers/1_Smoothers/Butterworth_Filter_Pro.mq5 +++ b/Indicators/MyIndicators/Authors/Ehlers/1_Smoothers/Butterworth_Filter_Pro.mq5 @@ -1,10 +1,9 @@ //+------------------------------------------------------------------+ //| Butterworth_Filter_Pro.mq5 | //| Copyright 2025, xxxxxxxx| -//| | //+------------------------------------------------------------------+ #property copyright "Copyright 2025, xxxxxxxx" -#property version "1.10" // Adapted to new universal calculator +#property version "2.00" // Optimized for incremental calculation #property description "John Ehlers' Higher-Order Butterworth Filter." #property indicator_chart_window @@ -14,14 +13,14 @@ #property indicator_type1 DRAW_LINE #property indicator_color1 clrMediumPurple #property indicator_style1 STYLE_SOLID -#property indicator_width1 1 +#property indicator_width1 2 #include //--- Input Parameters --- -input int InpPeriod = 20; // Critical Period for the filter -input ENUM_BUTTERWORTH_POLES InpPoles = POLES_TWO; // Number of poles (2 or 3) -input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD; +input int InpPeriod = 20; // Critical Period for the filter +input ENUM_BUTTERWORTH_POLES InpPoles = POLES_TWO; // Number of poles (2 or 3) +input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD; //--- Indicator Buffers --- double BufferFilter[]; @@ -46,14 +45,13 @@ int OnInit() IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("Butterworth(%d,%d)", InpPeriod, (int)InpPoles)); } -// CORRECTED: Pass the source type to the Init function if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpPeriod, InpPoles, SOURCE_PRICE)) { Print("Failed to initialize Butterworth Calculator."); return(INIT_FAILED); } - PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, InpPeriod); + PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, 3); IndicatorSetInteger(INDICATOR_DIGITS, _Digits); return(INIT_SUCCEEDED); @@ -67,7 +65,16 @@ 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 &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) return 0; @@ -78,7 +85,7 @@ int OnCalculate(const int rates_total, const int, const datetime&[], const doubl else price_type = (ENUM_APPLIED_PRICE)InpSourcePrice; - g_calculator.Calculate(rates_total, price_type, open, high, low, close, BufferFilter); + g_calculator.Calculate(rates_total, prev_calculated, price_type, open, high, low, close, BufferFilter); return(rates_total); } //+------------------------------------------------------------------+