gavindiaz/mql5
1
0
Fork 0
mirror of https://github.com/softwaredevelop/mql5.git synced 2026-08-22 16:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(indicators):

Browse Source
This commit is contained in:
Toh4iem9
2025-12-28 11:12:57 +01:00
parent 434f0add24
commit edb5f828c7
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Indicators/MyIndicators/CCI_PercentB_Pro.mq5
+30 -28
View File
@@ -1,28 +1,29 @@
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| CCI_PercentB_Pro.mq5 | //| CCI_PercentB_Pro.mq5 |
//| Copyright 2025, xxxxxxxx| //| Copyright 2025, xxxxxxxx|
//| |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2025, xxxxxxxx"
#property version "1.00" #property version "2.00" // Refactored to use CCI Engine
#property description "PercentB Oscillator for the CCI Pro indicator. Shows the CCI's" #property description "RSI %B. Shows the position of the RSI line relative to its Bollinger Bands."
#property description "position relative to its Bollinger Bands."
#property indicator_separate_window #property indicator_separate_window
#property indicator_buffers 1 #property indicator_buffers 1
#property indicator_plots 1 #property indicator_plots 1
#property indicator_level1 0.0 #property indicator_level1 0.0
#property indicator_level2 50.0 #property indicator_level2 50
#property indicator_level3 100.0 #property indicator_level3 100
#property indicator_levelstyle STYLE_DOT #property indicator_levelstyle STYLE_DOT
#property indicator_minimum -10.0 #property indicator_minimum -10.0
#property indicator_maximum 110.0 #property indicator_maximum 110.0
#include <MyIncludes\CCI_PercentB_Calculator.mqh> #include <MyIncludes\CCI_PercentB_Calculator.mqh>
#property indicator_label1 "%B" //--- Plot 1: %B Line
#property indicator_label1 "CCI %B"
#property indicator_type1 DRAW_LINE #property indicator_type1 DRAW_LINE
#property indicator_color1 clrDeepSkyBlue #property indicator_color1 clrMediumPurple
#property indicator_style1 STYLE_SOLID
#property indicator_width1 1
//--- Input Parameters --- //--- Input Parameters ---
input group "CCI Settings" input group "CCI Settings"
@@ -30,7 +31,8 @@ input int InpCCIPeriod = 20;
input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_TYPICAL_STD; input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_TYPICAL_STD;
input group "Overlay Settings" input group "Overlay Settings"
input int InpMAPeriod = 14; // Used as BBands center line input int InpMAPeriod = 14; // Used as BBands center line
input ENUM_MA_METHOD InpMAMethod = MODE_SMA; // Used as BBands center line // UPDATED: Use ENUM_MA_TYPE
input ENUM_MA_TYPE InpMAMethod = SMA; // Used as BBands center line
input int InpBandsPeriod = 14; input int InpBandsPeriod = 14;
input double InpBandsDev = 2.0; input double InpBandsDev = 2.0;
@@ -40,31 +42,26 @@ double BufferPercentB[];
//--- Global calculator --- //--- Global calculator ---
CCCI_PercentBCalculator *g_calculator; CCCI_PercentBCalculator *g_calculator;
//+------------------------------------------------------------------+
//| OnInit |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnInit() int OnInit()
{ {
SetIndexBuffer(0, BufferPercentB, INDICATOR_DATA); SetIndexBuffer(0, BufferPercentB, INDICATOR_DATA);
ArraySetAsSeries(BufferPercentB, false); ArraySetAsSeries(BufferPercentB, false);
if(InpSourcePrice <= PRICE_HA_CLOSE) g_calculator = new CCCI_PercentBCalculator();
{
g_calculator = new CCCI_PercentBCalculator_HA();
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI %%B HA(%d)", InpCCIPeriod));
}
else
{
g_calculator = new CCCI_PercentBCalculator();
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI %%B(%d)", InpCCIPeriod));
}
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpCCIPeriod, InpMAPeriod, InpMAMethod, InpBandsPeriod, InpBandsDev)) bool use_ha = (InpSourcePrice <= PRICE_HA_CLOSE);
if(CheckPointer(g_calculator) == POINTER_INVALID ||
!g_calculator.Init(InpCCIPeriod, InpMAPeriod, InpMAMethod, InpBandsPeriod, InpBandsDev, use_ha))
{ {
Print("Failed to create or initialize CCI PercentB Calculator object."); Print("Failed to create or initialize CCI PercentB Calculator object.");
return(INIT_FAILED); return(INIT_FAILED);
} }
string type = use_ha ? " HA" : "";
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CCI %%B%s(%d)", type, InpCCIPeriod));
int draw_begin = InpCCIPeriod + InpBandsPeriod; int draw_begin = InpCCIPeriod + InpBandsPeriod;
PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, draw_begin); PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, draw_begin);
IndicatorSetInteger(INDICATOR_DIGITS, 2); IndicatorSetInteger(INDICATOR_DIGITS, 2);
@@ -72,8 +69,6 @@ int OnInit()
return(INIT_SUCCEEDED); return(INIT_SUCCEEDED);
} }
//+------------------------------------------------------------------+
//| OnDeinit |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
void OnDeinit(const int reason) void OnDeinit(const int reason)
{ {
@@ -82,9 +77,16 @@ void OnDeinit(const int reason)
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| OnCalculate | 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;
@@ -95,7 +97,7 @@ int OnCalculate(const int rates_total, const int, const datetime&[], const doubl
else else
price_type = (ENUM_APPLIED_PRICE)InpSourcePrice; price_type = (ENUM_APPLIED_PRICE)InpSourcePrice;
g_calculator.Calculate(rates_total, open, high, low, close, price_type, BufferPercentB); g_calculator.Calculate(rates_total, prev_calculated, price_type, open, high, low, close, BufferPercentB);
return(rates_total); return(rates_total);
} }