last ...

2024-06-30 10:59:34 +03:30
parent 03aabb7bdc
commit 31a7f27384
3 changed files with 85 additions and 64 deletions
@@ -1910,6 +1910,7 @@ public:
        }

        //
+        data[infoIDX].volume = signal.volume;
        data[infoIDX].ticket = signal.positionId;

        //
@@ -1948,10 +1949,14 @@ public:
            //
            // Here we Prepare Handler Structure for
            // Next Grid Position ...
-            data[infoIDX].PrepareNextGrid(
-                GridDistance(),
-                GridVolumeMultiplier() //
-            );
+            if (data[infoIDX].allowGrid)
+            {
+                //
+                data[infoIDX].PrepareNextGrid(
+                    GridDistance(),
+                    GridVolumeMultiplier() //
+                );
+            }
        }

        //
@@ -1959,11 +1964,15 @@ public:
        if (EnableRecovery())
        {
            //
-            data[infoIDX].PrepareNextRecovery(
-                GridDistance(),
-                GridVolumeMultiplier(),
-                signal.type //
-            );
+            if (data[infoIDX].allowRecover)
+            {
+                //
+                data[infoIDX].PrepareNextRecovery(
+                    GridDistance(),
+                    GridVolumeMultiplier(),
+                    signal.type //
+                );
+            }
        }
    }

@@ -3770,19 +3779,23 @@ public:
    }

    //
-    double MaxAllowedDrawdownPercent() {
+    double MaxAllowedDrawdownPercent()
+    {
        return mMaxAllowedDrawdownPercent;
    }

    //
-    void MaxAllowedDrawdownPercent(double value) {
+    void MaxAllowedDrawdownPercent(double value)
+    {
        //
-        if (value < 0) {
+        if (value < 0)
+        {
            value = 0;
        }

        //
-        if (value > 50) {
+        if (value > 50)
+        {
            value = 50;
        }

@@ -4153,6 +4166,7 @@ public:
                if (cHasSignal)
                {
                    //
+                    signal.Clean();
                    signal = cSignal;

                    //
@@ -4170,6 +4184,7 @@ public:
                if (sHasSignal)
                {
                    //
+                    signal.Clean();
                    signal = sSignal;

                    //
@@ -4187,6 +4202,7 @@ public:
                if (mHasSignal)
                {
                    //
+                    signal.Clean();
                    signal = mSignal;

                    //
@@ -4204,6 +4220,7 @@ public:
                if (lHasSignal)
                {
                    //
+                    signal.Clean();
                    signal = lSignal;

                    //
@@ -4221,6 +4238,7 @@ public:
                if (hHasSignal)
                {
                    //
+                    signal.Clean();
                    signal = hSignal;

                    //