Skip to content

Commit

Permalink
BF: Bug fix happypy
Browse files Browse the repository at this point in the history
  • Loading branch information
@beegica
beegica committed Jan 27, 2022
1 parent 4edba94 commit 3f291ee
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 38 deletions.
9 changes: 6 additions & 3 deletions main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,7 @@ def ToOut(message, exp, post_urlFULL):
exp.HAPPY_SPEED = CogBatt_config.HAPPY_INC_START
exp.happy_start_time = Ref(clock.now)
exp.last_check = Ref(clock.now)
Debug(a=exp.HAPPY_SPEED, b=exp.happy_start_time, c=ans.press_time['time'],
d=ans.press_time['time'] - exp.happy_start_time < CogBatt_config.NON_PRESS_INT)

with If(ans.pressed == CogBatt_config.RESP_HAPPY[0]):
with If(sld.value - exp.HAPPY_SPEED <= (-1 * CogBatt_config.HAPPY_RANGE)):
UpdateWidget(sld, value=(-1 * CogBatt_config.HAPPY_RANGE))
Expand Down Expand Up @@ -316,11 +315,15 @@ def ToOut(message, exp, post_urlFULL):

with Elif(TL.current[0] == "bart"):
Wait(.5)
if hasattr(sys, '_MEIPASS'):
task2dir = os.path.join(os.path.join(sys._MEIPASS), "tasks", "BARTUVA")
else:
task2dir = os.path.join("tasks", "BARTUVA")
BartuvaExp(Bartuva_config,
run_num=BL.i,
sub_dir=Ref.object(exp)._session_dir,
practice=False,
task_dir=os.path.join("tasks", "BARTUVA"),
task_dir=task2dir,
happy_mid=TL.current[1])

Wait(1.0)
Expand Down
2 changes: 0 additions & 2 deletions tasks/AssBind/happy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ def HappyQuest(self, config, task, block_num, trial_num):
config.NON_PRESS_INT):
self.HAPPY_SPEED = (config.HAPPY_INC_BASE * (Ref(clock.now) -
self.happy_start_time) * config.HAPPY_MOD) + config.HAPPY_INC_START

with Else():
self.HAPPY_SPEED = config.HAPPY_INC_START
self.happy_start_time = Ref(clock.now)
self.last_check = Ref(clock.now)

with If(ans.pressed == config.RESP_HAPPY[0]):
with If(sld.value - self.HAPPY_SPEED <= (-1*config.HAPPY_RANGE)):
UpdateWidget(sld, value=(-1*config.HAPPY_RANGE))
Expand Down
2 changes: 0 additions & 2 deletions tasks/BARTUVA/happy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ def HappyQuest(self, config, task, block_num, trial_num):
config.NON_PRESS_INT):
self.HAPPY_SPEED = (config.HAPPY_INC_BASE * (Ref(clock.now) -
self.happy_start_time) * config.HAPPY_MOD) + config.HAPPY_INC_START

with Else():
self.HAPPY_SPEED = config.HAPPY_INC_START
self.happy_start_time = Ref(clock.now)
self.last_check = Ref(clock.now)

with If(ans.pressed == config.RESP_HAPPY[0]):
with If(sld.value - self.HAPPY_SPEED <= (-1*config.HAPPY_RANGE)):
UpdateWidget(sld, value=(-1*config.HAPPY_RANGE))
Expand Down
56 changes: 27 additions & 29 deletions tasks/RDM/happy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,34 @@ def HappyQuest(self, config, task, block_num, trial_num):
Label(text='Press Spacebar to lock-in your response.',
top=sld.bottom - s(250), font_size=s(config.HAPPY_FONT_SIZE))

with UntilDone():
self.happy_start_time = Ref(clock.now)
self.last_check = self.happy_start_time
self.happy_dur = 0.0
self.HAPPY_SPEED = config.HAPPY_INC_BASE
self.first_press_time = None
with Loop():
ans = KeyPress(keys=config.RESP_HAPPY)
with If(self.first_press_time == None):
self.first_press_time = ans.press_time
with If(ans.press_time['time'] - self.last_check <
config.NON_PRESS_INT):
self.HAPPY_SPEED = (config.HAPPY_INC_BASE * (Ref(clock.now) -
self.happy_start_time) * config.HAPPY_MOD) + config.HAPPY_INC_START

with UntilDone():
self.happy_start_time = Ref(clock.now)
self.last_check = self.happy_start_time
self.happy_dur = 0.0
self.HAPPY_SPEED = config.HAPPY_INC_BASE
self.first_press_time = None
with Loop():
ans = KeyPress(keys=config.RESP_HAPPY)
with If(self.first_press_time == None):
self.first_press_time = ans.press_time
with If(ans.press_time['time'] - self.last_check <
config.NON_PRESS_INT):
self.HAPPY_SPEED = (config.HAPPY_INC_BASE * (Ref(clock.now) -
self.happy_start_time) * config.HAPPY_MOD) + config.HAPPY_INC_START
with Else():
self.HAPPY_SPEED = config.HAPPY_INC_START
self.happy_start_time = Ref(clock.now)
self.last_check = Ref(clock.now)
with If(ans.pressed == config.RESP_HAPPY[0]):
with If(sld.value - self.HAPPY_SPEED <= (-1*config.HAPPY_RANGE)):
UpdateWidget(sld, value=(-1*config.HAPPY_RANGE))
with Else():
self.HAPPY_SPEED = config.HAPPY_INC_START
self.happy_start_time = Ref(clock.now)
self.last_check = Ref(clock.now)

with If(ans.pressed == config.RESP_HAPPY[0]):
with If(sld.value - self.HAPPY_SPEED <= (-1*config.HAPPY_RANGE)):
UpdateWidget(sld, value=(-1*config.HAPPY_RANGE))
with Else():
UpdateWidget(sld, value=sld.value - self.HAPPY_SPEED)
with Elif(ans.pressed == config.RESP_HAPPY[1]):
with If(sld.value + self.HAPPY_SPEED >= config.HAPPY_RANGE):
UpdateWidget(sld, value=config.HAPPY_RANGE)
with Else():
UpdateWidget(sld, value=sld.value + self.HAPPY_SPEED)
UpdateWidget(sld, value=sld.value - self.HAPPY_SPEED)
with Elif(ans.pressed == config.RESP_HAPPY[1]):
with If(sld.value + self.HAPPY_SPEED >= config.HAPPY_RANGE):
UpdateWidget(sld, value=config.HAPPY_RANGE)
with Else():
UpdateWidget(sld, value=sld.value + self.HAPPY_SPEED)
with UntilDone():
submit = KeyPress(keys=['SPACEBAR'])
Log(name="happy",
Expand Down
2 changes: 0 additions & 2 deletions tasks/flanker/happy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ def HappyQuest(self, config, task, block_num, trial_num):
config.NON_PRESS_INT):
self.HAPPY_SPEED = (config.HAPPY_INC_BASE * (Ref(clock.now) -
self.happy_start_time) * config.HAPPY_MOD) + config.HAPPY_INC_START

with Else():
self.HAPPY_SPEED = config.HAPPY_INC_START
self.happy_start_time = Ref(clock.now)
self.last_check = Ref(clock.now)

with If(ans.pressed == config.RESP_HAPPY[0]):
with If(sld.value - self.HAPPY_SPEED <= (-1*config.HAPPY_RANGE)):
UpdateWidget(sld, value=(-1*config.HAPPY_RANGE))
Expand Down

0 comments on commit 3f291ee

Please sign in to comment.