Skip to content

Commit a5bb2f6

Browse files
Merge pull request #162 from iqrashahzad14/master
Remove Flickering Dots
2 parents d88e9e4 + 4a6fe15 commit a5bb2f6

Some content is hidden

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

55 files changed

+638
-827
lines changed

.all-contributorsrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@
5252
"userTesting",
5353
"ideas"
5454
]
55+
},
56+
{
57+
"login": "fedefalag",
58+
"name": "Fede F.",
59+
"avatar_url": "https://avatars.githubusercontent.com/u/50373329?v=4",
60+
"profile": "https://github.com/fedefalag",
61+
"contributions": [
62+
"ideas",
63+
"code",
64+
"content"
65+
]
5566
}
5667
],
5768
"contributorsPerLine": 7,
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Check Markdown
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches: '*'
9+
10+
jobs:
11+
build:
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
17+
- uses: actions/checkout@v2
18+
with:
19+
submodules: true
20+
fetch-depth: 1
21+
22+
- uses: actions/setup-node@v2
23+
with:
24+
node-version: '10'
25+
26+
- name: Install dependencies and check markdown
27+
run: |
28+
npm install `cat npm-requirements.txt`
29+
npx remark . --frail
30+
31+

.github/workflows/check_md_links.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
push:
77
branches:
88
- master
9-
- dev
109
pull_request:
1110
branches: '*'
1211

.github/workflows/miss_hit.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
- dev
87
pull_request:
98
branches: '*'
109

@@ -28,12 +27,16 @@ jobs:
2827
- name: Install dependencies
2928
run: |
3029
python -m pip install --upgrade pip setuptools
31-
pip3 install install miss_hit
30+
pip3 install -r requirements.txt
3231
33-
- name: Miss_hit code quality
32+
- name: MISS_HIT Code style
3433
run: |
35-
mh_metric . --ci
34+
mh_style --process-slx
3635
37-
- name: Miss_hit code style
36+
- name: MISS_HIT Metrics
3837
run: |
39-
mh_style .
38+
mh_metric --ci
39+
40+
- name: MISS_HIT Bug finder
41+
run: |
42+
mh_lint

.github/workflows/moxunit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: MOxUnit
22

33
on:
44
push:

.gitignore

Lines changed: 6 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
@@ -13,3 +15,7 @@ cpp_ptb
1315

