From fb305bbaddc0f415a64a72a3c4c849ddbf1b13b5 Mon Sep 17 00:00:00 2001 From: Hadi Khazaee Asl Date: Sun, 23 Mar 2025 04:02:34 +0330 Subject: [PATCH] last ... --- .../Classes/x-121.smc.market.cycle.helper.class.mq5 | 6 +++--- X121SMCEA/Signals/x-121.smc.xwz.signal.lib.mq5 | 9 +++------ X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5 b/X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5 index cc5c4bbb..898e7710 100644 --- a/X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5 +++ b/X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5 @@ -2629,7 +2629,7 @@ struct X121SMCStrategyConditionParser // Rejected Box ... bool HasRejectedBoxConditions( ENUM_X_CYCLES cycle, - XBoxZone &box, + XSignalBox &box, ENUM_X_DIRECTION &dir, XSignalBox &waitingBoxes[], X121SMCStrategySignalProviderData &provider, @@ -2878,8 +2878,8 @@ struct X121SMCStrategyConditionParser : X_DIRECTION_BEARISH; // - box = selectedBox; - box.to = TimeCurrent(); + box = iSignalBox; + box.UpdateTo(TimeCurrent()); } // diff --git a/X121SMCEA/Signals/x-121.smc.xwz.signal.lib.mq5 b/X121SMCEA/Signals/x-121.smc.xwz.signal.lib.mq5 index 618ebbac..8ebbfcfc 100644 --- a/X121SMCEA/Signals/x-121.smc.xwz.signal.lib.mq5 +++ b/X121SMCEA/Signals/x-121.smc.xwz.signal.lib.mq5 @@ -1460,7 +1460,7 @@ struct X121SMCStrategyXWZWorkingZone // --------------------------------------------- // Rejected Box ... // --------------------------------------------- - bool useSenario1 = false; + bool useSenario1 = true; bool isSenario1Happend = false; bool isSenario1Bullish = false; bool isSenario1Bearish = false; @@ -1470,7 +1470,6 @@ struct X121SMCStrategyXWZWorkingZone isSenario1Happend = cParser.HasRejectedBoxConditions( X_CYCLE_DECISION, box, - holderBox, dir, waitingBoxes, provider, @@ -1611,9 +1610,7 @@ struct X121SMCStrategyXWZWorkingZone // if (!result) { - // box.Clean(); - holderBox.Clean(); } // @@ -2004,8 +2001,8 @@ struct X121SMCStrategyXWZWorkingZone if (has) { // - count = ArraySize(objects); - for (int i = 0; i < count; i++) + int objectsCount = ArraySize(objects); + for (int i = 0; i < objectsCount; i++) { mWorkingZoneObjects.Add(objects[i]); } diff --git a/X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 b/X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 index d65d3487..f1047088 100644 --- a/X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 +++ b/X121SMCEA/Strategy/x-121.smc.strategy.class.mq5 @@ -837,7 +837,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy // XVWAP ... x121Inputs.xvwapInputs.showVWapFast = showAll || true; x121Inputs.xvwapInputs.showVWapMedium = showAll || true; - x121Inputs.xvwapInputs.showVWapSlow = showAll || false; + x121Inputs.xvwapInputs.showVWapSlow = showAll || true; // // X3MA ...