This commit is contained in:
2025-06-03 16:22:01 +03:30
parent 48123642b7
commit 078dc35ae0
9 changed files with 3005 additions and 45 deletions
+33 -4
View File
@@ -33,7 +33,7 @@
enum ENUM_X121_XCATB_BUFFERS
{
X121_XCATB_SAR_LINE = 0,
X121_XCATB_SAR_STATE_LINE = 30,
X121_XCATB_SAR_COLOR_LINE = 1,
X121_XCATB_PEAK_LINE = 2,
X121_XCATB_VALE_LINE = 3,
X121_XCATB_PEAK_GOLDEN_LINE = 4,
@@ -41,15 +41,17 @@ enum ENUM_X121_XCATB_BUFFERS
X121_XCATB_ATR_BAND_UPPER_LINE = 6,
X121_XCATB_ATR_BAND_LOWER_LINE = 7,
X121_XCATB_TREND_LINE = 8,
X121_XCATB_TREND_STATE_LINE = 31,
X121_XCATB_TREND_COLOR_LINE = 9,
X121_XCATB_SBAR_O_LINE = 10,
X121_XCATB_SBAR_H_LINE = 11,
X121_XCATB_SBAR_L_LINE = 12,
X121_XCATB_SBAR_C_LINE = 13,
X121_XCATB_SBAR_COLOR_LINE = 14,
X121_XCATB_HK_SBAR_O_LINE = 15,
X121_XCATB_HK_SBAR_H_LINE = 16,
X121_XCATB_HK_SBAR_L_LINE = 17,
X121_XCATB_HK_SBAR_C_LINE = 18,
X121_XCATB_HK_SBAR_COLOR_LINE = 19,
X121_XCATB_S_HH_LINE = 20,
X121_XCATB_S_LL_LINE = 21,
X121_XCATB_M_HH_LINE = 22,
@@ -59,7 +61,9 @@ enum ENUM_X121_XCATB_BUFFERS
X121_XCATB_H_HH_LINE = 26,
X121_XCATB_H_LL_LINE = 27,
X121_XCATB_KI_LINE = 28,
X121_XCATB_KI_STATE_LINE = 50,
X121_XCATB_KI_COLOR_LINE = 29,
X121_XCATB_SAR_STATE_LINE = 30,
X121_XCATB_TREND_STATE_LINE = 31,
X121_XCATB_RSI_LINE = 32,
X121_XCATB_ADX_LINE = 33,
X121_XCATB_ADXP_LINE = 34,
@@ -77,6 +81,7 @@ enum ENUM_X121_XCATB_BUFFERS
X121_XCATB_HK_BAR_H_LINE = 46,
X121_XCATB_HK_BAR_L_LINE = 47,
X121_XCATB_HK_BAR_C_LINE = 48,
X121_XCATB_KI_STATE_LINE = 49,
};
//
@@ -352,6 +357,10 @@ struct X121XCatbConditions
//
// KI ...
//
bool isKIUp;
bool isKIDown;
//
bool isKIBullish;
bool isKIBearish;
@@ -634,6 +643,10 @@ struct X121XCatbConditions
//
// KI ...
//
isKIUp = false;
isKIDown = false;
//
isKIBullish = false;
isKIBearish = false;
@@ -843,6 +856,10 @@ struct X121XCatbConditions
// KI ...
//
if (isKIUp)
{
bullishScore += score;
}
if (isKIBullish)
{
bullishScore += score;
@@ -853,6 +870,10 @@ struct X121XCatbConditions
}
//
if (isKIDown)
{
bearishScore += score;
}
if (isKIBearish)
{
bearishScore += score;
@@ -1186,6 +1207,8 @@ struct X121XCatbConditions
"-----------------------" + separator +
"KI: " + separator +
"-----------------------" + separator +
ToString("isKIUp", isKIUp, ignoreFalseConditions, separator) +
ToString("isKIDown", isKIDown, ignoreFalseConditions, separator) +
ToString("isKIBullish", isKIBullish, ignoreFalseConditions, separator) +
ToString("isKIBearish", isKIBearish, ignoreFalseConditions, separator) +
ToString("isKISameAsLast", isKISameAsLast, ignoreFalseConditions, separator) +
@@ -4688,6 +4711,10 @@ class XCX121XCatbHelper : public XCBaseHelper
//
// KI ...
//
bool isKIUp = cKI > pKI;
bool isKIDown = cKI < pKI;
//
bool isKIBullish = cKIState > 0;
bool isKIBearish = cKIState < 0;
@@ -4971,9 +4998,11 @@ class XCX121XCatbHelper : public XCBaseHelper
// Attached ...
//
conditions.isKIUp = isKIUp;
conditions.isATRUp = isATRUp;
conditions.isRSIOB = isRSIOB;
conditions.isRSIOS = isRSIOS;
conditions.isKIDown = isKIDown;
conditions.isDeltaUp = isDeltaUp;
conditions.isATRDown = isATRDown;
conditions.isTrendUp = isTrendUp;
@@ -4983,13 +5012,13 @@ class XCX121XCatbHelper : public XCBaseHelper
conditions.isTrendDown = isTrendDown;
conditions.isKIBullish = isKIBullish;
conditions.isKIBearish = isKIBearish;
conditions.adxThreshold = _adxThreshold;
conditions.isSarBullish = isSarBullish;
conditions.isSarBearish = isSarBearish;
conditions.isADXBullish = isADXBullish;
conditions.isADXBearish = isADXBearish;
conditions.isRSIBullish = isRSIBullish;
conditions.isRSIBearish = isRSIBearish;
conditions.adxThreshold = _adxThreshold;
conditions.isSBarBullish = isSBarBullish;
conditions.isSBarBearish = isSBarBearish;
conditions.isKISameAsLast = isKISameAsLast;