last ...

Classes/x-saherelm.x121.setup.xea.mq5

@@ -1910,6 +1910,7 @@ public:
         }
 
         //
+        data[infoIDX].volume = signal.volume;
         data[infoIDX].ticket = signal.positionId;
 
         //
@@ -1948,15 +1949,22 @@ public:
             //
             // Here we Prepare Handler Structure for
             // Next Grid Position ...
+            if (data[infoIDX].allowGrid)
+            {
+                //
                 data[infoIDX].PrepareNextGrid(
                     GridDistance(),
                     GridVolumeMultiplier() //
                 );
             }
+        }
 
         //
         // Check if Recovery System Enable or Not ...
         if (EnableRecovery())
+        {
+            //
+            if (data[infoIDX].allowRecover)
             {
                 //
                 data[infoIDX].PrepareNextRecovery(
@@ -1966,6 +1974,7 @@ public:
                 );
             }
         }
+    }
 
     //
     void Update(XDeal &deal)
@@ -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;
 
                     //

Classes/x-saherelm.xtrade.class.mq5

@@ -1102,7 +1102,10 @@ public:
         //
         // Prepare Signal Comment ...
         string mSComment = mSignal.GenerateComment();
+        if (!Contains(mSComment, mSignal.comment))
+        {
             mSignal.comment += mSComment;
+        }
 
         //
         // Handle Market Execution ...

Experts/x-saherelm.x121.ea.mq5

@@ -83,13 +83,13 @@ input double x121EANextTrailDistance = 50;          // Next Trailling Distance
 input double x121EANextTrailPoint = 25;             // Next Trailling Step
 
 //
-input group "Supporting";
+// input group "Supporting";
-input bool x121EAAllowSupport = false;          // Allow Support Signals
+// input bool x121EAAllowSupport = false;          // Allow Support Signals
-input bool x121EASupportOnlyForces = false;     // Support Only Force Signals
+// input bool x121EASupportOnlyForces = false;     // Support Only Force Signals
-double x121EASupportDistance = 0;               // Supporting Distance
+// double x121EASupportDistance = 0;               // Supporting Distance
-input int x121EAMaxNumberOfSupports = 0;        // Max Number of Support Signals
+// input int x121EAMaxNumberOfSupports = 0;        // Max Number of Support Signals
-input double x121EASupportVolumeMultiplier = 0; // Support Signals Volume Multiplier
+// input double x121EASupportVolumeMultiplier = 0; // Support Signals Volume Multiplier
-input double x121EAMaxAllowedSupportVolume = 0; // Max Allowed Support Signals Volume
+// input double x121EAMaxAllowedSupportVolume = 0; // Max Allowed Support Signals Volume
 
 //
 input group "Grid";
@@ -349,14 +349,14 @@ bool InitialEA()
     x121EA.FirstTrailDistance(x121EAFirstTrailDistance);
     x121EA.DisableTrailingWhenOpposit(x121EADisableTrailingWhenOpposit);
 
-    //
+    // //
-    // Supporting ...
+    // // Supporting ...
-    x121EA.AllowSupport(x121EAAllowSupport);
+    // x121EA.AllowSupport(x121EAAllowSupport);
-    x121EA.SupportOnlyForces(x121EASupportOnlyForces);
+    // x121EA.SupportOnlyForces(x121EASupportOnlyForces);
-    x121EA.SupportDistance(x121EASupportDistance);
+    // x121EA.SupportDistance(x121EASupportDistance);
-    x121EA.MaxNumberOfSupports(x121EAMaxNumberOfSupports);
+    // x121EA.MaxNumberOfSupports(x121EAMaxNumberOfSupports);
-    x121EA.SupportVolumeMultiplier(x121EASupportVolumeMultiplier);
+    // x121EA.SupportVolumeMultiplier(x121EASupportVolumeMultiplier);
-    x121EA.MaxAllowedSupportVolume(x121EAMaxAllowedSupportVolume);
+    // x121EA.MaxAllowedSupportVolume(x121EAMaxAllowedSupportVolume);
 
     //
     // Grid ...