Skip to content
Snippets Groups Projects

some small pep8 fixed and splash window has no top border

Merged Ghost User requested to merge final-changes into master
2 files
+ 32
29
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 10
10
@@ -6,6 +6,7 @@ from utils import id_regex, shadow_regex
from time import localtime, strftime
from mistake_enum import *
class Controller:
def __init__(self, view, model):
@@ -366,8 +367,7 @@ class Controller:
for s in participant.source:
for c in changed:
if s.word == c[0] and round(s.onset, 3) == float(c[1])\
and (s.shadow is None) and c[2] == "NA"\
and s.mistake is Mistake.SKIPPED:
and (s.shadow is None) and c[2] == "NA":
new_mistake = c[4]
# Source mistakes cannot be random
if new_mistake == Mistake.RANDOM:
@@ -385,14 +385,14 @@ class Controller:
for c in changed:
if s.word == c[2] and s.source is None \
and round(s.onset, 3) == float(c[3]):
new_mistake = c[4]
# Change to correct
if new_mistake == Mistake.CORRECT:
s.mistake = None
s.shadowed = True
# Change to mistake
else:
s.mistake = new_mistake
new_mistake = c[4]
# Change to correct
if new_mistake == Mistake.CORRECT:
s.mistake = None
s.shadowed = True
# Change to mistake
else:
s.mistake = new_mistake
elif s.source is not None:
if s.word == c[2] and s.source.word == c[0] \
Loading