- pyControl version 1.5.

- Merged dev brange into master, updated ChangeLog.txt, readme.text and config/gui_settings.

Author: ThomasAkam

ChangeLog.txt

@@ -1,32 +1,46 @@
 -------------------------------------------------------------------------------
-Version 1.4.1 rc
+Version 1.5 11/02/2019
 -------------------------------------------------------------------------------
 
 GUI:
 
-- Persistent variables implementation now allows running different subjects on
-  different sessions in same experiment data folder without overwriting the
-  persistent variables. 
+- Task files used in an experiment are now automatically saved in the 
+  experiments data folder with a file hash appended to the task file name
+  to uniquely identify the file version.  Whenever a task file used in the
+  experiment is modified the new version will be saved to the data folder when
+  the experiment is run.  The task file hash used for each session is recorded
+  in the session's data file so the exact task file used to run each session
+  can be identified.
 
-- Task files are now saved in experiment data folder with a file hash appended 
-  to the file name to indicate file version.  Whenever the task file is changed
-  the new version will be saved when the experiment is run.  The task file hash
-  used for each session is recorded in the session's data file so the exact task
-  file used to run each session can be identified.
+- A menu bar now provides quick access to online help, data/task folders, and
+  some GUI settings.
 
-- Event and state dictionaries now written to task file using json.dump to make
-  them easier to parse cross platform.
+- Behaviour plots can now be paused.
 
-- A menu bar now provides quick access to online help and data/task folders.
+- Keyboard shortcuts now implemented for some commonly actions, detailed in the
+  help menu.
 
 - Task variables can now be specified as private by ending the variable name
   with three underscores, making them invisible to the GUI.
 
-- A meaninful error message is now shown on failure to import dependencies.
+- A meaningful error message is now shown on failure to import dependencies.
+
+- Persistent variables implementation now allows running different subjects on
+  different sessions in same experiment data folder without overwriting the
+  persistent variables. 
+
+- Improved reliability of file transfer to pyboard.
 
 - Ordering of subjects in summary variables table is now consistent with that
   in configure experiment tab.
 
+- GUI is now launched by running file pyControl_GUI.py in the pyControl root
+  directory.
+
+- Event and state dictionaries now written to task file as JSON objects to 
+  make them easier to parse cross platform. This does not affect reading
+  task files in Python as JSON objects are also Python dicts (as used previously).
+
 - Various bugfixes and reliability improvements.
 
 CLI

config/gui_settings.py

@@ -1,6 +1,6 @@
 # Graphical user interface settings.
 
-VERSION = 1.4
+VERSION = '1.5'
 
 update_interval = 20 # Interval between calls to the GUIs update function (ms).
 

readme.txt

@@ -4,17 +4,17 @@ For more information please see the Docs: http://pycontrol.readthedocs.io/
 
 Repository contents:
 
-gui         : Graphical user interface
-cli         : Command line interface
-com         : Serial communication and data logging
-config      : Configuration files edited by user
-data        : Behavioural data.
-experiments : Experiment definition files.
-devices     : pyControl hardware classes (uploaded to pyboard).
-pyControl   : pyControl framework        (uploaded to pyboard).
-tasks       : Task definition files
-tools       : Tools for importing and visualising pycontrol data
+gui              : Graphical user interface
+com              : Serial communication and data logging
+config           : Configuration files edited by user
+data             : Behavioural data.
+experiments      : Experiment definition files.
+devices          : pyControl hardware classes (uploaded to pyboard).
+pyControl        : pyControl framework        (uploaded to pyboard).
+tasks            : Task definition files
+tools            : Tools for importing and visualising pycontrol data
+pyControl_GUI.py : Python script to launch the GUI.
 
-Version: v1.4
+Version: v1.5
 ---------------