Skip to content

Commit

Permalink
Merge pull request #780 from carpentries/add-dc-image
Browse files Browse the repository at this point in the history
Template for DC Image curriculum
  • Loading branch information
zkamvar authored Feb 16, 2023
2 parents 082c084 + 09f036e commit d017523
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 17 deletions.
5 changes: 3 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ carpentry: "swc"
# dc-astronomy: for Data Carpentry Astronomy
# dc-ecology: for Data Carpentry Ecology
# dc-genomics: for Data Carpentry Genomics
# dc-image: for Data Carpentry Image Processing
# dc-socsci: for Data Carpentry Social Sciences
# dc-geospatial: for Data Carpentry Geospatial
# swc-inflammation: for Software Carpentry based on the inflammation dataset
Expand Down Expand Up @@ -74,8 +75,8 @@ title: "Workshop Title"
#------------------------------------------------------------

# This setting (kind) takes configurations from the styles
# template. Please do not modify this. If you are teaching
# a custom set of lessons or a single lesson, use a custom
# template. Please do not modify this. If you are teaching
# a custom set of lessons or a single lesson, use a custom
# schedule.
kind: "workshop"

Expand Down
27 changes: 27 additions & 0 deletions _includes/dc/schedule.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,33 @@ <h3>Day 2</h3>
</div>
</div>

{% elsif site.curriculum == "dc-image" %}
<div class="row">
<div class="col-md-6">
<h3>Day 1</h3>
<table class="table table-striped">
<tr>
<td>Before starting</td>
<td><a href="{{ site.pre_survey }}{{ site.github.project_title }}" target="_blank">Pre-workshop survey</a></td>
</tr>
<tr><td>Morning</td> <td> <a href="https://datacarpentry.org/image-processing/01-introduction/">Introduction</a></td></tr>
<tr><td> </td><td><a href="https://datacarpentry.org/image-processing/02-image-basics/">Image Basics</a></td></tr>
<tr><td> </td><td><a href="https://datacarpentry.org/image-processing/03-skimage-images/">Working with skimage</a></td></tr>
<tr><td>Afternoon</td> <td> <a href="https://datacarpentry.org/image-processing/04-drawing/">Drawing and Bitwise Operations</a></td></tr>
<tr><td> </td> <td> <a href="https://datacarpentry.org/image-processing/05-creating-histograms/">Creating Histograms</a></td></tr>
</table>
</div>
<div class="col-md-6">
<h3>Day 2</h3>
<table class="table table-striped">
<tr><td>Morning</td><td><a href="https://datacarpentry.org/image-processing/06-blurring/">Blurring Images</a></td></tr>
<tr><td> </td> <td> <a href="https://datacarpentry.org/image-processing/07-thresholding/">Thresholding</a></td></tr>
<tr><td>Afternoon</td><td><a href="https://datacarpentry.org/image-processing/08-connected-components/">Connected Component Analysis</a></td></tr>
<tr><td> </td><td><a href="https://datacarpentry.org/image-processing/09-challenges/">Capstone Challenge</a></td></tr>
</table>
</div>
</div>

{% elsif site.curriculum == "dc-ecology" %}
<div class="row">
<div class="col-md-6">
Expand Down
24 changes: 15 additions & 9 deletions _includes/dc/setup.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<p>
The setup instructions for the Data Carpentry Astronomy workshops
can be found at <a href="https://datacarpentry.org/astronomy-python/setup.html">
the workshop overview site</a>.
the curriculum site</a>.
</p>

{% comment %}
Expand Down Expand Up @@ -42,6 +42,20 @@
{% elsif site.curriculum == "dc-genomics" %}
<p>The setup instructions for the Data Carpentry Genomics workshops can be found at <a href="https://datacarpentry.org/genomics-workshop/setup.html">the workshop overview site</a></p>.

{% comment %}
Geospatial workshops
{% endcomment %}

{% elsif site.curriculum == "dc-geospatial" %}
<p>The setup instructions for the Data Carpentry Geospatial workshop can be found at <a href="https://datacarpentry.org/geospatial-workshop/setup.html">the workshop overview site</a>.</p>

{% comment %}
Image workshops
{% endcomment %}

{% elsif site.curriculum == "dc-image" %}

<p>The setup instructions for Data Carpentry Image Processing workshops can be found at <a href="https://datacarpentry.org/image-processing/setup.html">the curriculum site</a></p>.

