last ...

2025-02-26 01:44:21 +03:30
parent 22298e8bab
commit 727888d783
19 changed files with 19179 additions and 9414 deletions
@@ -233,7 +233,7 @@ class XCBarArrowObject : public XCBaseObject

        //
        result =
-            //            
+            //
            bar.IsValid() &&
            IsValid(name)
            //
@@ -1845,25 +1845,36 @@ class XCSignalObject : public XCBaseObject

        //
        // TARGET ...
-        if (signal.target > 0)
+        bool hasTargets = HasChild(signal.targets);
+        if (hasTargets)
        {
            //
-            string targetName = ToString(X_TARGET) + "_" + nameMD5;
-            result = mTargetTrend.Create(
-                chart_id,
-                targetName,
-                window,
-                time1,
-                signal.target,
-                time2,
-                signal.target //
-            );
-            if (!result)
+            int targetsCount = ArraySize(signal.targets);
+            for (int i = 0; i < targetsCount; i++)
            {
                //
-                mTPTrend.Delete();
-                mSLTrend.Delete();
-                return result;
+                string targetName = ToString(X_TARGET) + "_" + ToString(i) + "_" + nameMD5;
+                CChartObjectTrend *mTargetTrend;
+                mTargetTrend = new CChartObjectTrend();
+                result = mTargetTrend.Create(
+                    chart_id,
+                    targetName,
+                    window,
+                    time1,
+                    signal.targets[i],
+                    time2,
+                    signal.targets[i] //
+                );
+                if (!result)
+                {
+                    //
+                    mTPTrend.Delete();
+                    mSLTrend.Delete();
+                    break;
+                }
+
+                //
+                mTargetTrends.Add(mTargetTrend);
            }
        }

@@ -1884,7 +1895,7 @@ class XCSignalObject : public XCBaseObject
            //
            mTPTrend.Delete();
            mSLTrend.Delete();
-            mTargetTrend.Delete();
+            mTargetTrends.Clear();
            return result;
        }

@@ -1996,7 +2007,12 @@ class XCSignalObject : public XCBaseObject
        }

        //
-        mTargetTrend.Width(value);
+        for (int i = 0; i < mTargetTrends.Total(); i++)
+        {
+            //
+            CChartObjectTrend *iTrend = (CChartObjectTrend *)mTargetTrends.At(i);
+            iTrend.Width(value);
+        }
    }

    /**
@@ -2006,7 +2022,13 @@ class XCSignalObject : public XCBaseObject
     */
    void TargetColor(color value)
    {
-        mTargetTrend.Color(value);
+        //
+        for (int i = 0; i < mTargetTrends.Total(); i++)
+        {
+            //
+            CChartObjectTrend *iTrend = (CChartObjectTrend *)mTargetTrends.At(i);
+            iTrend.Color(value);
+        }
    }

    /**
@@ -2016,7 +2038,13 @@ class XCSignalObject : public XCBaseObject
     */
    void TargetStyle(ENUM_LINE_STYLE value)
    {
-        mTargetTrend.Style(value);
+        //
+        for (int i = 0; i < mTargetTrends.Total(); i++)
+        {
+            //
+            CChartObjectTrend *iTrend = (CChartObjectTrend *)mTargetTrends.At(i);
+            iTrend.Style(value);
+        }
    }

    //
@@ -2077,7 +2105,7 @@ class XCSignalObject : public XCBaseObject
    CChartObjectTrend mTPTrend;
    CChartObjectTrend mSLTrend;
    CChartObjectTrend mEntryTrend;
-    CChartObjectTrend mTargetTrend;
+    CArrayObj mTargetTrends;
 };

 class XCOHCLObject : public XCBaseObject
@@ -2985,19 +3013,19 @@ class XCTrendObject : public XCBaseObject
                 ? first <= second
                 : first >= second) &&
            IsSpecifiedValid(firstTime) &&
-            IsSpecifiedValid(secondTime) 
+            IsSpecifiedValid(secondTime)
            //
            ;
        if (!result)
        {
            return result;
        }
-        
+
        //
-        ENUM_X_DIRECTION dir = 
-         useMinAsStart
-         ? X_DIRECTION_BULLISH
-         : X_DIRECTION_BEARISH;
+        ENUM_X_DIRECTION dir =
+            useMinAsStart
+                ? X_DIRECTION_BULLISH
+                : X_DIRECTION_BEARISH;

        //
        string name = "XTRND" + ToString(dir) + "_" + ToString(first) + "_" + ToString(second);