last ...

2025-03-06 03:09:33 +03:30
parent 32deb20560
commit 5160ea1c82
3 changed files with 169 additions and 15 deletions
@@ -399,12 +399,12 @@ class XCX121SMCXWZSignalDetector : public XCBase
            //
            hasWaitingZones = workingZone.DetectZone(
                drawer,
+                consolidationPoiEvents,
                analysePoiEvents,
-                decisionPoiEvents,
-                analysePoiEvents,
+                consolidationPoiEvents,
+                consolidationState,
                analyseState,
-                decisionState,
-                analyseState //
+                consolidationState //
            );

            //
@@ -466,13 +466,14 @@ class XCX121SMCXWZSignalDetector : public XCBase

        //
        // Detect Signal Box ...
-        hasSignalBox = hasWorkingZone &&
-                       hasWaitingZones &&
-                       workingZone.IsZoneOBRejected(
-                           activatedZone,
-                           decisionXConditions,
-                           zIndex //
-                       );
+        hasSignalBox =
+            hasWorkingZone &&
+            hasWaitingZones &&
+            workingZone.IsZoneValidForSignal(
+                activatedZone,
+                decisionXConditions,
+                zIndex //
+            );
        if (hasSignalBox)
        {
            //