{% comment %}
Social sciences workshops
Expand All @@ -66,14 +80,6 @@
{% include warning-flavor.html %}
{% endif %}


{% comment %}
Geospatial workshops
{% endcomment %}

{% elsif site.curriculum == "dc-geospatial" %}
<p>The setup instructions for the Data Carpentry Geospatial workshop can be found at <a href="https://datacarpentry.org/geospatial-workshop/setup.html">the workshop overview site</a>.</p>

{% else %}
{% include warning-curriculum.html %}
{% endif %}
27 changes: 23 additions & 4 deletions _includes/dc/who.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,40 @@

<p id="who">
<strong>Who:</strong>
This lesson assumes you have a working knowledge of Python and some previous exposure to the Bash shell.
This lesson assumes you have a working knowledge of Python and some previous exposure to the Bash shell.
These requirements can be fulfilled by:
a) completing a Software Carpentry Python workshop or
b) completing a Data Carpentry Ecology workshop (with Python) and a Data Carpentry Genomics workshop or
c) independent exposure to both Python and the Bash shell.

If you’re unsure whether you have enough experience to participate in this workshop, please read over
<a href="https://datacarpentry.org/astronomy-python/prereqs/">this detailed list</a>,
If you’re unsure whether you have enough experience to participate in this workshop, please read over
<a href="https://datacarpentry.org/astronomy-python/prereqs/">this detailed list</a>,
which gives all of the functions, operators, and other concepts you will need to be familiar with.

In addition, this lesson assumes that learners have some familiarity with astronomical concepts,
In addition, this lesson assumes that learners have some familiarity with astronomical concepts,
including reference frames, proper motion, color-magnitude diagrams, globular clusters, and isochrones.
Participants should bring their own laptops and plan to participate actively.
</p>

{% comment %}
Image workshops
{% endcomment %}

{% elsif site.curriculum == "dc-image" %}

<p id="who">
<strong>Who:</strong>
This lesson assumes you have a working knowledge of Python and some previous exposure to the Bash shell.
These requirements can be fulfilled by:
a) completing a Software Carpentry Python workshop or
b) completing a Data Carpentry Ecology workshop (with Python) and a Data Carpentry Genomics workshop or
c) independent exposure to both Python and the Bash shell.

If you’re unsure whether you have enough experience to participate in this workshop, please read over
<a href="https://datacarpentry.org/image-processing/prereqs/">this detailed list</a>,
which gives all of the functions, operators, and other concepts you will need to be familiar with.
</p>

{% comment %}
All other workshops
{% endcomment %}
Expand Down
4 changes: 2 additions & 2 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ Check DC curriculum
{% endcomment %}

{% if site.carpentry == "dc" %}
{% unless site.curriculum == "dc-astronomy" or site.curriculum == "dc-ecology" or site.curriculum == "dc-genomics" or site.curriculum == "dc-socsci" or site.curriculum == "dc-geospatial" %}
{% unless site.curriculum == "dc-image" or site.curriculum == "dc-astronomy" or site.curriculum == "dc-ecology" or site.curriculum == "dc-genomics" or site.curriculum == "dc-socsci" or site.curriculum == "dc-geospatial" %}
<div class="alert alert-warning">
It looks like you are setting up a website for a Data Carpentry curriculum but you haven't specified the curriculum type in the <code>_config.yml</code> file (current value in <code>_config.yml</code>: "<strong>{{ site.curriculum }}</strong>", possible values: <code>dc-astronomy</code>, <code>dc-ecology</code>, <code>dc-genomics</code>, <code>dc-socsci</code>, or <code>dc-geospatial</code>). After editing this file, you need to run <code>make serve</code> again to see the changes reflected.
It looks like you are setting up a website for a Data Carpentry curriculum but you haven't specified the curriculum type in the <code>_config.yml</code> file (current value in <code>_config.yml</code>: "<strong>{{ site.curriculum }}</strong>", possible values: <code>dc-image</code>, <code>dc-astronomy</code>, <code>dc-ecology</code>, <code>dc-genomics</code>, <code>dc-socsci</code>, or <code>dc-geospatial</code>). After editing this file, you need to run <code>make serve</code> again to see the changes reflected.
</div>
{% endunless %}
{% endif %}
Expand Down

0 comments on commit d017523

Please sign in to comment.