diff --git a/Classes/x-saherelm.x121.setup.xea.mq5 b/Classes/x-saherelm.x121.setup.xea.mq5 index a7b37669..8bc681d0 100644 --- a/Classes/x-saherelm.x121.setup.xea.mq5 +++ b/Classes/x-saherelm.x121.setup.xea.mq5 @@ -4660,7 +4660,14 @@ public: // Cutom Signal Execution ... if (IsValidSize(result)) { - HandleSignals(eSignals); + // + Copy( + eSignals, + signals // + ); + + // + HandleSignals(signals); } // diff --git a/Experts/x-saherelm.x121.ea.mq5 b/Experts/x-saherelm.x121.ea.mq5 index 49468ecc..4adfecb1 100644 --- a/Experts/x-saherelm.x121.ea.mq5 +++ b/Experts/x-saherelm.x121.ea.mq5 @@ -39,19 +39,18 @@ input int x121EASlippage = 10; // Slippgae // // Signals ... -// EURUSDb,GBPUSDb,XAUUSDb,USDCHFb,USDJPYb input group "Signals"; -//,USDCHFb,EURCHFb,USDJPYb,EURJPYb,GBPUSDb -// EURUSDb,USDCHFb,EURCHFb,USDJPYb,EURJPYb,GBPUSDb -// EURUSDb,USDCHFb,EURCHFb,USDJPYb,EURJPYb,GBPUSDb,XAUUSDb,NZDUSDb,AUDUSDb,USDCADb,BTCUSD,ETHUSD input string x121EASymbols = "EURUSDb,USDCHFb,EURCHFb,USDJPYb,EURJPYb,GBPUSDb"; // Symbols input bool x121EAUseAllSymbols = false; // Use All Available Symbols -input bool x121EAUseAllWatchListSymbols = false; // Use All WatchList Symbols input bool x121EAAllowLong = true; // Allow Long Trades input bool x121EAAllowShort = true; // Allow Short Trades -input bool x121EAExecuteSignalsOnBreakout = false; // Execute Signals On Breakouts +input int x121EAStartSignallingHoure = 3; // Start Signalling at Specific Time +input int x121EAEndSignallingHoure = 22; // End Signalling at Specific Time +input int x121EACloseOnSpecificTime = -1; // Close All Trades in Specific Time input int x121EADelayBetweenTwoSignal = 10; // Delay Between two Same Signals input int x121EAReuiredSignalVerifications = 4; // Required Verifications for Signals +input bool x121EAUseAllWatchListSymbols = false; // Use All WatchList Symbols +input bool x121EAExecuteSignalsOnBreakout = false; // Execute Signals On Breakouts input bool x121EAGetVerificationFromOtherTimeFrames = true; // Get Verifications from Other Time Frames // @@ -62,21 +61,14 @@ input double x121EATPPoint = 1000; // TP Poi input double x121EASLPoint = 1000; // SL Point input bool x121EAIgnoreSL = false; // Ignore Calculated SL input bool x121EAIgnoreTP = false; // Ignore Calculated TP +input bool x121EACloseOnOpposit = false; // Close all Positions on Opposit input int x121EAMaxAllowedTrades = 0; // Max Allowed Positions Per Symbol -input int x121EAMinFreeMargingForOpenTrades = 900; // Min Margin For Opening Trades input bool x121EAUseMaxAllowedPerDirection = true; // Use Max Allowed Positions Per Direction -input bool x121EAIncreaseNextSignalsVolume = false; // Increase Next Signals Volume +input int x121EAMinFreeMargingForOpenTrades = 900; // Min Margin For Opening Trades +input bool x121EAIncreaseNextSignalsVolume = true; // Increase Next Signals Volume input double x121EAIncreaseNextSignalsVolumeMultiplier = 1; // Increase Next Signals Volume Multiplier input bool x121EAAcceptNextDirectionalSignalsWhenFirstInProfit = true; // Accept Same Symbol/Type Signal when Last in Profit -// -// Protection ... -input group "Signalling"; -input int x121EAStartSignallingHoure = 3; // Start Signalling at Specific Time -input int x121EAEndSignallingHoure = 22; // End Signalling at Specific Time -input int x121EACloseOnSpecificTime = -1; // Close All Trades in Specific Time -input bool x121EACloseOnOpposit = false; // Close all Positions on Opposit - // input group "Trailling"; input bool x121EAAllowTrailStop = true; // Enable Trailling Stop Losses @@ -92,7 +84,7 @@ input bool x121EAAllowSupport = false; // Allow Support Signals input bool x121EASupportOnlyForces = false; // Support Only Force Signals double x121EASupportDistance = 0; // Supporting Distance input int x121EAMaxNumberOfSupports = 0; // Max Number of Support Signals -input double x121EASupportVolumeMultiplier = 2; // Support Signals Volume Multiplier +input double x121EASupportVolumeMultiplier = 0; // Support Signals Volume Multiplier input double x121EAMaxAllowedSupportVolume = 0; // Max Allowed Support Signals Volume // @@ -100,8 +92,8 @@ input group "Grid"; input bool x121EAAllowGrid = false; // Allow Grid Signals input bool x121EAGridOnlyForces = false; // Grid Only Force Signals input int x121EAMaxNumberOfGrids = 0; // Max Number of Grid Signals -input double x121EAGridDistance = 200; // Grid Distance -input double x121EAGridVolumeMultiplier = 2; // Grid Volume Multiplier +input double x121EAGridDistance = 0; // Grid Distance +input double x121EAGridVolumeMultiplier = 0; // Grid Volume Multiplier input double x121EAMaxAllowedGridVolume = 0; // Max Allowed Grid Signals Volume //