Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes from upstream #332

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
ea14cca
Merge pull request #1 from bear-rsg/changes-from-remote
JeremyPike Dec 18, 2023
d7dd3d3
Merge branch 'main' of https://github.com/datacarpentry/image-processing
JeremyPike Jan 3, 2024
98621f8
Merge pull request #2 from bear-rsg/changes-from-carpentries
JeremyPike Jan 3, 2024
dcfec5d
multi-demensional data episode
JeremyPike Jan 3, 2024
adcf749
Merge pull request #3 from bear-rsg/napari
JeremyPike Jan 3, 2024
a910bc4
adding multi-dimensional episode
JeremyPike Jan 3, 2024
787ab49
Merge pull request #4 from bear-rsg/napari
JeremyPike Jan 3, 2024
4a4173d
introductory sections
JeremyPike Jan 3, 2024
0cb9af3
conflicts
JeremyPike Jan 3, 2024
04f9e68
napari introduction
JeremyPike Jan 3, 2024
a1c6551
interactive visulaistation section
JeremyPike Jan 10, 2024
26afca3
missing section end
JeremyPike Jan 10, 2024
1554ca7
numpy import
JeremyPike Jan 10, 2024
5dc5dd2
3d data section
JeremyPike Jan 11, 2024
78dca15
timelapse section
JeremyPike Jan 11, 2024
4b87fc4
complete first draft
JeremyPike Jan 19, 2024
774ca57
updated setup
JeremyPike Jan 19, 2024
365fcb3
updates to setup
JeremyPike Jan 19, 2024
0b84513
proofread
JeremyPike Jan 19, 2024
11efe40
Suggestions from James A review
JeremyPike Jan 26, 2024
3701002
Merge pull request #5 from bear-rsg/napari
JeremyPike Jan 26, 2024
510da5f
Add note on multidimensional data episode
JeremyPike Jan 26, 2024
e8bc9e3
Merge pull request #6 from bear-rsg/readme-modification
JeremyPike Jan 26, 2024
e030a55
New data download link
JeremyPike Jan 26, 2024
e394601
updated data link
JeremyPike Jan 26, 2024
072713a
Merge pull request #7 from bear-rsg/data-download
JeremyPike Jan 26, 2024
22fda07
update url
JeremyPike Feb 1, 2024
c27f151
update url
JeremyPike Feb 1, 2024
c48ebd2
add https
JeremyPike Feb 1, 2024
a6336bb
clearer setup instructions
JeremyPike Feb 2, 2024
85d0db1
Merge pull request #8 from bear-rsg/url-update
JeremyPike Feb 2, 2024
6e3fc21
Merge pull request #9 from bear-rsg/setup-instructions
JeremyPike Feb 2, 2024
122cc1e
logical order for setup
JeremyPike Feb 2, 2024
1ee0b7a
Update learners/setup.md
JeremyPike Feb 2, 2024
fc0b166
Merge pull request #10 from bear-rsg/improved-setup
JeremyPike Feb 2, 2024
a23aea4
Merge remote-tracking branch 'upstream/main'
JeremyPike Feb 2, 2024
c4b44c4
Merge pull request #11 from bear-rsg/changes-from-upstream
JeremyPike Feb 2, 2024
8a387c1
Update conda before creating enviroment
JeremyPike Feb 15, 2024
c2619a4
Update learners/setup.md
JeremyPike Feb 15, 2024
f55b554
Merge pull request #12 from bear-rsg/update-conda
JeremyPike Feb 15, 2024
032e925
mamba instead of conda
JeremyPike Apr 23, 2024
cddda74
Merge pull request #13 from bear-rsg/mamba
JeremyPike Apr 23, 2024
f9d6835
image basics changes
JeremyPike Apr 26, 2024
6b7fed7
skimage episode changes
JeremyPike Apr 26, 2024
e34922d
drawing episode changes
JeremyPike Apr 26, 2024
d819947
changes from carpentries repo
JeremyPike Apr 26, 2024
c2896d6
fullstop
JeremyPike Apr 26, 2024
642623a
Merge pull request #14 from bear-rsg/round2-revisions
JeremyPike Apr 26, 2024
d6a2b63
updated setup
JeremyPike Nov 12, 2024
4785b75
Merge pull request #15 from bear-rsg/setup-updates
JeremyPike Nov 12, 2024
4caec85
Merge remote-tracking branch 'upstream/main' into main-repo
JeremyPike Nov 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ This lesson introduces fundamental concepts in image handling and processing. Le
The lesson assumes a working knowledge of Python and some previous exposure to the Bash shell.
A detailed list of prerequisites can be found in [`learners/prereqs.md`](learners/prereqs.md).

## Multidimensional Data Episode

There is an extra episode covering analysis of multidimensional data (3D stacks and timelapses) including use of the [Napari](https://napari.org/stable/) image viewer. This additional episode is not part of the official [Carpentries Image Processing with Python lesson](https://datacarpentry.org/image-processing/). It was developed by [Jeremy Pike](https://www.birmingham.ac.uk/research/arc/rsg/staff/jeremy-pike.aspx) from the [Research Software Group](https://www.birmingham.ac.uk/research/arc/rsg/bear-software.aspx) and the
[Institute for Interdisciplinary Data Science and AI](https://www.birmingham.ac.uk/research/data-science/index.aspx) at the University of Birmingham.

## Contribution

- Make a suggestion or correct an error by [raising an Issue](https://github.com/datacarpentry/image-processing/issues).
Expand Down
11 changes: 6 additions & 5 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ contact: '[email protected]'
# - another-learner.md

# Order of episodes in your lesson
episodes:
episodes:
- 01-introduction.md
- 02-image-basics.md
- 03-skimage-images.md
Expand All @@ -68,22 +68,23 @@ episodes:
- 07-thresholding.md
- 08-connected-components.md
- 09-challenges.md
- 10-multidimensional-data.md

# Information for Learners
learners:
learners:

# Information for Instructors
instructors:
instructors:

# Learner Profiles
profiles:
profiles:

# Customisation ---------------------------------------------
#
# This space below is where custom yaml items (e.g. pinning
# sandpaper and varnish versions) should live


url: 'https://datacarpentry.github.io/image-processing'
url: 'https://bear-rsg.github.io/image-processing'
analytics: carpentries
lang: en
Loading
Loading