prepare x5121 ...

This commit is contained in:
2024-05-23 08:37:53 +03:30
parent 25b027d2aa
commit a34e2351da
6 changed files with 658 additions and 186 deletions
+43 -34
View File
@@ -48,10 +48,10 @@
enum ENUM_X5_SIGNAL_PROVIDERS
{
//
NONE,
X5NONE,
//
// XSP Expert Support Mechanism ...
XSP,
// X5XSP Expert Support Mechanism ...
X5XSP,
//
// XTD ...
XTD,
@@ -2411,7 +2411,7 @@ public:
)
{
//
if (provider == NONE)
if (provider == X5NONE)
{
return;
}
@@ -2420,8 +2420,8 @@ public:
switch (provider)
{
//
case XSP:
mIsXSPSignalProviderEnable = state;
case X5XSP:
mIsX5XSPSignalProviderEnable = state;
break;
//
@@ -2533,6 +2533,15 @@ public:
int curr = barIndex + 1;
int prev = curr + 1;
//
mConditions.symbol = GetSymbol();
mConditions.period = GetPeriod();
mConditions.time = iTime(
mConditions.symbol,
mConditions.period,
barIndex
);
//
GetBars(
mConditions.bars,
@@ -3880,7 +3889,7 @@ private:
bool mIsShortEnable;
//
bool mIsXSPSignalProviderEnable;
bool mIsX5XSPSignalProviderEnable;
bool mIsXTDSignalProviderEnable;
bool mIsXTAMSignalProviderEnable;
bool mIsXSISignalProviderEnable;
@@ -4478,11 +4487,11 @@ private:
}
//
// XSP ...
// X5XSP ...
//
// Common Conditions ...
bool XSPHasLongSignal(
bool X5XSPHasLongSignal(
X5MarketConditions &mConditions //
)
{
@@ -4495,7 +4504,7 @@ private:
//
// Symbol and Type Specific Conditions ...
bool XSPHasSpecifiedLongSignal(
bool X5XSPHasSpecifiedLongSignal(
X5MarketConditions &mConditions //
)
{
@@ -4504,7 +4513,7 @@ private:
//
// Check Common Signal Conditions ...
result = XSPHasLongSignal(mConditions);
result = X5XSPHasLongSignal(mConditions);
if (!result)
{
return result;
@@ -4577,11 +4586,11 @@ private:
}
//
// XSP ...
// X5XSP ...
//
// Common Conditions ...
bool XSPHasShortSignal(
bool X5XSPHasShortSignal(
X5MarketConditions &mConditions //
)
{
@@ -4594,7 +4603,7 @@ private:
//
// Symbol and Type Specific Conditions ...
bool XSPHasSpecifiedShortSignal(
bool X5XSPHasSpecifiedShortSignal(
X5MarketConditions &mConditions //
)
{
@@ -4603,7 +4612,7 @@ private:
//
// Check Common Signal Conditions ...
result = XSPHasShortSignal(mConditions);
result = X5XSPHasShortSignal(mConditions);
if (!result)
{
return result;
@@ -94562,7 +94571,7 @@ private:
signalPusher = 0;
//
bool hasXSPSignal = false;
bool hasX5XSPSignal = false;
bool hasXTDSignal = false;
bool hasXTAMSignal = false;
bool hasXSISignal = false;
@@ -94574,20 +94583,20 @@ private:
//
// XPS ...
if (mIsXSPSignalProviderEnable)
if (mIsX5XSPSignalProviderEnable)
{
//
hasXSPSignal = XSPHasSpecifiedLongSignal(
hasX5XSPSignal = X5XSPHasSpecifiedLongSignal(
mConditions //
);
//
if (hasXSPSignal)
if (hasX5XSPSignal)
{
//
if (!IsValid(provider))
{
provider = ToString(XSP);
provider = ToString(X5XSP);
}
//
@@ -94782,7 +94791,7 @@ private:
//
result =
//
hasXSPSignal
hasX5XSPSignal
//
||
//
@@ -94836,7 +94845,7 @@ private:
signalPusher = 0;
//
bool hasXSPSignal = false;
bool hasX5XSPSignal = false;
bool hasXTDSignal = false;
bool hasXTAMSignal = false;
bool hasXSISignal = false;
@@ -94848,20 +94857,20 @@ private:
//
// XPS ...
if (mIsXSPSignalProviderEnable)
if (mIsX5XSPSignalProviderEnable)
{
//
hasXSPSignal = XSPHasSpecifiedShortSignal(
hasX5XSPSignal = X5XSPHasSpecifiedShortSignal(
mConditions //
);
//
if (hasXSPSignal)
if (hasX5XSPSignal)
{
//
if (!IsValid(provider))
{
provider = ToString(XSP);
provider = ToString(X5XSP);
}
//
@@ -95056,7 +95065,7 @@ private:
//
result =
//
hasXSPSignal
hasX5XSPSignal
//
||
//
@@ -95327,8 +95336,8 @@ void GetAllX5SignalProviders(ENUM_X5_SIGNAL_PROVIDERS &result[])
Clean(result);
//
Add(NONE, result);
Add(XSP, result);
Add(X5NONE, result);
Add(X5XSP, result);
Add(XTD, result);
Add(XTAM, result);
Add(XSI, result);
@@ -95349,7 +95358,7 @@ string ToString(ENUM_X5_SIGNAL_PROVIDERS value)
ENUM_X5_SIGNAL_PROVIDERS ToX5SignalProvider(string content)
{
//
ENUM_X5_SIGNAL_PROVIDERS result = NONE;
ENUM_X5_SIGNAL_PROVIDERS result = X5NONE;
//
if (!IsValid(content))
@@ -95358,13 +95367,13 @@ ENUM_X5_SIGNAL_PROVIDERS ToX5SignalProvider(string content)
}
//
if (content == ToString(NONE))
if (content == ToString(X5NONE))
{
result = NONE;
result = X5NONE;
}
else if (content == ToString(XSP))
else if (content == ToString(X5XSP))
{
result = XSP;
result = X5XSP;
}
else if (content == ToString(XTD))
{