This commit is contained in:
2025-06-16 01:43:17 +03:30
parent 4cb5e47616
commit 80b452fff4
3 changed files with 479 additions and 162 deletions
+54 -70
View File
@@ -48,17 +48,18 @@ enum ENUM_XCHARTOBJECTS
enum ENUM_X_CHART_IDS
{
X_TO,
X_FROM,
X_UPPER,
X_LOWER,
X_ENTRY,
X_TARGET,
X_SL,
X_TP,
X_BAR_H_SHW,
X_BAR_BDY,
X_BAR_L_SHW,
X_AT, // AT
X_TO, // TO
X_FROM, // FROM
X_UPPER, // UPPER
X_LOWER, // LOWER
X_ENTRY, // ENTRY
X_TARGET, // TARGET
X_SL, // SL
X_TP, // TP
X_BAR_H_SHW, // HSHW
X_BAR_BDY, // BODY
X_BAR_L_SHW, // LSHW
};
string ToString(ENUM_X_CHART_IDS value)
@@ -67,65 +68,7 @@ string ToString(ENUM_X_CHART_IDS value)
string result = NULL;
//
switch (value)
{
//
case X_TO:
result = "TO";
break;
//
case X_FROM:
result = "FROM";
break;
//
case X_UPPER:
result = "UPPER";
break;
//
case X_LOWER:
result = "LOWER";
break;
//
case X_ENTRY:
result = "ENTRY";
break;
//
case X_TARGET:
result = "TARGET";
break;
//
case X_SL:
result = "SL";
break;
//
case X_TP:
result = "TP";
break;
//
case X_BAR_H_SHW:
result = "HSHW";
break;
//
case X_BAR_BDY:
result = "BODY";
break;
//
case X_BAR_L_SHW:
result = "LSHW";
break;
//
}
result = EnumToString(value);
//
return result;
@@ -436,6 +379,8 @@ class XCBaseObject : public CChartObject
//
};
//
// Bar Arrow Object ...
class XCBarArrowObject : public XCBaseObject
{
//
@@ -990,6 +935,8 @@ class XCRRObject : public XCSignalObject
}
};
//
// OHCL, Bar Object ...
class XCOHCLObject : public XCBaseObject
{
//
@@ -1304,6 +1251,8 @@ class XCOHCLObject : public XCBaseObject
CChartObjectRectangle mLowShadowRect;
};
//
// Box Object ...k
class XCBoxObject : public XCBaseObject
{
//
@@ -1328,6 +1277,7 @@ class XCBoxObject : public XCBaseObject
double lower,
datetime from,
datetime to,
datetime at,
string prefix = NULL //
)
{
@@ -1370,6 +1320,34 @@ class XCBoxObject : public XCBaseObject
return result;
}
//
if (result)
{
//
if (IsValid(at))
{
//
result = mAt.Create(
chart_id,
name + ToString(X_AT),
window,
at //
);
}
//
if (!result)
{
//
mAt.Detach();
mAt.Delete();
//
mRect.Detach();
mRect.Delete();
}
}
//
if (result)
{
@@ -1397,6 +1375,7 @@ class XCBoxObject : public XCBaseObject
}
//
mAt.Width(value);
mRect.Width(value);
}
@@ -1407,6 +1386,8 @@ class XCBoxObject : public XCBaseObject
*/
void BoxColor(color value)
{
//
mAt.Color(value);
mRect.Color(value);
}
@@ -1417,6 +1398,8 @@ class XCBoxObject : public XCBaseObject
*/
void BoxStyle(ENUM_LINE_STYLE value)
{
//
mAt.Style(value);
mRect.Style(value);
}
@@ -1449,6 +1432,7 @@ class XCBoxObject : public XCBaseObject
//
// Props ...
CChartObjectVLine mAt;
CChartObjectRectangle mRect;
};
+12 -1
View File
@@ -602,6 +602,7 @@ class XCPOIDrawer : public XCBase
double lower,
datetime from,
datetime to,
datetime at,
color clr = clrYellowGreen,
int width = 1,
bool fill = false,
@@ -658,6 +659,7 @@ class XCPOIDrawer : public XCBase
lower,
from,
to,
at,
prefix //
);
@@ -690,7 +692,8 @@ class XCPOIDrawer : public XCBase
*/
bool DrawBox(
XBoxZone &box,
XCBoxObject *&object //
XCBoxObject *&object,
bool ignoreAt = true //
)
{
//
@@ -706,6 +709,12 @@ class XCPOIDrawer : public XCBase
return result;
}
//
if (ignoreAt)
{
box.at = NULL;
}
//
int width = 1;
bool fill = false;
@@ -724,6 +733,7 @@ class XCPOIDrawer : public XCBase
box.lower,
box.from,
box.to,
box.at,
clr,
width,
fill,
@@ -800,6 +810,7 @@ class XCPOIDrawer : public XCBase
box.lower,
box.from,
box.to,
box.at,
clr,
width,
fill,