Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:
- checkout
- run:
name: Set up environment
name: Run tests
command: |
conda create -n py36_env python=3.6 numpy pytest matplotlib -yq
source activate py36_env
Expand Down
Binary file modified assets/images/projects/2014-08-15-physics-learning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/projects/2015-09-25-abcd.jpg
Binary file not shown.
Binary file added assets/images/projects/2015-09-25-abcd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/projects/2015-12-01-mmmm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/projects/2016-05-01-hiv-cannabis.jpg
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/projects/2016-08-17-athena.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/projects/2017-04-03-pace.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/projects/2017-09-20-ace.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/projects/2018-01-15-nimare.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/projects/2018-01-16-metacurious.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/projects/2018-10-05-diva.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/projects/2018-10-05-seaas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/lab/images/logo/favicon.ico
100755 → 100644
Binary file not shown.
Binary file modified assets/themes/lab/images/logo/favicon.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/lab/images/logo/logo.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion projects/_posts/2015-09-25-abcd.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type: dataset
website: "https://abcdstudy.org/"
grant:
grant_url:
image: /assets/images/projects/2015-09-25-abcd.jpg
image: /assets/images/projects/2015-09-25-abcd.png
tagline: '"The largest long-term study of brain development and child health in the United States."'
tags: [fmri]

Expand Down
2 changes: 1 addition & 1 deletion projects/_posts/2016-05-01-hiv-cannabis.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type: dataset
website:
grant: NIH-5K01DA037819-03
grant_url: https://projectreporter.nih.gov/project_info_description.cfm?projectnumber=5K01DA037819-03
image: /assets/images/projects/2016-05-01-hiv-cannabis.jpg
image: /assets/images/projects/2016-05-01-hiv-cannabis.png
tagline: How do cannabis use and HIV infection impact the brain?
tags: [fmri]

Expand Down
2 changes: 1 addition & 1 deletion projects/_posts/2017-04-03-pace.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type: dataset
website:
grant: R01DA041353
grant_url: https://taggs.hhs.gov/Detail/AwardDetail?arg_AwardNum=R01DA041353&arg_ProgOfficeCode=114
image:
image: /assets/images/projects/2017-04-03-pace.png
tagline: Better understanding the neurobiology of addiction through meta-analysis.
tags: [meta-analysis]

Expand Down
2 changes: 1 addition & 1 deletion projects/_posts/2018-01-16-metacurious.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ osf:
---
{% include JB/setup %}

# <img src="/assets/images/projects/2018-01-16-metacurious-banner.png" width="40%">
# <img src="/assets/images/projects/metacurious_banner.png" width="40%">
Bringing together human cleverness and big data, metaCurious is a tool to help you curate and annotate version-controlled collections of neuroimaging articles for meta-analyses. This tool facilitates collaboration and reproducibility by building sharable collections as GitHub repositories, providing a front end to [Brainspell-neo](https://brainspell.herokuapp.com), which started from Roberto Toro's Brainspell, itself based on Tal Yarkoni's [NeuroSynth](http://neurosynth.org): standing on the shoulders of Giants!

MetaCurious is developed in conjunction with a number of external collaborators, including the project leader, [Anisha Keshavan](https://github.com/akeshavan), as well as [JB Poline](https://github.com/jbpoline), [Greg Kiar](https://github.com/gkiar), and [Elizabeth DuPre](https://github.com/emdupre). The primary developer within the lab for metaCurious is [Katie Bottenhorn](/team/bottenhorn-katherine).
Expand Down
8 changes: 4 additions & 4 deletions projects/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<div class="media" style="width:525px; height:150px">
<div class="media">
<a class="pull-left" href="{{ product.url }}">
<img width=100 class="media-object" src="{{ image }}" style="border:3px solid #018b23;">
<img width=100 class="media-object" src="{{ image }}" style="border:1px solid #808080;">
</a>
<div class="media-body">
<div class="smallhead media-heading">
Expand Down Expand Up @@ -93,7 +93,7 @@
<div class="media" style="width:525px; height:150px">
<div class="media">
<a class="pull-left" href="{{ product.url }}">
<img width=100 class="media-object" src="{{ image }}" style="border:3px solid #ff8d00;">
<img width=100 class="media-object" src="{{ image }}" style="border:1px solid #808080;">
</a>
<div class="media-body">
<div class="smallhead media-heading">
Expand Down Expand Up @@ -131,7 +131,7 @@
<div class="media" style="width:525px; height:150px">
<div class="media">
<a class="pull-left" href="{{ product.url }}">
<img width=100 class="media-object" src="{{ image }}" style="border:3px solid #7774c3;">
<img width=100 class="media-object" src="{{ image }}" style="border:1px solid #808080;">
</a>
<div class="media-body">
<div class="smallhead media-heading">
Expand Down Expand Up @@ -169,7 +169,7 @@
<div class="media" style="width:525px; height:150px">
<div class="media">
<a class="pull-left" href="{{ product.url }}">
<img width=100 class="media-object" src="{{ image }}" style="border:3px solid #990012;">
<img width=100 class="media-object" src="{{ image }}" style="border:1px solid #808080;">
</a>
<div class="media-body">
<div class="smallhead media-heading">
Expand Down
29 changes: 29 additions & 0 deletions tests/test_team_pictures.py → tests/test_images.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,32 @@ def test_team_image_sizes(testdata):
if len(failures):
failures = sorted(list(set(failures)))
raise Exception('Test failed on {}'.format(', '.join(failures)))


def test_project_image_sizes(testdata):
"""
Test that project photos are the right size.
"""
photo_folder = os.path.join(testdata["assets"], "images", "projects")
target_dims = (400, 400) # in pixels
target_ratio = 1 # width to height
# Non-logo images should not have "-" in the filenames
patterns = ["*-*.png", "*-*.jpg"]
files = [glob(os.path.join(photo_folder, p)) for p in patterns]
files = [item for sublist in files for item in sublist]
if not len(files):
raise Exception("No files found in {}".format(photo_folder))

failures = []
for f in files:
fname = os.path.basename(f)
img = plt.imread(f)
if (img.shape[0] > target_dims[0]) or (img.shape[1] > target_dims[1]):
failures.append(fname)

if (img.shape[0] / img.shape[1]) != target_ratio:
failures.append(fname)

if len(failures):
failures = sorted(list(set(failures)))
raise Exception('Test failed on {}'.format(', '.join(failures)))