Skip to content

Commit

Permalink
Merge pull request #111 from SciTools-incubator/logo_corners2
Browse files Browse the repository at this point in the history
Logo work
  • Loading branch information
Malcolm Brooks authored Jul 2, 2018
2 parents 950cd8e + 114534e commit 59c6d95
Show file tree
Hide file tree
Showing 32 changed files with 13,403 additions and 311 deletions.
2 changes: 1 addition & 1 deletion ImageMetaTag/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'''

# see release_process for details on incrementing the version
__version__ = '0.7.2'
__version__ = '0.7.3'
__documentation__ = 'http://scitools-incubator.github.io/image-meta-tag/build/html/'

# list fo file formats which are valid for saving metadata to:
Expand Down
12 changes: 6 additions & 6 deletions ImageMetaTag/javascript/imt_dropdown.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// ImageMetaTag dropdown menu scripting - vn0.7.2
// ImageMetaTag is a python package built around a wrapper for savefig in
// ImageMetaTag dropdown menu scripting - vn0.7.3
// ImageMetaTag is a python package built around a wrapper for savefig in
// matplotlib, which adds metadata tags to supported image file formats.
// See https://github.com/SciTools-incubator/image-meta-tag for details.
//
// (C) Crown copyright Met Office. All rights reserved.
// Released under BSD 3-Clause License. See LICENSE for more details.

function read_parse_json_files(json_files, zlib_comp){
// reads a list of files that contain the json
// reads a list of files that contain the json
// data structure. The files can be compressed
// using zlib compression. Very large files can
// be split into chunks to be consolidated back into
Expand Down Expand Up @@ -37,7 +37,7 @@ function read_parse_json_file(json_file, zlib_comp){
var json_str = readTextFile(json_file);
};
json = JSON.parse(json_str);
return json;
return json;
}

function readTextFile(filepath){
Expand Down Expand Up @@ -196,7 +196,7 @@ function apply_selection (start_depth, only_cache) {
update_selectors(options_at_depth, selected_at_depth, start_depth);
// write out the url
write_url_to_div();

// now the the_image div is updated, the user should be happy, so we can
// go backwards and forwards on the animator buttons to preload images:
if (anim_sel >= 0) {
Expand Down Expand Up @@ -283,7 +283,7 @@ function update_selector(depth, options, selected) {
//console.log(" and selected val", selected);
if (show_singleton_selectors == 1 || key_lists[depth].length > 1){
target_div = key_to_selector[depth];

// set up the text to define the selector:
sel_text = "<select id='select_"+ depth;
sel_text += "' onChange='OnSelected("+ depth +")'>\n";
Expand Down
300 changes: 225 additions & 75 deletions ImageMetaTag/savefig.py

Large diffs are not rendered by default.

Binary file modified docs/build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/build/doctrees/savefig.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/simple.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/test.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/versions.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 489e0737dd27f07ea11d540d1450682e
config: d14e19c66f4efecdcc9cac0ed15055e7
tags: 645f666f9bcd5a90fca523b33c5a78b7
10 changes: 5 additions & 5 deletions docs/build/html/ImageDict.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>ImageMetaTag.ImageDict &mdash; ImageMetaTag 0.7.2 documentation</title>
<title>ImageMetaTag.ImageDict &mdash; ImageMetaTag 0.7.3 documentation</title>

<link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '0.7.2',
VERSION: '0.7.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="ImageMetaTag 0.7.2 documentation" href="index.html" />
<link rel="top" title="ImageMetaTag 0.7.3 documentation" href="index.html" />
<link rel="next" title="ImageMetaTag.webpage" href="webpage.html" />
<link rel="prev" title="ImageMetaTag.db" href="db.html" />
</head>
Expand All @@ -43,7 +43,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="db.html" title="ImageMetaTag.db"
accesskey="P">previous</a> |</li>
<li><a href="index.html">ImageMetaTag 0.7.2 documentation</a> &raquo;</li>
<li><a href="index.html">ImageMetaTag 0.7.3 documentation</a> &raquo;</li>
</ul>
</div>
<div class="sphinxsidebar">
Expand Down Expand Up @@ -408,7 +408,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="db.html" title="ImageMetaTag.db"
>previous</a> |</li>
<li><a href="index.html">ImageMetaTag 0.7.2 documentation</a> &raquo;</li>
<li><a href="index.html">ImageMetaTag 0.7.3 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer">
Expand Down
143 changes: 0 additions & 143 deletions docs/build/html/_modules/ImageMetaTag.html

This file was deleted.

10 changes: 5 additions & 5 deletions docs/build/html/_modules/ImageMetaTag/db.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>ImageMetaTag.db &mdash; ImageMetaTag 0.7.2 documentation</title>
<title>ImageMetaTag.db &mdash; ImageMetaTag 0.7.3 documentation</title>

<link rel="stylesheet" href="../../_static/sphinxdoc.css" type="text/css" />
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '../../',
VERSION: '0.7.2',
VERSION: '0.7.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="../../_static/jquery.js"></script>
<script type="text/javascript" src="../../_static/underscore.js"></script>
<script type="text/javascript" src="../../_static/doctools.js"></script>
<link rel="top" title="ImageMetaTag 0.7.2 documentation" href="../../index.html" />
<link rel="top" title="ImageMetaTag 0.7.3 documentation" href="../../index.html" />
<link rel="up" title="ImageMetaTag" href="../ImageMetaTag.html" />
</head>
<body>
Expand All @@ -36,7 +36,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li><a href="../../index.html">ImageMetaTag 0.7.2 documentation</a> &raquo;</li>
<li><a href="../../index.html">ImageMetaTag 0.7.3 documentation</a> &raquo;</li>
<li><a href="../index.html" >Module code</a> &raquo;</li>
<li><a href="../ImageMetaTag.html" accesskey="U">ImageMetaTag</a> &raquo;</li>
</ul>
Expand Down Expand Up @@ -886,7 +886,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li><a href="../../index.html">ImageMetaTag 0.7.2 documentation</a> &raquo;</li>
<li><a href="../../index.html">ImageMetaTag 0.7.3 documentation</a> &raquo;</li>
<li><a href="../index.html" >Module code</a> &raquo;</li>
<li><a href="../ImageMetaTag.html" >ImageMetaTag</a> &raquo;</li>
</ul>
Expand Down
Loading

0 comments on commit 59c6d95

Please sign in to comment.