1416
# ignore file created by sphynx
1517
/docs/build
18+
19+
# exclude node js stuff
20+
node_modules/*
21+
package-lock.json

.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

.travis.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

README.md

Lines changed: 9 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,16 @@
2020
**Contributors**
2121

2222
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
23-
24-
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
25-
23+
[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-)
2624
<!-- ALL-CONTRIBUTORS-BADGE:END -->
2725

2826
# CPP_PTB
2927

3028
<!-- TOC -->
3129

3230
- [CPP_PTB](#cpp_ptb)
33-
- [Requirements](#requirements)
3431
- [Documentation](#documentation)
3532
- [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)
4233
- [Code style guide](#code-style-guide)
4334
- [Unit tests](#unit-tests)
4435
- [Contributors ✨](#contributors-)
@@ -53,30 +44,10 @@ toolbox.
5344
Those functions are mostly wrappers around some PTB functions to facilitate
5445
their use and their reuse (#DontRepeatYourself)
5546

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-
7747
## Documentation
7848

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

8152
## Content
8253

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

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-
20369
## Code style guide
20470

20571
We use the `camelCase` to more easily differentiates our functions from the ones
@@ -227,7 +93,7 @@ We use the
22793
to automatically fix some linting issues.
22894

22995
The code style and quality is also checked during the
230-
[continuous integration](./.travis.yml).
96+
[continuous integration](.github/workflows/miss_hit.yml).
23197

23298
## Unit tests
23399

@@ -240,21 +106,18 @@ Thanks goes to these wonderful people
240106
([emoji key](https://allcontributors.org/docs/en/emoji-key)):
241107

242108
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
243-
244109
<!-- prettier-ignore-start -->
245-
246110
<!-- markdownlint-disable -->
247-
248111
<table>
249112
<tr>
250-
<td align="center"><a href="https://remi-gau.github.io/"><img src="https://avatars3.githubusercontent.com/u/6961185?v=4" width="100px;" alt=""/><br /><sub><b>Remi Gau</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Code">💻</a> <a href="#design-Remi-Gau" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Documentation">📖</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/issues?q=author%3ARemi-Gau" title="Bug reports">🐛</a> <a href="#userTesting-Remi-Gau" title="User Testing">📓</a> <a href="#ideas-Remi-Gau" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-Remi-Gau" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-Remi-Gau" title="Maintenance">🚧</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Tests">⚠️</a> <a href="#question-Remi-Gau" title="Answering Questions">💬</a></td>
251-
<td align="center"><a href="https://github.com/marcobarilari"><img src="https://avatars3.githubusercontent.com/u/38101692?v=4" width="100px;" alt=""/><br /><sub><b>marcobarilari</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=marcobarilari" title="Code">💻</a> <a href="#design-marcobarilari" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=marcobarilari" title="Documentation">📖</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/issues?q=author%3Amarcobarilari" title="Bug reports">🐛</a> <a href="#userTesting-marcobarilari" title="User Testing">📓</a> <a href="#ideas-marcobarilari" title="Ideas, Planning, & Feedback">🤔</a></td>
252-
<td align="center"><a href="https://github.com/CerenB"><img src="https://avatars1.githubusercontent.com/u/10451654?v=4" width="100px;" alt=""/><br /><sub><b>CerenB</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=CerenB" title="Code">💻</a> <a href="#design-CerenB" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=CerenB" title="Documentation">📖</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/pulls?q=is%3Apr+reviewed-by%3ACerenB" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=CerenB" title="Tests">⚠️</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/issues?q=author%3ACerenB" title="Bug reports">🐛</a> <a href="#userTesting-CerenB" title="User Testing">📓</a> <a href="#ideas-CerenB" title="Ideas, Planning, & Feedback">🤔</a></td>
113+
<td align="center"><a href="https://remi-gau.github.io/"><img src="https://avatars3.githubusercontent.com/u/6961185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Remi Gau</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Code">💻</a> <a href="#design-Remi-Gau" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Documentation">📖</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/issues?q=author%3ARemi-Gau" title="Bug reports">🐛</a> <a href="#userTesting-Remi-Gau" title="User Testing">📓</a> <a href="#ideas-Remi-Gau" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-Remi-Gau" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-Remi-Gau" title="Maintenance">🚧</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Tests">⚠️</a> <a href="#question-Remi-Gau" title="Answering Questions">💬</a></td>
114+
<td align="center"><a href="https://github.com/marcobarilari"><img src="https://avatars3.githubusercontent.com/u/38101692?v=4?s=100" width="100px;" alt=""/><br /><sub><b>marcobarilari</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=marcobarilari" title="Code">💻</a> <a href="#design-marcobarilari" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=marcobarilari" title="Documentation">📖</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/issues?q=author%3Amarcobarilari" title="Bug reports">🐛</a> <a href="#userTesting-marcobarilari" title="User Testing">📓</a> <a href="#ideas-marcobarilari" title="Ideas, Planning, & Feedback">🤔</a></td>
115+
<td align="center"><a href="https://github.com/CerenB"><img src="https://avatars1.githubusercontent.com/u/10451654?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CerenB</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=CerenB" title="Code">💻</a> <a href="#design-CerenB" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=CerenB" title="Documentation">📖</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/pulls?q=is%3Apr+reviewed-by%3ACerenB" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=CerenB" title="Tests">⚠️</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/issues?q=author%3ACerenB" title="Bug reports">🐛</a> <a href="#userTesting-CerenB" title="User Testing">📓</a> <a href="#ideas-CerenB" title="Ideas, Planning, & Feedback">🤔</a></td>
116+
<td align="center"><a href="https://github.com/fedefalag"><img src="https://avatars.githubusercontent.com/u/50373329?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fede F.</b></sub></a><br /><a href="#ideas-fedefalag" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=fedefalag" title="Code">💻</a> <a href="#content-fedefalag" title="Content">🖋</a></td>
253117
</tr>
254118
</table>
255119

256-
<!-- markdownlint-enable -->
257-
120+
<!-- markdownlint-restore -->
258121
<!-- prettier-ignore-end -->
259122

260123
<!-- ALL-CONTRIBUTORS-LIST:END -->

0 commit comments

Comments
 (0)