marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

feature/port-to-py3 #11

Merged
marcel merged 59 commits from feature/port-to-py3 into develop 2022-03-21 15:30:06 +01:00
Conversation 0 Commits 59 Files Changed 45 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 702b7f3fb1 - Show all commits

10
PyLoT.py
View File

@ -3250,8 +3250,8 @@ class MainWindow(QMainWindow):
'auto': event.pylot_autopicks} 'auto': event.pylot_autopicks}
ma_count = {'manual': 0, ma_count = {'manual': 0,
'auto': 0} 'auto': 0}
ma_count_total = {'manual': 0, #ma_count_total = {'manual': 0,
'auto': 0} # 'auto': 0}
for ma in ma_props.keys(): for ma in ma_props.keys():
if ma_props[ma]: if ma_props[ma]:
@ -3261,7 +3261,7 @@ class MainWindow(QMainWindow):
continue continue
if pick.get('spe'): if pick.get('spe'):
ma_count[ma] += 1 ma_count[ma] += 1
ma_count_total[ma] += 1 #ma_count_total[ma] += 1
# init table items for current row # init table items for current row
item_delete = QTableWidgetItem() item_delete = QTableWidgetItem()
@ -3273,9 +3273,9 @@ class MainWindow(QMainWindow):
item_depth = QTableWidgetItem() item_depth = QTableWidgetItem()
item_momentmag = QTableWidgetItem() item_momentmag = QTableWidgetItem()
item_localmag = QTableWidgetItem() item_localmag = QTableWidgetItem()
item_nmp = QTableWidgetItem('{}({})'.format(ma_count['manual'], ma_count_total['manual'])) item_nmp = QTableWidgetItem('{}'.format(ma_count['manual']))#, ma_count_total['manual']))
item_nmp.setIcon(self.manupicksicon_small) item_nmp.setIcon(self.manupicksicon_small)
item_nap = QTableWidgetItem('{}({})'.format(ma_count['auto'], ma_count_total['auto'])) item_nap = QTableWidgetItem('{}'.format(ma_count['auto']))#, ma_count_total['auto']))
item_nap.setIcon(self.autopicksicon_small) item_nap.setIcon(self.autopicksicon_small)
item_ref = QTableWidgetItem() item_ref = QTableWidgetItem()
item_test = QTableWidgetItem() item_test = QTableWidgetItem()