Skip to content

Commit

Permalink
Fix organization of tutorial notebooks
Browse files Browse the repository at this point in the history
With 7da16b4 they were reorganized,
but many of the links were not fixed. This commit cleans things up
so that everything is consistently linked again. It also removes
incomplete "aspirational" notebooks, in favor of only useful content.
  • Loading branch information
ctrueden committed Sep 10, 2020
1 parent 7690402 commit d3ff8e8
Show file tree
Hide file tree
Showing 109 changed files with 15 additions and 202 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"### Comparison with ImageJ 1.x\n",
"<div style=\"float: left\"><img src=\"http://imagej.net/_images/a/a8/Imagej1-icon.png\" width=\"48\"></div>\n",
"\n",
"[ImageJ 1.x](https://imagej.net/ImageJ1) has a similar concept with the `ij.ImageJ` class, which is created using `new ImageJ()` and cached statically as a singleton. This allows the ImageJ instance to be recovered later by calling `IJ.getInstance()`, and simplifies the API in some ways. However, the assumption that there will only ever be one ImageJ per JVM limits its flexibility, and the fact that `ij.ImageJ` extends `java.awt.Frame` makes ImageJ 1.x difficult to use [headless](https://imagej.net/Headless) or with user interfaces other than Java AWT. Furthermore, [ImageJ 1.x](https://imagej.net/ImageJ1) is not service-driven, which makes it less extensible; see the <a href=\"../3-Advanced-Usage/1-SciJava-in-Detail.ipynb\">SciJava in Detail</a> tutorial notebook for more information."
"[ImageJ 1.x](https://imagej.net/ImageJ1) has a similar concept with the `ij.ImageJ` class, which is created using `new ImageJ()` and cached statically as a singleton. This allows the ImageJ instance to be recovered later by calling `IJ.getInstance()`, and simplifies the API in some ways. However, the assumption that there will only ever be one ImageJ per JVM limits its flexibility, and the fact that `ij.ImageJ` extends `java.awt.Frame` makes ImageJ 1.x difficult to use [headless](https://imagej.net/Headless) or with user interfaces other than Java AWT. Furthermore, [ImageJ 1.x](https://imagej.net/ImageJ1) is not service-driven, which makes it less extensible; see the <a href=\"../3-Advanced-Topics/1-SciJava-in-Detail.ipynb\">SciJava in Detail</a> tutorial notebook for more information."
]
},
{
Expand Down Expand Up @@ -710,7 +710,7 @@
"mimetype": "",
"name": "Groovy",
"nbconverter_exporter": "",
"version": "2.4.3"
"version": "2.5.6"
},
"toc": {
"base_numbering": 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2778,7 +2778,7 @@
"mimetype": "",
"name": "Groovy",
"nbconverter_exporter": "",
"version": "2.4.3"
"version": "2.5.6"
},
"toc": {
"base_numbering": 1,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"mimetype": "",
"name": "Groovy",
"nbconverter_exporter": "",
"version": "2.4.3"
"version": "2.5.6"
},
"toc": {
"base_numbering": 1,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@
"mimetype": "",
"name": "Groovy",
"nbconverter_exporter": "",
"version": "2.4.3"
"version": "2.5.6"
},
"toc": {
"base_numbering": 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@
"mimetype": "",
"name": "Groovy",
"nbconverter_exporter": "",
"version": "2.4.3"
"version": "2.5.6"
},
"toc": {
"base_numbering": 1,
Expand Down
55 changes: 0 additions & 55 deletions notebooks/3-Extending-ImageJ/3-Commands.ipynb

This file was deleted.

118 changes: 0 additions & 118 deletions notebooks/3-Extending-ImageJ/5-Tools.ipynb

This file was deleted.

32 changes: 9 additions & 23 deletions notebooks/ImageJ-Tutorials-and-Demo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,20 @@
" <li><a href=\"1-Using-ImageJ/4-Tables.ipynb\">Tables</a></li>\n",
" <li><a href=\"1-Using-ImageJ/5-Mixed-World-ImageJ1.ipynb\">Mixed World: Using ImageJ 1.x</a></li>\n",
" <li><a href=\"1-Using-ImageJ/6-ImageJ-with-Python-Kernel.ipynb\">ImageJ with Python Kernel</a></li>\n",
" <li><a href=\"1-Using-ImageJ/7-Calling-Scripts-from-Scripts.ipynb\">Calling Scripts from Scripts</a></li>\n",
" </ol>\n",
" </div>\n",
" <div class=\"col-md-5\">\n",
" <h2>Extending ImageJ</h2>\n",
" <ol>\n",
" <li><a href=\"2-Extending-ImageJ/1-Scripting.ipynb\">Scripting: the easy way to extend ImageJ</a> (incomplete)</li>\n",
" <li><a href=\"2-Extending-ImageJ/2-Input-Output.ipynb\">Extending ImageJ: Data Input and Output</a></li>\n",
" <li><a href=\"2-Extending-ImageJ/3-Commands.ipynb\">Extending ImageJ: Commands</a> (placeholder)</li>\n",
" <li><a href=\"2-Extending-ImageJ/4-Ops.ipynb\">Extending ImageJ: Ops</a></li>\n",
" <li><a href=\"2-Extending-ImageJ/5-Tools.ipynb\">Extending ImageJ: Tools</a> (placeholder)</li>\n",
" </ol>\n",
" </div>\n",
"</div>\n",
"<div class=\"row\">\n",
" <div class=\"col-md-6\">\n",
" <h2>Advanced usage</h2>\n",
" <h2>Extending ImageJ</h2>\n",
" <ol>\n",
" <li><a href=\"3-Advanced-Usage/1-SciJava-in-Detail.ipynb\">SciJava in Detail</a></li>\n",
" <li><a href=\"3-Advanced-Usage/2-ImgLib2-in-Detail.ipynb\">ImgLib2 in Detail</a></li>\n",
" <li><a href=\"2-Extending-ImageJ/1-Input-Output.ipynb\">IOPlugins - Data Input and Output</a></li>\n",
" <li><a href=\"2-Extending-ImageJ/2-Ops.ipynb\">Ops - Image Algorithms</a></li>\n",
" </ol>\n",
" </div>\n",
" <div class=\"col-md-5\">\n",
" <h2>Advanced extensions</h2>\n",
" <h2>Advanced Topics</h2>\n",
" <ol>\n",
" <li>Creating a custom service (coming later)</li>\n",
" <li>Customizing module execution (coming later)</li>\n",
" <li>Creating a SCIFIO plugin (coming later)</li>\n",
" <li><a href=\"3-Advanced-Topics/1-SciJava-in-Detail.ipynb\">SciJava in Detail</a></li>\n",
" <li><a href=\"3-Advanced-Topics/2-ImgLib2-in-Detail.ipynb\">ImgLib2 in Detail</a></li>\n",
" <li><a href=\"3-Advanced-Topics/3-Using-Special-Ops.ipynb\">Using Special Ops</a></li>\n",
" </ol>\n",
" </div>\n",
"</div>\n",
Expand Down Expand Up @@ -119,7 +106,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "a2c0421d-1742-4555-ad30-4efc31cae762",
"model_id": "95ac493c-41e0-4cfb-8108-4817ef4fe78b",
"version_major": 2,
"version_minor": 0
},
Expand Down Expand Up @@ -252,7 +239,6 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[INFO] Populating metadata\n",
"[INFO] Populating metadata\n"
]
},
Expand Down

0 comments on commit d3ff8e8

Please sign in to comment.