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

Refactor all new MQL5 Version Compiling Issues ...

Browse Source
This commit is contained in:
saherelm
2025-08-05 17:32:55 +03:30
parent f260ccc8de
commit 8f76391671
15 changed files with 419 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XCATBEA/Classes/xcatbea.x-trade.manager.class.mq5
+77 -61
View File
@@ -54,6 +54,10 @@ string ToString(ENUM_XCATBEA_TRADE_RESTRICTION_PERIOD value)
//
return result;
}
string ToXString(ENUM_XCATBEA_TRADE_RESTRICTION_PERIOD value)
{
return ToString(value);
}
//
enum ENUM_XCATBEA_TRADE_FINALIZATION
@@ -77,6 +81,10 @@ string ToString(ENUM_XCATBEA_TRADE_FINALIZATION value)
//
return result;
}
string ToXString(ENUM_XCATBEA_TRADE_FINALIZATION value)
{
return ToString(value);
}
//
// Position Selecting ...
@@ -129,12 +137,20 @@ bool IsValid(ENUM_XCATBEA_POSITION_SELECT_TYPES value)
{
return value != XCATBEA_POSITION_SELECT_NONE;
}
bool IsSpecifiedValid(ENUM_XCATBEA_POSITION_SELECT_TYPES value)
{
return IsValid(value);
}
//
string ToString(ENUM_XCATBEA_POSITION_SELECT_TYPES value)
{
return EnumToString(value);
}
string ToXString(ENUM_XCATBEA_POSITION_SELECT_TYPES value)
{
return ToString(value);
}
/**
* Select Specified Position's Related Position(s)
@@ -1016,7 +1032,7 @@ struct XCATBEASymbolInfo
bool result = false;
//
result = IsValid(symbol);
result = IsSpecifiedValid(symbol);
//
return result;
@@ -1057,15 +1073,15 @@ struct XCATBEASymbolInfo
"-------------------" + "\n" +
"Restrictions: " + "\n" +
"-------------------" + "\n" +
"Symbol: " + ToString(symbol) + "\n" +
"Period: " + ToString(period) + "\n" +
"Symbol: " + ToXString(symbol) + "\n" +
"Period: " + ToXString(period) + "\n" +
"Start: " + ToFormatString(managedStart) + "\n" +
"Balance: " + ToString(managedBalance) + "\n" +
"Balance: " + ToXString(managedBalance) + "\n" +
"-------------------" + "\n" +
"Trades: " + ToString(managedTrades) + "\n" +
"SL: " + ToString(managedSLs) + "\n" +
"TP: " + ToString(managedTPs) + "\n" +
"Profit: " + ToString(managedProfits) + "\n" +
"Trades: " + ToXString(managedTrades) + "\n" +
"SL: " + ToXString(managedSLs) + "\n" +
"TP: " + ToXString(managedTPs) + "\n" +
"Profit: " + ToXString(managedProfits) + "\n" +
"";
//
@@ -1113,8 +1129,8 @@ struct XCATBEATradeSession
bool result = false;
//
result = IsValid(start) &&
IsValid(end);
result = IsSpecifiedValid(start) &&
IsSpecifiedValid(end);
if (!result)
{
return result;
@@ -1178,7 +1194,7 @@ struct XCATBEASymbolSession
{
//
symbol = NULL;
Clean(sessions);
SpecifiedClean(sessions);
//
ZeroMemory(this);
@@ -1192,7 +1208,7 @@ struct XCATBEASymbolSession
bool result = false;
//
result = IsValid(symbol);
result = IsSpecifiedValid(symbol);
//
return result;
@@ -1363,15 +1379,15 @@ struct XCATBEATrade
//
result =
//
ToString("Swap", swap) +
ToString("Profit", profit) +
ToString("Commission", commission) +
ToString("Finalize", ToString(finalize)) +
ToString("PositionID", positionID) +
ToString("----------------") + "\n" +
ToString("Signaled At", ToFormatString(signaledAt)) +
ToString("Executed At", ToFormatString(executedAt)) +
ToString("Finalized At", ToFormatString(finalizedAt))
ToXString("Swap", swap) +
ToXString("Profit", profit) +
ToXString("Commission", commission) +
ToXString("Finalize", ToXString(finalize)) +
ToXString("PositionID", positionID) +
ToXString("----------------") + "\n" +
ToXString("Signaled At", ToFormatString(signaledAt)) +
ToXString("Executed At", ToFormatString(executedAt)) +
ToXString("Finalized At", ToFormatString(finalizedAt))
//
;
@@ -1454,9 +1470,9 @@ struct XCATBEATrade
{
//
result +=
ToString("----------------") + "\n" +
ToString("Summary: ") + "\n" +
ToString("----------------") + "\n" +
ToXString("----------------") + "\n" +
ToXString("Summary: ") + "\n" +
ToXString("----------------") + "\n" +
summary + "\n";
}
@@ -1465,9 +1481,9 @@ struct XCATBEATrade
{
//
result +=
ToString("----------------") + "\n" +
ToString("Signal: ") + "\n" +
ToString("----------------") + "\n" +
ToXString("----------------") + "\n" +
ToXString("Signal: ") + "\n" +
ToXString("----------------") + "\n" +
signalSummary + "\n";
}
@@ -1476,9 +1492,9 @@ struct XCATBEATrade
{
//
result +=
ToString("----------------") + "\n" +
ToString("Conditions: ") + "\n" +
ToString("----------------") + "\n" +
ToXString("----------------") + "\n" +
ToXString("Conditions: ") + "\n" +
ToXString("----------------") + "\n" +
conditionsSummary + "\n";
}
@@ -1560,7 +1576,7 @@ struct XCATBEATrade
}
}
}
Clean(condParts);
SpecifiedClean(condParts);
}
else
{
@@ -1570,19 +1586,19 @@ struct XCATBEATrade
//
result =
"(" + "\n" +
"\\" + "\\" + " " + ToString("Type", ToString(signal.type)) +
"\\" + "\\" + " " + ToString("Profit", profit) +
"\\" + "\\" + " " + ToString("Finalize", ToString(finalize)) +
"\\" + "\\" + " " + ToString("PositionID", positionID) +
"\\" + "\\" + " " + ToString("----------------") + "\n" +
"\\" + "\\" + " " + ToString("Signaled At", ToFormatString(signaledAt)) +
"\\" + "\\" + " " + ToString("Executed At", ToFormatString(executedAt)) +
"\\" + "\\" + " " + ToString("Finalized At", ToFormatString(finalizedAt)) +
"\\" + "\\" + " " + ToString("----------------") + "\n" +
"\\" + "\\" + " " + ToString("Scores:") + "\n" +
"\\" + "\\" + " " + ToString("Bullish", bullishScore) +
"\\" + "\\" + " " + ToString("Bearish", bearishScore) +
"\\" + "\\" + " " + ToString("----------------") + "\n" +
"\\" + "\\" + " " + ToXString("Type", ToXString(signal.type)) +
"\\" + "\\" + " " + ToXString("Profit", profit) +
"\\" + "\\" + " " + ToXString("Finalize", ToXString(finalize)) +
"\\" + "\\" + " " + ToXString("PositionID", positionID) +
"\\" + "\\" + " " + ToXString("----------------") + "\n" +
"\\" + "\\" + " " + ToXString("Signaled At", ToFormatString(signaledAt)) +
"\\" + "\\" + " " + ToXString("Executed At", ToFormatString(executedAt)) +
"\\" + "\\" + " " + ToXString("Finalized At", ToFormatString(finalizedAt)) +
"\\" + "\\" + " " + ToXString("----------------") + "\n" +
"\\" + "\\" + " " + ToXString("Scores:") + "\n" +
"\\" + "\\" + " " + ToXString("Bullish", bullishScore) +
"\\" + "\\" + " " + ToXString("Bearish", bearishScore) +
"\\" + "\\" + " " + ToXString("----------------") + "\n" +
conditionsStr +
(IsValid(conditionsStr) ? "" : "") +
") && ";
@@ -2206,12 +2222,12 @@ class XCXCATBEATradeManager : public XCBase
//
string message = prefix +
ToString(iPosition.type) +
ToXString(iPosition.type) +
" Position: " +
ToString(iPosition.ticket) +
ToXString(iPosition.ticket) +
(isRFDone ? " RF" : "") +
(isPCDone ? " PC" : "") +
" On Traget: " + ToString(jTarget.target) +
" On Traget: " + ToXString(jTarget.target) +
" Successfully ...";
HandleReportProtector(message);
}
@@ -2655,7 +2671,7 @@ class XCXCATBEATradeManager : public XCBase
//
// Handle Balance Reporting ...
string prefix = "TP: " + ToString(trades[idx].profit);
string prefix = "TP: " + ToXString(trades[idx].profit);
HandleReportBalance(prefix);
//
@@ -2709,7 +2725,7 @@ class XCXCATBEATradeManager : public XCBase
//
// Handle Balance Reporting ...
string prefix = "SL: " + ToString(trades[idx].profit);
string prefix = "SL: " + ToXString(trades[idx].profit);
HandleReportBalance(prefix);
//
@@ -2803,7 +2819,7 @@ class XCXCATBEATradeManager : public XCBase
? "Profit"
: "Loss") +
": " +
ToString(trades[idx].profit);
ToXString(trades[idx].profit);
HandleReportBalance(prefix);
//
@@ -2850,7 +2866,7 @@ class XCXCATBEATradeManager : public XCBase
{
//
// Handle Balance Reporting ...
string prefix = "Partially Closed: " + ToString(ticket);
string prefix = "Partially Closed: " + ToXString(ticket);
//
// Handle Balance Reporting ...
@@ -2887,7 +2903,7 @@ class XCXCATBEATradeManager : public XCBase
if (result)
{
//
string message = prefix + "Force Close (" + ToString(closedsCount) + ") Trades at Specified Time ...";
string message = prefix + "Force Close (" + ToXString(closedsCount) + ") Trades at Specified Time ...";
HandleReportProtector(message);
}
@@ -3100,7 +3116,7 @@ class XCXCATBEATradeManager : public XCBase
result = collector
.GetFilePath("Conditions" + "\\" +
trade.signal.symbol + "\\" +
ToString(trade.signal.period) + "_wins");
ToXString(trade.signal.period) + "_wins");
//
return result;
@@ -3116,7 +3132,7 @@ class XCXCATBEATradeManager : public XCBase
result = collector
.GetFilePath("Conditions" + "\\" +
trade.signal.symbol + "\\" +
ToString(trade.signal.period) + "_losts");
ToXString(trade.signal.period) + "_losts");
//
return result;
@@ -3160,7 +3176,7 @@ class XCXCATBEATradeManager : public XCBase
(IsValid(prefix)
? prefix + " | "
: "") +
"Account Balance: " + ToString(balance) + currency;
"Account Balance: " + ToXString(balance) + currency;
alert.SendAlert(message);
}
@@ -3263,14 +3279,14 @@ class XCXCATBEATradeManager : public XCBase
// Generate Content ...
string content = "";
content +=
ToString("----------------") + "\n" +
ToString("Signal: ") + "\n" +
ToString("----------------") + "\n" +
ToXString("----------------") + "\n" +
ToXString("Signal: ") + "\n" +
ToXString("----------------") + "\n" +
signal.ToString() + "\n";
content +=
ToString("----------------") + "\n" +
ToString("Conditions: ") + "\n" +
ToString("----------------") + "\n" +
ToXString("----------------") + "\n" +
ToXString("Conditions: ") + "\n" +
ToXString("----------------") + "\n" +
signal.conditions + "\n";
//