Skip to content

Commit 6baa22e

Browse files
authored
Merge pull request #151 from Remi-Gau/remi-update_doc
[DOC] update doc
2 parents 17230bd + 05f80b4 commit 6baa22e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+565
-767
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
*.m~
44
*octave-workspace
55

6+
.vscode/*
7+
68
# exclude content of logfiles folders
79
*.tsv
810
*.mat

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ formats:
2323
python:
2424
version: 3.7
2525
install:
26-
- requirements: docs/requirements.txt
26+
- requirements: requirements.txt

README.md

Lines changed: 2 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,8 @@
3030
<!-- TOC -->
3131

3232
- [CPP_PTB](#cpp_ptb)
33-
- [Requirements](#requirements)
3433
- [Documentation](#documentation)
3534
- [Content](#content)
36-
- [How to install](#how-to-install)
37-
- [Download with git](#download-with-git)
38-
- [Add as a submodule](#add-as-a-submodule)
39-
- [Example for submodule usage](#example-for-submodule-usage)
40-
- [Direct download](#direct-download)
41-
- [Add CPP_PTB globally to the matlab path](#add-cpp_ptb-globally-to-the-matlab-path)
4235
- [Code style guide](#code-style-guide)
4336
- [Unit tests](#unit-tests)
4437
- [Contributors ✨](#contributors-)
@@ -53,30 +46,10 @@ toolbox.
5346
Those functions are mostly wrappers around some PTB functions to facilitate
5447
their use and their reuse (#DontRepeatYourself)
5548

56-
## Requirements
57-
58-
Make sure that the following toolboxes are installed and added to the matlab /
59-
octave path.
60-
61-
For instructions see the following links:
62-
63-
<!-- lint disable -->
64-
65-
| Requirements | Used version |
66-
| -------------------------------------------------------- | ------------ |
67-
| [PsychToolBox](http://psychtoolbox.org/) | >=3.0.14 |
68-
| [Matlab](https://www.mathworks.com/products/matlab.html) | >=2015b |
69-
| or [Octave](https://www.gnu.org/software/octave/) | 4.? |
70-
71-
<!-- lint enable -->
72-
73-
Tested:
74-
75-
- matlab 2015b or octave 4.2.2 and PTB 3.0.14.
76-
7749
## Documentation
7850

79-
All the documentation is accessible [here](./docs/00-index.md).
51+
All the documentation and installtion information is accessible
52+
[here](https://cpp-ptb.readthedocs.io/en/stable/index.html#).
8053

8154
## Content
8255

@@ -95,111 +68,6 @@ All the documentation is accessible [here](./docs/00-index.md).
9568
└── tests # all the tests that that can be run by github actions
9669
```
9770

98-
## How to install
99-
100-
The easiest way to use this repository is to create a new repository by using
101-
the
102-
[template PTB experiment repository](https://github.com/cpp-lln-lab/template_PTB_experiment):
103-
this creates a new repository on your github account with all the basic folders,
104-
files and submodules already set up. You only have to then clone the repository
105-
and you are good to go.
106-
107-
### Download with git
108-
109-
```bash
110-
cd fullpath_to_directory_where_to_install
111-
# use git to download the code
112-
git clone https://github.com/cpp-lln-lab/CPP_PTB.git
113-
# move into the folder you have just created
114-
cd CPP_PTB
115-
```
116-
117-
Then get the latest commit to stay up to date:
118-
119-
```bash
120-
# from the directory where you downloaded the code
121-
git pull origin master
122-
```
123-
124-
To work with a specific version, create a branch at a specific version tag
125-
number
126-
127-
```bash
128-
# creating and checking out a branch that will be called version1 at the version tag v1.0.0
129-
git checkout -b version1 v1.0.0
130-
```
131-
132-
### Add as a submodule
133-
134-
Add it as a submodule in the repo you are working on.
135-
136-
```bash
137-
cd fullpath_to_directory_where_to_install
138-
# use git to download the code
139-
git submodule add https://github.com/cpp-lln-lab/CPP_PTB.git
140-
```
141-
142-
To get the latest commit you then need to update the submodule with the
143-
information on its remote repository and then merge those locally.
144-
145-
```bash
146-
git submodule update --remote --merge
147-
```
148-
149-
Remember that updates to submodules need to be committed as well.
150-
151-
#### Example for submodule usage
152-
153-
So say you want to clone a repo that has some nested submodules, then you would
154-
type this to get the content of all the submodules at once (here with my
155-
experiment repo):
156-
157-
```bash
158-
git clone --recurse-submodules https://github.com/user_name/yourExperiment.git
159-
```
160-
161-
This would be the way to do it "by hand"
162-
163-
```bash
164-
# clone the repo
165-
git clone https://github.com/user_name/yourExperiment.git
166-
167-
# go into the directory
168-
cd yourExperiment
169-
170-
# initialize and get the content of the first level of submodules (CPP_PTB and CPP_BIDS)
171-
git submodule init
172-
git submodule update
173-
174-
# get the nested submodules JSONio and BIDS-matlab for CPP_BIDS
175-
git submodule foreach --recursive 'git submodule init'
176-
git submodule foreach --recursive 'git submodule update'
177-
```
178-
179-
### Direct download
180-
181-
Download the code. Unzip. And add to the matlab path.
182-
183-
Pick a specific version from
184-
[here](https://github.com/cpp-lln-lab/CPP_PTB/releases).
185-
186-
Or take
187-
[the latest commit](https://github.com/cpp-lln-lab/CPP_PTB/archive/master.zip) -
188-
NOT RECOMMENDED.
189-
190-
### Add CPP_PTB globally to the matlab path
191-
192-
This is NOT RECOMMENDED as this might create conflicts if you use different
193-
versions of CPP_PTB as sub-modules.
194-
195-
Also note that this might not work at all if you have not set a command line
196-
alias to start Matlab from a terminal window by just typing `matlab`. :wink:
197-
198-
```bash
199-
# from within the CPP_PTB folder
200-
matlab -nojvm -nosplash -r "addpath(genpath(fullfile(pwd, 'src'))); savepath(); path(); exit();"
201-
```
202-
20371
## Code style guide
20472

20573
We use the `camelCase` to more easily differentiates our functions from the ones

0 commit comments

Comments
 (0)