saherelm/MQL5Data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

last ...

Browse Source
This commit is contained in:
saherelm
2024-12-31 20:35:20 +03:30
parent bd93f81ce1
commit f1c9610896
4 changed files with 82 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Experts/x-saherelm.x-121.smc.ea.mq5
+1 -1
View File
@@ -50,7 +50,7 @@ input int eaMaxAllowedLongs = 5; // Max Allowed Long
input int eaMaxAllowedShorts = 5; // Max Allowed Short Signals input int eaMaxAllowedShorts = 5; // Max Allowed Short Signals
input bool eaUseMaxAllowedSignalsPerSymbol = true; // Use Max Allowed Signal Types Per Symbol input bool eaUseMaxAllowedSignalsPerSymbol = true; // Use Max Allowed Signal Types Per Symbol
input double eaLastPositionProfitForAcceptNextInPoint = 30; // Last Position Profit In Points for Accept new Signal input double eaLastPositionProfitForAcceptNextInPoint = 30; // Last Position Profit In Points for Accept new Signal
input int eaDelaysBetweenTwoSignalsInBar = 10; // Delay between two Signals in Bars input int eaDelaysBetweenTwoSignalsInBar = 100; // Delay between two Signals in Bars
input double eaMaxAllowedSpread = 25; // Max Allowed Spread for Signalling input double eaMaxAllowedSpread = 25; // Max Allowed Spread for Signalling
input int eaMinRequiredVerificationForSpreadPass = 20; // Minimum Spread Verification for Signalling input int eaMinRequiredVerificationForSpreadPass = 20; // Minimum Spread Verification for Signalling
X121SMCEA/Classes/x-121.smc.x-tradehandler.class.mq5
+12 -1
View File
@@ -25,8 +25,8 @@
// //
#include "../../Classes/x-saherelm.x-alert.class.mq5" #include "../../Classes/x-saherelm.x-alert.class.mq5"
#include "../../Classes/x-saherelm.x-bar.analyser.class.mq5" #include "../../Classes/x-saherelm.x-bar.analyser.class.mq5"
#include "../../Classes/x-saherelm.x-trade.class.mq5"
#include "../../Classes/x-saherelm.x-poi.drawer.class.mq5" #include "../../Classes/x-saherelm.x-poi.drawer.class.mq5"
#include "../../Classes/x-saherelm.x-trade.class.mq5"
// //
// Definitions ... // Definitions ...
@@ -3555,6 +3555,9 @@ class XC121SMCTradeHandler : public XCBaseAlert
); );
} }
//
ResetProtections();
// //
string message = "Hedge (" + ToString(count) + ") Positions By: " + string message = "Hedge (" + ToString(count) + ") Positions By: " +
ToString(profitSummary) + " Successfully ..."; ToString(profitSummary) + " Successfully ...";
@@ -4071,6 +4074,14 @@ class XC121SMCTradeHandler : public XCBaseAlert
return result; return result;
} }
//
void ResetProtections()
{
//
ResumePausedSymbols();
Clean(mLastExecutedSignals);
}
// //
// End of XC121SMCTradeHandler Class ... // End of XC121SMCTradeHandler Class ...
}; };
X121SMCEA/Signals/x-121.smc.xtwpv.signal.lib.mq5
+1 -1
View File
@@ -1806,7 +1806,7 @@ bool DetectX121SMCXTWPVSiganlTrigger(
// //
conditions.sl = sl; conditions.sl = sl;
conditions.target = target; conditions.target = 0; // target;
conditions.triggerTime = cTime; conditions.triggerTime = cTime;
conditions.type = isBullish conditions.type = isBullish
? X_POSITION_TYPE_LONG ? X_POSITION_TYPE_LONG
X121SMCEA/Strategy/x-121.smc.strategy.class.mq5
+68 -68
View File
@@ -497,77 +497,77 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
// //
// Handle Required Drawings ... // Handle Required Drawings ...
// bool hasPivot = mXTWPVConditions.HasPivot(); bool hasPivot = mXTWPVConditions.HasPivot();
// bool hasPriceInsideZone = mXTWPVConditions.HasPriceInsideZones(); bool hasPriceInsideZone = mXTWPVConditions.HasPriceInsideZones();
// bool hasConsolidationZone = mXTWPVConditions.HasConsolidationZone(); bool hasConsolidationZone = mXTWPVConditions.HasConsolidationZone();
// bool canDraw = hasPivot || bool canDraw = hasPivot ||
// hasPriceInsideZone || hasPriceInsideZone ||
// hasConsolidationZone; hasConsolidationZone;
// if (canDraw) if (canDraw)
// { {
// // //
// ClearDraws(); ClearDraws();
// // //
// // Draw Consolidation Zone ... // Draw Consolidation Zone ...
// if (hasConsolidationZone) if (hasConsolidationZone)
// { {
// // //
// XCConsolidationZoneObject *iObj; XCConsolidationZoneObject *iObj;
// bool isCreated = mPOIDrawer.CreateConsolidationZone( bool isCreated = mPOIDrawer.CreateConsolidationZone(
// mXTWPVConditions.consolidationZone, mXTWPVConditions.consolidationZone,
// iObj // iObj //
// ); );
// if (isCreated) if (isCreated)
// { {
// AddObjectIfNotExists(iObj); AddObjectIfNotExists(iObj);
// } }
// } }
// // //
// // Draw Pivot Zone ... // Draw Pivot Zone ...
// if (hasPivot) if (hasPivot)
// { {
// // //
// XCBaseObject *drawnObjects[]; XCBaseObject *drawnObjects[];
// int drawnObjectsCount = DrawXTWPVPivotZone( int drawnObjectsCount = DrawXTWPVPivotZone(
// mXTWPVConditions, mXTWPVConditions,
// mPOIDrawer, mPOIDrawer,
// drawnObjects, drawnObjects,
// false, // Draw State ... false, // Draw State ...
// false, // Draw Ticks Zone ... false, // Draw Ticks Zone ...
// true, // Ignore SwingHighs ... true, // Ignore SwingHighs ...
// true, // Ignore SwingLows ... true, // Ignore SwingLows ...
// true, // Ignore SupportZones ... true, // Ignore SupportZones ...
// true, // Ignore ResistanceZones ... true, // Ignore ResistanceZones ...
// true, // Ignore SupplyZones ... true, // Ignore SupplyZones ...
// true, // Ignore DemandZones ... true, // Ignore DemandZones ...
// true, // Ignore BullishOrderBlocks ... true, // Ignore BullishOrderBlocks ...
// true, // Ignore BearishOrderBlocks ... true, // Ignore BearishOrderBlocks ...
// true, // Ignore BullishFairValueGaps ... true, // Ignore BullishFairValueGaps ...
// true, // Ignore BearishFairValueGaps ... true, // Ignore BearishFairValueGaps ...
// true, // Ignore BullishRejectionBars ... true, // Ignore BullishRejectionBars ...
// true, // Ignore BearishRejectionBars ... true, // Ignore BearishRejectionBars ...
// true, // Ignore BullishMomentumBars ... true, // Ignore BullishMomentumBars ...
// true // Ignore BearishMomentumBars ... true // Ignore BearishMomentumBars ...
// ); );
// AddObjectsIfNotExists(drawnObjects); AddObjectsIfNotExists(drawnObjects);
// } }
// // //
// // Draw Price Inside Zones ... // Draw Price Inside Zones ...
// if (hasPriceInsideZone) if (hasPriceInsideZone)
// { {
// // //
// XCBaseObject *drawnObjects[]; XCBaseObject *drawnObjects[];
// int drawnObjectsCount = DrawTWPVPriceInsideZones( int drawnObjectsCount = DrawTWPVPriceInsideZones(
// mXTWPVConditions, mXTWPVConditions,
// mPOIDrawer, mPOIDrawer,
// drawnObjects // drawnObjects //
// ); );
// AddObjectsIfNotExists(drawnObjects); AddObjectsIfNotExists(drawnObjects);
// } }
// } }
// //
result = isSetuped; result = isSetuped;