gavindiaz/mql5
1
0
Fork 0
mirror of https://github.com/softwaredevelop/mql5.git synced 2026-08-25 10:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(indicators): Separate Signal MA Type

Browse Source
This commit is contained in:
Toh4iem9
2026-01-01 09:33:52 +01:00
parent 6f088af747
commit 9a3c1e1e01
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Indicators/MyIndicators/DMIStochastic_Pro.mq5
+8 -13
View File
@@ -1,13 +1,12 @@
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| DMIStochastic_Pro.mq5 | //| DMIStochastic_Pro.mq5 |
//| Copyright 2025, xxxxxxxx| //| Copyright 2025, xxxxxxxx|
//| |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2025, xxxxxxxx"
#property link "" #property version "2.10" // Separate Signal MA Type
#property version "1.21" // Fixed enum location for compilation
#property description "Barbara Star's DMI Stochastic Oscillator. Supports Standard and Heikin Ashi sources." #property description "Barbara Star's DMI Stochastic Oscillator. Supports Standard and Heikin Ashi sources."
//--- Indicator Window and Plot Properties ---
#property indicator_separate_window #property indicator_separate_window
#property indicator_buffers 2 #property indicator_buffers 2
#property indicator_plots 2 #property indicator_plots 2
@@ -32,7 +31,6 @@
#property indicator_width2 1 #property indicator_width2 1
//--- Include the calculator engine --- //--- Include the calculator engine ---
// The enums are now defined inside this .mqh file
#include <MyIncludes\DMIStochastic_Calculator.mqh> #include <MyIncludes\DMIStochastic_Calculator.mqh>
//--- Input Parameters --- //--- Input Parameters ---
@@ -41,8 +39,10 @@ input ENUM_DMI_OSC_TYPE InpOscType = OSC_PDI_MINUS_NDI; // Oscillator
input int InpDMIPeriod = 10; // DMI Period input int InpDMIPeriod = 10; // DMI Period
input int InpFastKPeriod = 10; // Stochastic %K Period input int InpFastKPeriod = 10; // Stochastic %K Period
input int InpSlowKPeriod = 3; // Stochastic %K Slowing input int InpSlowKPeriod = 3; // Stochastic %K Slowing
input ENUM_MA_TYPE InpStochMethod = SMA; // MA Method for %K
input int InpSmoothPeriod = 3; // Stochastic %D Period (Signal) input int InpSmoothPeriod = 3; // Stochastic %D Period (Signal)
input ENUM_MA_METHOD InpStochMethod = MODE_SMA; // MA Method for Stochastic // NEW: Separate MA Type for Signal
input ENUM_MA_TYPE InpSignalMethod = SMA; // MA Method for %D
//--- Indicator Buffers --- //--- Indicator Buffers ---
double BufferK[]; double BufferK[];
@@ -51,8 +51,6 @@ double BufferD[];
//--- Global calculator object --- //--- Global calculator object ---
CDMIStochasticCalculator *g_calculator; CDMIStochasticCalculator *g_calculator;
//+------------------------------------------------------------------+
//| Custom indicator initialization function |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnInit() int OnInit()
{ {
@@ -70,7 +68,8 @@ int OnInit()
g_calculator = new CDMIStochasticCalculator(); g_calculator = new CDMIStochasticCalculator();
} }
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpDMIPeriod, InpFastKPeriod, InpSlowKPeriod, InpSmoothPeriod, InpStochMethod, InpOscType)) // Pass both MA types to Init
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpDMIPeriod, InpFastKPeriod, InpSlowKPeriod, InpSmoothPeriod, InpStochMethod, InpSignalMethod, InpOscType))
{ {
Print("Failed to create or initialize DMI Stochastic Calculator."); Print("Failed to create or initialize DMI Stochastic Calculator.");
return(INIT_FAILED); return(INIT_FAILED);
@@ -88,8 +87,6 @@ int OnInit()
return(INIT_SUCCEEDED); return(INIT_SUCCEEDED);
} }
//+------------------------------------------------------------------+
//| Custom indicator deinitialization function |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
void OnDeinit(const int reason) void OnDeinit(const int reason)
{ {
@@ -97,8 +94,6 @@ void OnDeinit(const int reason)
delete g_calculator; delete g_calculator;
} }
//+------------------------------------------------------------------+
//| Custom indicator calculation function |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnCalculate(const int rates_total, int OnCalculate(const int rates_total,
const int prev_calculated, const int prev_calculated,
@@ -114,7 +109,7 @@ int OnCalculate(const int rates_total,
if(CheckPointer(g_calculator) == POINTER_INVALID) if(CheckPointer(g_calculator) == POINTER_INVALID)
return(0); return(0);
g_calculator.Calculate(rates_total, open, high, low, close, BufferK, BufferD); g_calculator.Calculate(rates_total, prev_calculated, open, high, low, close, BufferK, BufferD);
return(rates_total); return(rates_total);
} }