Initial implementation of tracerestrict counter mechanism

This commit is contained in:
Jonathan G Rennison
2020-08-31 19:08:35 +01:00
parent dea2be5d3f
commit 817bc44a3e
17 changed files with 887 additions and 13 deletions

View File

@@ -2731,6 +2731,7 @@ STR_TRACE_RESTRICT_VARIABLE_SLOT_OCCUPANCY :slot occupancy
STR_TRACE_RESTRICT_VARIABLE_SLOT_OCCUPANCY_REMAINING :slot occupancy remaining
STR_TRACE_RESTRICT_VARIABLE_SLOT_OCCUPANCY_SHORT :occupancy
STR_TRACE_RESTRICT_VARIABLE_SLOT_OCCUPANCY_REMAINING_SHORT :occupancy remaining
STR_TRACE_RESTRICT_VARIABLE_COUNTER_VALUE :counter value
STR_TRACE_RESTRICT_VARIABLE_TRAIN_WEIGHT :weight
STR_TRACE_RESTRICT_VARIABLE_TRAIN_POWER :power
STR_TRACE_RESTRICT_VARIABLE_TRAIN_MAX_TE :max T.E.
@@ -2762,6 +2763,8 @@ STR_TRACE_RESTRICT_CONDITIONAL_SLOT_STR :{STRING} train
STR_TRACE_RESTRICT_CONDITIONAL_SLOT_OCCUPANCY :{STRING} {STRING} of slot: {TRSLOT} {STRING} {COMMA} then
STR_TRACE_RESTRICT_CONDITIONAL_SLOT_OCCUPANCY_STR :{STRING} {STRING} of slot: {STRING} {BLACK}{STRING} {STRING} {COMMA} then
STR_TRACE_RESTRICT_CONDITIONAL_TRAIN_STATUS :{STRING} train {STRING} status: {STRING} then
STR_TRACE_RESTRICT_CONDITIONAL_COUNTER :{STRING} value of counter: {TRCOUNTER} {STRING} {COMMA} then
STR_TRACE_RESTRICT_CONDITIONAL_COUNTER_STR :{STRING} value of counter: {STRING} {BLACK}{STRING} {STRING} {COMMA} then
STR_TRACE_RESTRICT_CONDITIONAL_UNDEFINED :{STRING} {STRING} {STRING} {RED}undefined {BLACK}{STRING}then
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_UNDEFINED :{STRING} {RED}undefined {BLACK}{STRING}then
STR_TRACE_RESTRICT_PF_PENALTY_ITEM :Add pathfinder penalty: {COMMA}
@@ -2799,6 +2802,7 @@ STR_TRACE_RESTRICT_SLOT_OP :Slot operation
STR_TRACE_RESTRICT_REVERSE :Reverse
STR_TRACE_RESTRICT_SPEED_RESTRICTION :Speed restriction
STR_TRACE_RESTRICT_NEWS_CONTROL :News control
STR_TRACE_RESTRICT_COUNTER_OP :Counter operation
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT :Acquire or wait
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE :Try to acquire
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT :Release (front)
@@ -2816,6 +2820,13 @@ STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE_ITEM :PBS reservation
STR_TRACE_RESTRICT_SLOT_NAME :{TRSLOT}
STR_TRACE_RESTRICT_SLOT_LIST_HEADER :{BLACK}Slot{CONSUME_ARG}{P "" s}: {LTBLUE}
STR_TRACE_RESTRICT_SLOT_LIST_SEPARATOR :{BLACK}, {LTBLUE}
STR_TRACE_RESTRICT_COUNTER_NAME :{TRCOUNTER}
STR_TRACE_RESTRICT_COUNTER_INCREASE :Increase
STR_TRACE_RESTRICT_COUNTER_DECREASE :Decrease
STR_TRACE_RESTRICT_COUNTER_SET :Set
STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Increase counter: {STRING1}{BLACK}{STRING} by {COMMA}
STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Decrease counter: {STRING1}{BLACK}{STRING} by {COMMA}
STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Set counter: {STRING1}{BLACK}{STRING} to {COMMA}
STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :empty
STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :full
STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :broken down
@@ -2859,6 +2870,23 @@ STR_TRACE_RESTRICT_SLOT_CREATE_CAPTION :{BLACK}Create a
STR_TRACE_RESTRICT_SLOT_SET_MAX_OCCUPANCY_CAPTION :{BLACK}Set maximum occupancy of a slot
STR_TRACE_RESTRICT_SLOT_QUERY_DELETE_CAPTION :{WHITE}Delete Slot
STR_TRACE_RESTRICT_SLOT_DELETE_QUERY_TEXT :{WHITE}Are you sure you want to delete this slot?
STR_TRACE_RESTRICT_COUNTER_OP_TOOLTIP :{BLACK}Counter operation type
STR_TRACE_RESTRICT_COUNTER_GUI_LIST_TOOLTIP :{BLACK}Counters - click on a counter to modify it.
STR_TRACE_RESTRICT_COUNTER_CREATE :{BLACK}Create
STR_TRACE_RESTRICT_COUNTER_DELETE :{BLACK}Delete
STR_TRACE_RESTRICT_COUNTER_RENAME :{BLACK}Rename
STR_TRACE_RESTRICT_COUNTER_SET_VALUE :{BLACK}Set Value
STR_TRACE_RESTRICT_COUNTER_CREATE_TOOLTIP :{BLACK}Click to create a counter
STR_TRACE_RESTRICT_COUNTER_DELETE_TOOLTIP :{BLACK}Delete the selected counter
STR_TRACE_RESTRICT_COUNTER_RENAME_TOOLTIP :{BLACK}Rename the selected counter
STR_TRACE_RESTRICT_COUNTER_SET_VALUE_TOOLTIP :{BLACK}Set the value of the selected counter
STR_TRACE_RESTRICT_COUNTER_CAPTION :{WHITE}Routing Restrictions - Counter Management
STR_TRACE_RESTRICT_COUNTER_MANAGE :Manage counters
STR_TRACE_RESTRICT_COUNTER_RENAME_CAPTION :{BLACK}Rename a counter
STR_TRACE_RESTRICT_COUNTER_CREATE_CAPTION :{BLACK}Create a counter
STR_TRACE_RESTRICT_COUNTER_SET_VALUE_CAPTION :{BLACK}Set counter value
STR_TRACE_RESTRICT_COUNTER_QUERY_DELETE_CAPTION :{WHITE}Delete counter
STR_TRACE_RESTRICT_COUNTER_DELETE_QUERY_TEXT :{WHITE}Are you sure you want to delete this counter?
STR_TRACE_RESTRICT_INSERT :{BLACK}Insert
STR_TRACE_RESTRICT_REMOVE :{BLACK}Remove
STR_TRACE_RESTRICT_RESET :{BLACK}Reset
@@ -2903,6 +2931,10 @@ STR_TRACE_RESTRICT_ERROR_SLOT_CAN_T_RENAME :{WHITE}Can't re
STR_TRACE_RESTRICT_ERROR_SLOT_CAN_T_ADD_VEHICLE :{WHITE}Can't add the vehicle to this slot...
STR_TRACE_RESTRICT_ERROR_SLOT_CAN_T_REMOVE_VEHICLE :{WHITE}Can't remove the vehicle from this slot...
STR_TRACE_RESTRICT_ERROR_SLOT_CAN_T_SET_MAX_OCCUPANCY :{WHITE}Can't set maximum occupancy of this slot...
STR_TRACE_RESTRICT_ERROR_COUNTER_CAN_T_CREATE :{WHITE}Can't create counter...
STR_TRACE_RESTRICT_ERROR_COUNTER_CAN_T_DELETE :{WHITE}Can't delete this counter...
STR_TRACE_RESTRICT_ERROR_COUNTER_CAN_T_RENAME :{WHITE}Can't rename counter...
STR_TRACE_RESTRICT_ERROR_COUNTER_CAN_T_MODIFY :{WHITE}Can't modify this counter...
# Programmable Pre-Signals
STR_PROGRAM_SIGNAL_TOOLTIP :{BLACK}Program pre-signal