File reservedroutes.diff of Package spdrs60-testing

Overview Repositories Revisions Requests Users Attributes Meta

File reservedroutes.diff of Package spdrs60-testing (Revision 34f5b9a09195f94702b37bc5056d4a75)

Currently displaying revision 34f5b9a09195f94702b37bc5056d4a75 , Show latest

diff --git a/spdrs60/gbsarea.cpp b/spdrs60/gbsarea.cpp
index e481a86..ad00c33 100644
--- a/spdrs60/gbsarea.cpp
+++ b/spdrs60/gbsarea.cpp
@@ -501,19 +501,19 @@ void GBSArea::slotElementClicked(element* el, GbsButtonState gbsButton)
             }
             else if (kUfgtClicked == gkbState || kNoneClicked ==
                     gkbState) {
-                if (el->hasFfMLock()) {
+                /*if (el->hasFfMLock()) {
                     QApplication::beep();
                     emit statusMessage(tr("No routing possible; signal '%1'"
                                 " is already locked by an active route.")
                             .arg(el->getLabelText()));
                     slotElementClickedTimeout();
                 }
-                else {
+                else {*/
                     // give button pressed feedback to user
                     setCursor(Qt::ArrowCursor);
                     /* send signal to route controller*/
                     emit setRoute(el, gbsButton, gkbState);
-                }
+                //}
             }
             else if (kWgtClicked == gkbState) {
                 QApplication::beep();
diff --git a/spdrs60/route.cpp b/spdrs60/route.cpp
index 4d001ee..00fc399 100644
--- a/spdrs60/route.cpp
+++ b/spdrs60/route.cpp
@@ -532,16 +532,27 @@ QString Route::getTypeStr() const
  */
 int Route::startRouting()
 {
+    /*No valid entry signal*/
+    if (entrySignal.elemPtr == NULL)
+        return -3;
+
+    /*No valid exit signal*/
+    if (exitSignal.elemPtr == NULL)
+        return -3;
+
     /*
      * 1) check for locked elements
      */
-    if (entrySignal.elemPtr != NULL && entrySignal.elemPtr->isLocked())
-               return 0;
+    if (entrySignal.elemPtr->isLocked())
+        return 0;
 
-    //FIXME: this case may lead to a route reservation
-    if (exitSignal.elemPtr != NULL && exitSignal.elemPtr->isLocked() &&
-                exitSignal.elemPtr->hasDifferentState(exitSignal.state))
-               return 0;
+    // this case may lead to a route reservation
+    if (exitSignal.elemPtr->isLocked() &&
+            exitSignal.elemPtr->hasDifferentState(exitSignal.state)) {
+        routestate = rsWfLock;
+        emit stateChanged(this, routestate);
+        return 0;
+    }
 
     turnouts = 0;
     tocounter = 0;
@@ -551,8 +562,11 @@ int Route::startRouting()
         element* el = (*it)->elemPtr;
         if (el != NULL && el->isLocked() &&
                 (el->hasDifferentState((*it)->state) ||
-                 el->is2StateDKW() || !el->isLockable()))
+                 el->is2StateDKW() || !el->isLockable())) {
+            routestate = rsWfLock;
+            emit stateChanged(this, routestate);
             return 0;
+        }
 
         // count turnouts for timer activation
         if (el != NULL && el->isTurnout() &&
@@ -647,8 +661,7 @@ void Route::showRoutePath()
     emit updateRoutePathLEDs(entrySignal, exitSignal, rsa);
 
     // Interrupt routing if "Zugfahrstrasse" meets occupied element.
-    // Lock state should not only be boolean but something like "waiting
-    // for lock". The real lock state should be reached when all
+    // The real lock state should be reached when all
     // occupied segments changed to be unoccupied.
     // route states: rsUnlocked, rsLocked, rsWfLock, rsWfUnlock
     // occupied tracks go this ways:
diff --git a/spdrs60/router.cpp b/spdrs60/router.cpp
index cbd4ae8..2862f5e 100644
--- a/spdrs60/router.cpp
+++ b/spdrs60/router.cpp
@@ -258,7 +258,7 @@ void Router::showRouteAt(int idx)
 
 void Router::switchVisualMode(elemVisualMode vm)
 {
-    // if layout was in edit mode update route data to make shure
+    // if layout was in edit mode update route data to make sure
     // that changed elements are found at the right place
     if (visualmode == kvmEditLayout)
         updateRouteElements();
@@ -407,7 +407,6 @@ void Router::transferTrainNumber(Route* tr)
 
     sr->clearTrain();
     emit routeDataChanged(sr);
-
     modified = true;
 
     /* 5: broadcast new train assignments*/
@@ -557,7 +556,6 @@ void Router::activateRoute(Route* rt)
     if (rt == NULL || visualmode == kvmEditLayout)
         return;
 
-
     int result = rt->startRouting();
     switch (result) {
         case 1:
@@ -581,6 +579,12 @@ void Router::activateRoute(Route* rt)
                         "route '%1' is blocked by occupied turnout.")
                     .arg(rt->getSectionName()));
             break;
+        case -3:
+            emit statusMessage(tr("Missing signal item pointer."));
+            break;
+        default:
+            emit statusMessage(tr("Unknown routing error."));
+            break;
     }
 }
 
