Merge pull request #28 from RebeccaHirst/master

minor edits to slides
psychopy · Oct 8, 2020 · 583dc90 · 583dc90
2 parents a46b73c + 8d8fb79
commit 583dc90
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git 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
@@ -258,4 +258,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`.
+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. 
diff --git a/source/3days/pavlovia.rst b/source/3days/pavlovia.rst
@@ -113,6 +113,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
@@ -244,3 +253,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. 
diff --git a/source/3days/pavloviaLaunch.rst b/source/3days/pavloviaLaunch.rst
@@ -31,7 +31,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?
 
@@ -47,7 +47,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.
 
@@ -103,4 +103,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`
+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`
diff --git a/source/_images/badVerControl.png b/source/_images/badVerControl.png