Skip to content

Commit 6825c1e

Browse files
authored
Merge 3261eec into 0fa7b4d
2 parents 0fa7b4d + 3261eec commit 6825c1e

File tree

13 files changed

+461
-203
lines changed

13 files changed

+461
-203
lines changed
Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,45 @@
1-
name: miss_hit_quality
1+
name: miss_hit
22

33
on:
44
push:
55
branches:
66
- main
7-
- master
87
- dev
8+
paths:
9+
- '**.m'
910
pull_request:
1011
branches: ['*']
12+
paths:
13+
- '**.m'
1114

1215
jobs:
13-
build:
16+
17+
miss_hit:
1418

1519
runs-on: ubuntu-latest
1620

21+
strategy:
22+
matrix:
23+
command: ["mh_style", "mh_metric --ci && mh_lint"]
24+
fail-fast: true # cancel all jobs if one fails
25+
1726
steps:
1827

19-
- name: Install CPP_ROI
20-
uses: actions/checkout@v3
28+
- uses: actions/checkout@v3
2129
with:
2230
submodules: true
2331
fetch-depth: 1
2432

25-
- name: Set up Python 3.6
33+
- name: Set up Python
2634
uses: actions/setup-python@v2
2735
with:
28-
python-version: 3.6
36+
python-version: 3.9
2937

3038
- name: Install dependencies
3139
run: |
3240
python -m pip install --upgrade pip setuptools
3341
pip3 install -r requirements.txt
3442
35-
- name: MISS_HIT Metrics
36-
run: |
37-
mh_metric --ci
38-
39-
- name: MISS_HIT Bug finder
43+
- name: ${{ matrix.command }}
4044
run: |
41-
mh_lint
45+
${{ matrix.command }}

.github/workflows/miss_hit_style.yml

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

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[![miss_hit_style](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/miss_hit_style.yml/badge.svg)](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/miss_hit_style.yml)
2-
[![miss_hit_quality](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/miss_hit_quality.yml/badge.svg)](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/miss_hit_quality.yml)
1+
[![miss_hit](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/miss_hit.yml/badge.svg)](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/miss_hit.yml)
32
[![tests and coverage with matlab](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/run_tests_matlab.yml/badge.svg)](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/run_tests_matlab.yml)
43
[![codecov](https://codecov.io/gh/cpp-lln-lab/CPP_ROI/branch/main/graph/badge.svg?token=8IoRQtbFUV)](https://codecov.io/gh/cpp-lln-lab/CPP_ROI)
54

demos/WIP/get_ROI_Coordinates.m

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

demos/roi/get_peak_coordinates.m

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
% (C) Copyright 2020 CPP ROI developers
2+
3+
% Shows how to get the peak coordinate within a ROI
4+
roiImage = extractRoiFromAtlas(pwd, 'wang', 'V1v', 'L');
5+
6+
% Data to read the maximum from
7+
gunzip(fullfile(pwd, 'inputs', '*.gz'));
8+
dataImage = fullfile(pwd, 'inputs', 'TStatistic.nii');
9+
10+
% If there is no value above a certain threshold the function will return NaN
11+
threshold = 1;
12+
13+
% The image and the ROI must have the same dimension if we want to use the thresold option
14+
reslicedImages = resliceRoiImages(dataImage, roiImage);
15+
16+
% Get to work.
17+
[worldCoord, voxelCoord, maxVal] = getPeakCoordinates(dataImage, reslicedImages, threshold);

docs/source/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
author = "the CPP ROI dev team"
2424

2525
# The full version, including alpha/beta/rc tags
26-
release = "v0.2.0dev"
26+
with open('../../version.txt', encoding='utf-8') as version_file:
27+
release = version_file.read()
2728

2829

2930
# -- General configuration ---------------------------------------------------

docs/source/roi.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ Region of interest
44
.. automodule:: src.roi
55

66
.. autofunction:: createRoi
7+
.. autofunction:: getPeakCoordinates
78
.. autofunction:: keepHemisphere
9+
.. autofunction:: plotDataInRoi
810
.. autofunction:: thresholdToMask
911
.. autofunction:: renameNeuroSynth
1012
.. autofunction:: resliceRoiImages

src/roi/checkRoiOrientation.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
%
77
% :param referenceImage: better if fullfile path
88
% :type referenceImage: string
9+
%
910
% :param imagesToCheck: better if fullfile path
1011
% :type imagesToCheck: string
1112
%

0 commit comments

Comments
 (0)