diff --git a/Experts/x-test-strategies.ea.mq5 b/Experts/x-test-strategies.ea.mq5 index ef12683f..7f267f0f 100644 --- a/Experts/x-test-strategies.ea.mq5 +++ b/Experts/x-test-strategies.ea.mq5 @@ -59,7 +59,7 @@ bool eaIgnoreSL = false; // Ignore SL double eaR2R = 1.5; // Risk to Reward Ratio // -bool eaMultiSymbol = true; // Use Multi Symbol +bool eaMultiSymbol = false; // Use Multi Symbol bool eaUseMaxAllowedTradesPerSymbol = true; // Use Max Allowed Trades Per Symbol string eaSymbols = "EURUSDb,USDJPYb"; // Trading Symbols // string eaSymbols = "EURUSDb,USDJPYb,USDCHFb,GBPUSDb,XAUUSDb,XAGUSDb"; // Trading Symbols diff --git a/Indicators/x-saherelm.xchtd.mq5 b/Indicators/x-saherelm.xchtd.mq5 index 8b30a6ef..08caf78b 100644 --- a/Indicators/x-saherelm.xchtd.mq5 +++ b/Indicators/x-saherelm.xchtd.mq5 @@ -80,11 +80,11 @@ input bool showHind = true; // Show Hind Cycle // Buffers ... // -#property indicator_separate_window +#property indicator_chart_window // #property indicator_buffers 10 -#property indicator_plots 10 +#property indicator_plots 0 // // Current ... @@ -888,7 +888,9 @@ void CalculateCycle( // _bull[bar_index] = bullRange; _bear[bar_index] = bearRange; - } else if (mode == XCHTD_STRONG_MODE) { + } + else if (mode == XCHTD_STRONG_MODE) + { // _bull[bar_index] = bullPower + bullPressure; _bear[bar_index] = bearPower + bearPressure; diff --git a/Indicators/x-saherelm.xchvlm.mq5 b/Indicators/x-saherelm.xchvlm.mq5 index 6916c09d..62c190ea 100644 --- a/Indicators/x-saherelm.xchvlm.mq5 +++ b/Indicators/x-saherelm.xchvlm.mq5 @@ -76,11 +76,11 @@ input bool showHind = true; // Show Hind Cycle #define bearishColorIDX 2 // -#property indicator_separate_window +#property indicator_chart_window // #property indicator_buffers 10 -#property indicator_plots 10 +#property indicator_plots 0 // // Current ... diff --git a/Strategies/x-saherelm.xchkm.strategy.mq5 b/Strategies/x-saherelm.xchkm.strategy.mq5 index d8448bc0..b094faa9 100644 --- a/Strategies/x-saherelm.xchkm.strategy.mq5 +++ b/Strategies/x-saherelm.xchkm.strategy.mq5 @@ -27,8 +27,10 @@ #include "../Helpers/x-saherelm.xpv.helper.mq5" #include "../Helpers/x-saherelm.xchm.helper.mq5" #include "../Helpers/x-saherelm.xchhk.helper.mq5" +#include "../Helpers/x-saherelm.xchtd.helper.mq5" #include "../Helpers/x-saherelm.xchche.helper.mq5" #include "../Helpers/x-saherelm.xchstr.helper.mq5" +#include "../Helpers/x-saherelm.xchvlm.helper.mq5" // // Base Classes ... @@ -821,14 +823,19 @@ protected: XSCXPVHelper *pvHelper; // - // XHK ... + // XCHMA ... + XCHMInputs chmInputs; + XSCXCHMHelper *chmHelper; + + // + // XCHHK ... XCHHKInputs chhkInputs; XSCXCHHKHelper *chhkHelper; // - // XCHMA ... - XCHMInputs chmInputs; - XSCXCHMHelper *chmHelper; + // XCHTD ... + XCHTDInputs chtdInputs; + XSCXCHTDHelper *chtdHelper; // // XSTR ... @@ -840,6 +847,11 @@ protected: XCHCHEInputs chcheInputs; XSCXCHCHEHelper *chcheHelper; + // + // XCHVLM ... + XCHVLMInputs chvlmInputs; + XSCXCHVLMHelper *chvlmHelper; + // // Private ... private: @@ -993,6 +1005,37 @@ private: chhkInputs // ); + // + // XCHTD ... + + // + chtdInputs.Default(); + + // + chtdInputs.scMethod = scMethod; + chtdInputs.scPeriod = scPeriod; + chtdInputs.mcMethod = mcMethod; + chtdInputs.mcPeriod = mcPeriod; + chtdInputs.lcMethod = lcMethod; + chtdInputs.lcPeriod = lcPeriod; + chtdInputs.hcMethod = hcMethod; + chtdInputs.hcPeriod = hcPeriod; + + // + chtdInputs.showCurrent = false; + chtdInputs.showShort = false; + chtdInputs.showMedium = false; + chtdInputs.showLong = false; + chtdInputs.showHind = false; + + // + chtdHelper = new XSCXCHTDHelper(); + chtdHelper.Init( + mSymbol, + mPeriod, + chtdInputs // + ); + // // XCHSTR ... @@ -1030,6 +1073,16 @@ private: // chcheInputs.Default(); + // + chcheInputs.scMethod = scMethod; + chcheInputs.scPeriod = scPeriod; + chcheInputs.mcMethod = mcMethod; + chcheInputs.mcPeriod = mcPeriod; + chcheInputs.lcMethod = lcMethod; + chcheInputs.lcPeriod = lcPeriod; + chcheInputs.hcMethod = hcMethod; + chcheInputs.hcPeriod = hcPeriod; + // chcheInputs.showCurrentLE1 = false; chcheInputs.showCurrentLE2 = false; @@ -1059,6 +1112,37 @@ private: mPeriod, chcheInputs // ); + + // + // XCHVLM ... + + // + chvlmInputs.Default(); + + // + chvlmInputs.scMethod = scMethod; + chvlmInputs.scPeriod = scPeriod; + chvlmInputs.mcMethod = mcMethod; + chvlmInputs.mcPeriod = mcPeriod; + chvlmInputs.lcMethod = lcMethod; + chvlmInputs.lcPeriod = lcPeriod; + chvlmInputs.hcMethod = hcMethod; + chvlmInputs.hcPeriod = hcPeriod; + + // + chvlmInputs.showCurrent = false; + chvlmInputs.showShort = false; + chvlmInputs.showMedium = false; + chvlmInputs.showLong = false; + chvlmInputs.showHind = false; + + // + chvlmHelper = new XSCXCHVLMHelper(); + chvlmHelper.Init( + mSymbol, + mPeriod, + chvlmInputs // + ); } //