csrichter
/
gr-multirds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

tmc_direction to multistr instead of location_text

dev
Clemens Richter 9 years ago
parent
2a329cb682
commit
11d164cdb4
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      python/tmc_classes.py

7
python/tmc_classes.py
Unescape View File

@ -671,7 +671,7 @@ class tmc_dict:
color="gray" color="gray"
if message.location.has_koord: if message.location.has_koord:
if loc==None:#first message at this location if loc==None:#first message at this location
map_tag+='<h3 title="lcn:%i" style="padding: 0px;margin: 0px;">'%message.location.lcn map_tag+='<h3 title="lcn:%i" style="padding: 0px;margin: 0px;">'%(message.location.lcn)
map_tag+=message.location_text() map_tag+=message.location_text()
map_tag+='</h3>' map_tag+='</h3>'
if message.cancellation_time==None: if message.cancellation_time==None:
@ -779,6 +779,7 @@ class tmc_message:
except AttributeError: except AttributeError:
multi="[multi incomplete]" multi="[multi incomplete]"
#print("got multistring") #print("got multistring")
multi+=", dir:%i"%self.tmc_dir
return str(multi) return str(multi)
def info_str(self): def info_str(self):
info="" info=""
@ -837,7 +838,7 @@ class tmc_message:
text+=templates[language+"_2b"].format(D=self.location.first_name) text+=templates[language+"_2b"].format(D=self.location.first_name)
else: else:
text+=templates[language+"_2a"].format(D=self.location.first_name,E=offset_loc_name) text+=templates[language+"_2a"].format(D=self.location.first_name,E=offset_loc_name)
text+=", dir:"+str(self.tmc_dir) #text+=", dir:%i"%self.tmc_dir
#LocCode: RefLine: RoadNr #LocCode: RefLine: RoadNr
#A #A
#LocCode:RefLine:Name2 #LocCode:RefLine:Name2
@ -967,7 +968,7 @@ class tmc_message:
self.tmc_DP=data.uint self.tmc_DP=data.uint
#label==1: control codes #label==1: control codes
elif label==1 and data.uint==2: elif label==1 and data.uint==2:
last_event.change_directionality#change directionality last_event.change_directionality()#change directionality of event
elif label==1 and data.uint==5: elif label==1 and data.uint==5:
self.tmc_D=1#set diversion bit self.tmc_D=1#set diversion bit
elif label==1 and data.uint==6: elif label==1 and data.uint==6:

Write Preview
Loading…
Cancel
Save