개정판 1eed6634
issue #1048 : 화면/메뉴/툴바
Change-Id: I8fff7128aba5fb287130ea1d3837756a8e457597
HYTOS/HYTOS/MainWindow.py | ||
---|---|---|
1059 | 1059 |
if strmsg.__contains__('-'): |
1060 | 1060 |
last_stream_num = str(strmsg).rsplit('-', 1)[1] |
1061 | 1061 |
else: |
1062 |
last_stream_num = '0'
|
|
1062 |
last_stream_num = str(strmsg).rsplit(' ', 1)[1]
|
|
1063 | 1063 |
|
1064 |
if pre_stream_num == int(last_stream_num): |
|
1065 |
strmsg = '{}-{}'.format(strmsg, cur_stream_num) |
|
1066 |
else: |
|
1064 |
if pre_stream_num != int(last_stream_num): |
|
1067 | 1065 |
strmsg = '{}-{}-{}'.format(strmsg, pre_stream_num, cur_stream_num) |
1068 | 1066 |
|
1069 |
# if pre_stream_num == cur_stream_num: |
|
1070 |
# strmsg = '{}-{}'.format(strmsg, cur_stream_num) |
|
1071 |
# else: |
|
1072 |
# strmsg = '{}-{}-{}'.format(strmsg, pre_stream_num, cur_stream_num) |
|
1073 |
|
|
1074 | 1067 |
last_stream_num = loop.items[len(loop.items) - 2].stream_no |
1075 | 1068 |
strmsg = '{}-{}'.format(strmsg, last_stream_num) |
1076 | 1069 |
|
... | ... | |
1573 | 1566 |
if strmsg.__contains__('-'): |
1574 | 1567 |
last_stream_num = str(strmsg).rsplit('-', 1)[1] |
1575 | 1568 |
else: |
1576 |
last_stream_num = '0'
|
|
1569 |
last_stream_num = str(strmsg).rsplit(' ', 1)[1]
|
|
1577 | 1570 |
|
1578 |
if pre_stream_num == int(last_stream_num): |
|
1579 |
strmsg = '{}-{}'.format(strmsg, cur_stream_num) |
|
1580 |
else: |
|
1571 |
if pre_stream_num != int(last_stream_num): |
|
1581 | 1572 |
strmsg = '{}-{}-{}'.format(strmsg, pre_stream_num, cur_stream_num) |
1582 | 1573 |
|
1583 | 1574 |
last_stream_num = loop.items[len(loop.items) - 2].stream_no |
내보내기 Unified diff