@@ -603,6 +607,24 @@ void Router::releaseRoute(Route* rt)
     rt->stopRouting();
     emit statusMessage(tr("Route '%1' released").arg(rt->getSectionName()));
     transferTrainNumber(rt);
+
+    /* Check for reserved route to entry signal of this route and
+     * activate if available*/
+    Route* nextrt = getReservedRouteWithExitSignal(
+            rt->getEntrySignalElementPtr());
+    if (NULL == nextrt) {
+
+        /* If not found check for reserved route to exit signal of this
+         * route and activate if available*/
+        nextrt = getReservedRouteWithExitSignal(
+                rt->getExitSignalElementPtr());
+        if (NULL == nextrt)
+            return;
+    }
+
+    emit statusMessage(tr("Reserved route '%1' found to activate")
+            .arg(nextrt->getSectionName()));
+    activateRoute(nextrt);
 }
 
 
@@ -733,6 +755,18 @@ void Router::resetRoute(element* el, GbsButtonState cb)
 }
 
 
+Route* Router::getReservedRouteWithExitSignal(element* el)
+{
+    QList<Route*>::const_iterator it;
+    for (it = routeList.constBegin(); it != routeList.constEnd(); ++it) {
+        if ((*it)->hasThisExitSignal(el) &&
+                Route::rsWfLock == (*it)->getState())
+            return (*it);
+    }
+    return NULL;
+}
+
+
 Route* Router::getLockedRouteWithEntrySignal(element* el)
 {
     QList<Route*>::const_iterator it;
diff --git a/spdrs60/router.h b/spdrs60/router.h
index 676f434..2b9103c 100644
--- a/spdrs60/router.h
+++ b/spdrs60/router.h
@@ -101,6 +101,7 @@ private:
     Route* getRouteWithId(unsigned int);
     //Route* getRouteWithSection(unsigned int);
     //Route* getRouteWithTrain(unsigned int);
+    Route* getReservedRouteWithExitSignal(element*);
     Route* getLockedRouteWithEntrySignal(element*);
     Route* getUnlockedRouteWithEntrySignal(element*, GbsButtonState,
             GbsButtonState);
diff --git a/spdrs60/translations/spdrs60_de.ts b/spdrs60/translations/spdrs60_de.ts
index 0d24743..70828c3 100644
--- a/spdrs60/translations/spdrs60_de.ts
+++ b/spdrs60/translations/spdrs60_de.ts
@@ -353,7 +353,7 @@ den Suchkriterien entspricht.</translation>
     </message>
     <message>
         <source>No routing possible; signal &apos;%1&apos; is already locked by an active route.</source>
-        <translation>Kein Umschalten möglich; Signal &apos;%1&apos; ist durch eine aktive Fahrstraße gesperrt.</translation>
+        <translation type="vanished">Kein Umschalten möglich; Signal &apos;%1&apos; ist durch eine aktive Fahrstraße gesperrt.</translation>
     </message>
     <message>
         <source>Signals can not be switched using WGT</source>
@@ -2046,6 +2046,18 @@ Gleises eingeben. Erlaubt sind Werte von %1 bis %2.</translation>
         <source>Recording of signal &apos;%1&apos; failed</source>
         <translation>Aufnahme von Signal &apos;%1&apos; ist fehlgeschlagen</translation>
     </message>
+    <message>
+        <source>Missing signal item pointer.</source>
+        <translation>Fehlender Zeiger auf Signal.</translation>
+    </message>
+    <message>
+        <source>Unknown routing error.</source>
+        <translation>Unbekannter Fehler bei der Fahrstraßensuche.</translation>
+    </message>
+    <message>
+        <source>Reserved route &apos;%1&apos; found to activate</source>
+        <translation>Reservierte Fahrstraße &apos;%1&apos; zum Aktivieren gefunden</translation>
+    </message>
 </context>
 <context>
     <name>ServerInfoDialog</name>

Places

File reservedroutes.diff of Package spdrs60-testing (Revision 34f5b9a09195f94702b37bc5056d4a75)

Places