diff --git a/Experts/x-test-strategies.ea.mq5 b/Experts/x-test-strategies.ea.mq5 index 5614e3e9..3b1ba11c 100644 --- a/Experts/x-test-strategies.ea.mq5 +++ b/Experts/x-test-strategies.ea.mq5 @@ -46,8 +46,8 @@ double eaSLPoint = 500; // Static SL Point double eaR2R = 1.5; // Risk to Reward Ratio double eaAllowLong = true; // Allow Long Positions double eaAllowShort = true; // Allow Short Positions -int eaMaxAllowedLongs = 1; // Max Allowed Long Positions -int eaMaxAllowedShorts = 1; // Max Allowed Short Positions +int eaMaxAllowedLongs = 2; // Max Allowed Long Positions +int eaMaxAllowedShorts = 2; // Max Allowed Short Positions double eaMaxDrawdownPercentForOpenTrades = 3; // Max Drawdown Percent for Open Trades // @@ -289,7 +289,7 @@ bool InitialEA() // // Configure Recovery ... - eaTradeHandler.AllowRecover(true); + eaTradeHandler.AllowRecover(false); eaTradeHandler.RecoveryTPPoint(150); eaTradeHandler.MaxAllowedRecover(0); eaTradeHandler.MaxAllowedRecoveryVolume(0.1); diff --git a/Libraries/x-saherelm.xtrade.lib.mq5 b/Libraries/x-saherelm.xtrade.lib.mq5 index 12205858..d89d2d26 100644 --- a/Libraries/x-saherelm.xtrade.lib.mq5 +++ b/Libraries/x-saherelm.xtrade.lib.mq5 @@ -3439,11 +3439,13 @@ struct XTradeData // time = _signal.time; - symbol = _signal.symbol; entry = _signal.entry; + symbol = _signal.symbol; volume = _signal.volume; - provider = _signal.provider; period = _signal.period; + pushers = _signal.pushers; + provider = _signal.provider; + conditions = _signal.conditions; type = ToPositionType(_signal.type); // @@ -3735,6 +3737,8 @@ struct XTradeData ToString("Provider", provider) + ToString("Type", ToString(type)) + ToString("Time", time) + + // + // Attach Trade Info ... (onlySignals ? "" : @@ -3748,7 +3752,16 @@ struct XTradeData ToString("End Time", endTime) + ToString("Age", age) + ToString("Message", message) + - "-------------" + "\n" + + "" + // + ) + + // + // Attach Conditions to Signals ... + (!onlySignals + ? "" + : + // + "-------------" + "\n" + ToString("Pushers", pushers) + "Conditions:" + "\n" + "-------------" + "\n" +