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

[proposal] use checkable QPushButtons for phases instead of QLineEdit, as line edit is highly vulnerable to incorrect user input

Browse Source
This commit is contained in:
Marcel Paffrath 2017-06-30 09:42:36 +02:00
parent 9b22d0f8d6
commit a61eebba29
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pylot/RELEASE-VERSION Normal file
View File

@ -0,0 +1 @@
9b22-dirty

25
pylot/core/util/widgets.py
View File

@ -2584,18 +2584,31 @@ class PhasesTab(PropTab):
PphasesLabel = QLabel("P Phases to pick") PphasesLabel = QLabel("P Phases to pick")
SphasesLabel = QLabel("S Phases to pick") SphasesLabel = QLabel("S Phases to pick")
self.PphasesEdit = QLineEdit() # self.PphasesEdit = QLineEdit()
self.SphasesEdit = QLineEdit() # self.SphasesEdit = QLineEdit()
Pphases = 'P, Pg, Pn, PmP, P1, P2, P3' Pphases = 'P, Pg, Pn, PmP, P1, P2, P3'
Sphases = 'S, Sg, Sn, SmS, S1, S2, S3' Sphases = 'S, Sg, Sn, SmS, S1, S2, S3'
self.PphasesEdit.setText("%s" % Pphases) # self.PphasesEdit.setText("%s" % Pphases)
self.SphasesEdit.setText("%s" % Sphases) # self.SphasesEdit.setText("%s" % Sphases)
layout = QGridLayout() layout = QGridLayout()
layout.addWidget(PphasesLabel, 0, 0) layout.addWidget(PphasesLabel, 0, 0)
layout.addWidget(SphasesLabel, 1, 0) layout.addWidget(SphasesLabel, 1, 0)
layout.addWidget(self.PphasesEdit, 0, 1)
layout.addWidget(self.SphasesEdit, 1, 1) self.phaseButtons = {}
# loop over P and S
for phaseIndex, phases in enumerate([Pphases, Sphases]):
# loop through phases in string
for index, phase in enumerate(phases.split(',')):
index += 1 # skip first column with label
button = QtGui.QPushButton(str(phase))
button.setCheckable(True) # make button checkable
button.setChecked(True) # default checked?
layout.addWidget(button, phaseIndex, index) # add button to position
self.phaseButtons[str(phase)] = button # save button in dictionary for later use
# layout.addWidget(self.PphasesEdit, 0, 1)
# layout.addWidget(self.SphasesEdit, 1, 1)
self.setLayout(layout) self.setLayout(layout)