last ...

X121SMCEA/Strategy/x-121.smc.strategy.class.mq5

@@ -280,7 +280,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
 
             //
             result = PrepareSignal(signal);
-            
+
             //
             hasLong = false;
             hasShort = false;
@@ -709,20 +709,59 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
         }
 
         //
-        // Draw Price Inside Zones ...
-        if (mXTWPVConditions.HasPriceInsideZones())
+        // Handle Required Drawings ...
+        bool hasPivot = mXTWPVConditions.HasPivot();
+        bool hasPriceInsideZone = mXTWPVConditions.HasPriceInsideZones();
+        bool canDraw = hasPivot ||
+                       hasPriceInsideZone;
+        if (canDraw)
         {
             //
             ClearDraws();
 
             //
-            XCBaseObject *drawnObjects[];
-            int drawnObjectsCount = DrawPriceInsideZones(
-                mXTWPVConditions,
-                mPOIDrawer,
-                drawnObjects //
-            );
-            AddObjectsIfNotExists(drawnObjects);
+            // Draw Pivot Zone ...
+            if (hasPivot)
+            {
+                //
+                XCBaseObject *drawnObjects[];
+                int drawnObjectsCount = DrawXTWPVPivotZone(
+                    mXTWPVConditions,
+                    mPOIDrawer,
+                    drawnObjects,
+                    true, // Draw State ...
+                    true,  // Draw Ticks Zone ...
+                    true, // Ignore SwingHighs ...
+                    true, // Ignore SwingLows ...
+                    true, // Ignore SupportZones ...
+                    true, // Ignore ResistanceZones ...
+                    true, // Ignore SupplyZones ...
+                    true, // Ignore DemandZones ...
+                    true, // Ignore BullishOrderBlocks ...
+                    true, // Ignore BearishOrderBlocks ...
+                    true, // Ignore BullishFairValueGaps ...
+                    true, // Ignore BearishFairValueGaps ...
+                    true, // Ignore BullishRejectionBars ...
+                    true, // Ignore BearishRejectionBars ...
+                    true, // Ignore BullishMomentumBars ...
+                    true  // Ignore BearishMomentumBars ...
+                );
+                AddObjectsIfNotExists(drawnObjects);
+            }
+
+            //
+            // Draw Price Inside Zones ...
+            if (hasPriceInsideZone)
+            {
+                //
+                XCBaseObject *drawnObjects[];
+                int drawnObjectsCount = DrawTWPVPriceInsideZones(
+                    mXTWPVConditions,
+                    mPOIDrawer,
+                    drawnObjects //
+                );
+                AddObjectsIfNotExists(drawnObjects);
+            }
         }
 
         //