diff --git a/X121SMCEA/Signals/x-121.smc.xind.signal.lib.mq5 b/X121SMCEA/Signals/x-121.smc.xind.signal.lib.mq5 index ab7d7cc4..7e8f95be 100644 --- a/X121SMCEA/Signals/x-121.smc.xind.signal.lib.mq5 +++ b/X121SMCEA/Signals/x-121.smc.xind.signal.lib.mq5 @@ -359,6 +359,14 @@ bool HasXPVConditions( double cSMHKMin = MathMin(cSMHKOpen, cSMHKClose); double cSMHKMax = MathMax(cSMHKOpen, cSMHKClose); + // + double pSMHKOpen = cXConditions.xhkSMOpenBuffer[pIDX]; + double pSMHKHigh = cXConditions.xhkSMHighBuffer[pIDX]; + double pSMHKClose = cXConditions.xhkSMCloseBuffer[pIDX]; + double pSMHKLow = cXConditions.xhkSMLowBuffer[pIDX]; + double pSMHKMin = MathMin(pSMHKOpen, pSMHKClose); + double pSMHKMax = MathMax(pSMHKOpen, pSMHKClose); + // double atrUpperSM = cXConditions.atrUpperSMBuffer[cIDX]; double atrLowerSM = cXConditions.atrLowerSMBuffer[cIDX]; @@ -419,20 +427,20 @@ bool HasXPVConditions( // XHK ... // - bool isCBarClosedOverSMHK = + bool isPBarClosedOverSMHK = // - cBar.IsBullish() && - cBar.GetUp() > cSMHKMax && - cBar.GetDown() < cSMHKMin + pBar.IsBullish() && + pBar.GetUp() > pSMHKMax && + pBar.GetDown() < pSMHKMin // ; // - bool isCBarClosedUnderSMHK = + bool isPBarClosedUnderSMHK = // - cBar.IsBearish() && - cBar.GetUp() > cSMHKMax && - cBar.GetDown() < cSMHKMin + pBar.IsBearish() && + pBar.GetUp() > pSMHKMax && + pBar.GetDown() < pSMHKMin // ; @@ -447,7 +455,7 @@ bool HasXPVConditions( isBullish = // // false - isCBarClosedOverSMHK + isPBarClosedOverSMHK // ; @@ -455,7 +463,7 @@ bool HasXPVConditions( isBearish = // // false - isCBarClosedUnderSMHK + isPBarClosedUnderSMHK // ; diff --git a/X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 b/X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 index 2b985ccf..55a44698 100644 --- a/X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 +++ b/X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 @@ -996,9 +996,9 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy // // Presentations ... - x121Inputs.xpvInputs.showSar = showAll || false; - x121Inputs.xpvInputs.showPeaks = showAll || false; - x121Inputs.xpvInputs.showVales = showAll || false; + x121Inputs.xpvInputs.showSar = showAll || true; + x121Inputs.xpvInputs.showPeaks = showAll || true; + x121Inputs.xpvInputs.showVales = showAll || true; x121Inputs.xpvInputs.showSupports = showAll || false; x121Inputs.xpvInputs.showGoldenZones = showAll || false; x121Inputs.xpvInputs.showResistances = showAll || false; @@ -1050,10 +1050,10 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy x121Inputs.xatrInputs.showAtrLower = showAll || false; x121Inputs.xatrInputs.showRSIChange = showAll || false; x121Inputs.xatrInputs.showPriceChange = showAll || false; - x121Inputs.xatrInputs.showSmoothedAtrUpper = showAll || false; - x121Inputs.xatrInputs.showSmoothedAtrLower = showAll || false; - x121Inputs.xatrInputs.showSmoothedRSIChange = showAll || false; - x121Inputs.xatrInputs.showSmoothedPriceChange = showAll || false; + x121Inputs.xatrInputs.showSmoothedAtrUpper = showAll || true; + x121Inputs.xatrInputs.showSmoothedAtrLower = showAll || true; + x121Inputs.xatrInputs.showSmoothedRSIChange = showAll || true; + x121Inputs.xatrInputs.showSmoothedPriceChange = showAll || true; // // XSTR ... @@ -1064,7 +1064,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy // // Presentations ... - x121Inputs.xstrInputs.showStr = showAll || false; + x121Inputs.xstrInputs.showStr = showAll || true; x121Inputs.xstrInputs.showStrUpper = showAll || false; x121Inputs.xstrInputs.showStrLower = showAll || false; @@ -1076,10 +1076,10 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy // // Presentations ... - x121Inputs.xcheInputs.showLE1 = showAll || false; - x121Inputs.xcheInputs.showSE1 = showAll || false; - x121Inputs.xcheInputs.showLE2 = showAll || false; - x121Inputs.xcheInputs.showSE2 = showAll || false; + x121Inputs.xcheInputs.showLE1 = showAll || true; + x121Inputs.xcheInputs.showSE1 = showAll || true; + x121Inputs.xcheInputs.showLE2 = showAll || true; + x121Inputs.xcheInputs.showSE2 = showAll || true; // // X3MA ... @@ -1109,9 +1109,9 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy // // Presentations ... - x121Inputs.xvwapInputs.showVWapFast = showAll || false; - x121Inputs.xvwapInputs.showVWapSlow = showAll || false; - x121Inputs.xvwapInputs.showVWapMedium = showAll || false; + x121Inputs.xvwapInputs.showVWapFast = showAll || true; + x121Inputs.xvwapInputs.showVWapSlow = showAll || true; + x121Inputs.xvwapInputs.showVWapMedium = showAll || true; // //