From 8d8fb79b466cab74afe6654b778f75083631cb10 Mon Sep 17 00:00:00 2001 From: Rebecca Hirst <30597180+RebeccaHirst@users.noreply.github.com> Date: Thu, 8 Oct 2020 12:52:01 +0100 Subject: [PATCH] minor edits to slides --- source/3days/coding/index.rst | 6 +----- source/3days/debuggingOnline.rst | 7 ++++++- source/3days/pavlovia.rst | 15 +++++++++++++++ source/3days/pavloviaLaunch.rst | 6 +++--- source/_images/badVerControl.png | Bin 0 -> 8204 bytes 5 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 source/_images/badVerControl.png diff --git a/source/3days/coding/index.rst b/source/3days/coding/index.rst index 8b8ce1b..ceb76c1 100644 --- a/source/3days/coding/index.rst +++ b/source/3days/coding/index.rst @@ -441,11 +441,7 @@ NB: If you hit the red stop button in PsychoPy it issues a very severe abort and All done! ------------- -You can see all the steps that were used here (and some further ones in the intermediate stream) here: - - - https://github.com/psychopy/posner/commits - -You should have a working version of the Posner Cueing task. +If I push these changes to pavlovia, you can see the changes we make to the task throughout task creation... Improvements... ----------------- diff --git a/source/3days/debuggingOnline.rst b/source/3days/debuggingOnline.rst index 200fb4c..c822dd8 100644 --- a/source/3days/debuggingOnline.rst +++ b/source/3days/debuggingOnline.rst @@ -252,4 +252,9 @@ Take home messages - Use the developer tools - You can get more help on discourse! -So we have now already encountered some code, let's learn some more and :ref:`firstExperiment`. \ No newline at end of file +So we have now already encountered some code, let's learn some more and :ref:`firstExperiment`. + +Exercise +----------------- + +Try to push the experiment we made yesterday online. List any bugs you find and how you fixed them. \ No newline at end of file diff --git a/source/3days/pavlovia.rst b/source/3days/pavlovia.rst index deb936b..e950127 100644 --- a/source/3days/pavlovia.rst +++ b/source/3days/pavlovia.rst @@ -106,6 +106,15 @@ Benefits of GitLab (the important bits): Gitlab: version control ----------------- +Bad practice. + +.. image:: /_images/badVerControl.png + :align: right + +NB: this example resulted from me downloading another posters experiment and uploading as new project, instead of forking (which would have made a new project name). + +.. nextSlide:: + You can see when the last changes were made to the task by looking at the commit history .. image:: /_images/gitlabComHistory.png @@ -237,3 +246,9 @@ Pushing your studies to Pavlovia? ----------------- Now we have explored pavlovia.org let's see how to :ref:`builderToPavlovia` + + +Exercise +----------------- + +Try to push the experiment we made yesterday online. List any bugs you find and how you fixed them. \ No newline at end of file diff --git a/source/3days/pavloviaLaunch.rst b/source/3days/pavloviaLaunch.rst index 62dc30a..1215881 100644 --- a/source/3days/pavloviaLaunch.rst +++ b/source/3days/pavloviaLaunch.rst @@ -24,7 +24,7 @@ Download an image you want (preferably with a transparent background e.g. .png) .. nextSlide:: -Exercise: +Question: On each trial we will present our image. We want to present our image in a different location on each trial. How do we do that? @@ -40,7 +40,7 @@ We create a conditions file containing the desired X and Y coordinates on each t Gather a response ----------------- -Exercise: +Question: On each trial, we want to gather responses from the mouse. @@ -96,4 +96,4 @@ If we then go to our Experiments in the pavlovia Dashboard, we should see our ta There we have it! our first basic task in pavlovia!! -In reality, things are not always smooth. Next we will build on this task to cover some tips in :ref:`debuggingOnline` \ No newline at end of file +In reality, things are not always smooth (but we are working on it!). Next we will build on this task to cover some tips in :ref:`debuggingOnline` \ No newline at end of file diff --git a/source/_images/badVerControl.png b/source/_images/badVerControl.png new file mode 100644 index 0000000000000000000000000000000000000000..e5e74bb02a7c2b6cd12fe7764b8000d7a9f4e63e GIT binary patch literal 8204 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 literal 0 HcmV?d00001