Skip to content

Commit a118af9

Browse files
Move to reduce build warnings (#173)
- Ignore common venv directories - Correct favico link - Fix H2 -> H4 jump in Installation - Remove unused tips & tricks - Add file prefixes to autolabels to reduce duplicate labels (two pairs remain that cannot be solved without dirty tricks) - Reduce prominence of v0.2.0 object hierarchy update (it is IMO too prominent for a May 2020 update)
1 parent ab00808 commit a118af9

11 files changed

Lines changed: 22 additions & 34 deletions

File tree

conf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
# List of patterns, relative to source directory, that match files and
4141
# directories to ignore when looking for source files.
4242
# This pattern also affects html_static_path and html_extra_path.
43-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
43+
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', "env", ".env", ".venv", "README.md"]
4444

4545

4646
# -- Options for HTML output -------------------------------------------------
@@ -93,12 +93,14 @@
9393
"tasklist",
9494
]
9595

96+
autosectionlabel_prefix_document = True
97+
autosectionlabel_maxdepth = 3
9698

9799
highlight_language = 'groovy'
98100

99101
html_logo = 'docs/images/qupath_128.png'
100102

101-
html_favicon = 'docs/images/QuPath.ico'
103+
html_favicon = 'docs/images/qupath.ico'
102104

103105
# Variables for current QuPath version
104106
release = '0.6.0'

docs/concepts/object_hierarchy.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
{doc}`Objects <objects>` in QuPath need to be stored somewhere - and that place is the *object hierarchy*.
44

5-
:::{important}
6-
The hierarchy behavior has changed in v0.2.0! <br />
7-
If you are familiar with the old behavior, be sure to read {ref}`Differences from QuPath v0.1.2`.
8-
:::
9-
105
The name comes from the fact that the objects are all stored in a hierarchical, tree-like structure.
116
This is achieved by each object having having a reference to:
127

@@ -128,8 +123,8 @@ This is crucial because the `PathObjectHierarchy` class uses spatial caching and
128123

129124
In QuPath v0.1.2, the hierarchy was resolved automatically (without asking) and this was *essential* to make sense of the measurements.
130125

131-
The behavior of the object hierarchy has changed in QuPath v0.2.0, with the aim of making the software faster, more powerful, and more intuitive.
132-
In v0.2.0 the details of the hierarchy can very often be ignored, and exists only to support sophisticated workflows where it might be needed.
126+
The behavior of the object hierarchy changed in QuPath v0.2.0, with the aim of making the software faster, more powerful, and more intuitive.
127+
In v0.2.0 and onwards, the details of the hierarchy can very often be ignored, and exists only to support sophisticated workflows where it might be needed.
133128

134129
[This blog post](https://petebankhead.github.io/qupath/2019/11/17/changing-the-hierarchy.html) describes the reasons why it changed.
135130
To read about the earlier behavior see [Object hierarchies](https://github.com/qupath/qupath/wiki/Object-hierarchies) on the old wiki.

docs/deep/stardist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ def stardist = StarDist2D.builder(pathModel)
403403

404404
Furthermore, we can use preprocessing to convert images to become more compatible with pretrained StarDist models.
405405
For example, `dsb2018_heavy_augment.pb` works very well for fluorescence microscopy images, but only supports a single input channel.
406-
However, by applying {ref}`color deconvolution<Separating stains>` as preprocessing we can convert a 3-channel brightfield image to a single-channel image that *looks* much more like a fluorescence image.
406+
However, by applying {ref}`color deconvolution<docs/tutorials/separating_stains:Separating stains>` as preprocessing we can convert a 3-channel brightfield image to a single-channel image that *looks* much more like a fluorescence image.
407407
If needed, we can add extra things like filters to reduce noise as well.
408408

409409
```groovy

docs/deep/wsinfer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ wsinfer
153153

154154
The QuPath WSInfer extension is scriptable, which makes it much easier to apply across multiple images.
155155

156-
When a model is run, the command parameters are stored in the [workflow](workflows) so that a [script can be generated automatically](workflows-to-scripts).
156+
When a model is run, the command parameters are stored in the [workflow](docs/scripting/workflows:Workflows) so that a [script can be generated automatically](docs/scripting/workflows_to_scripts:Workflows to scripts).
157157

158158
An example script would be
159159

docs/intro/installation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ QuPath requires 64-bit Windows.
2323
Running QuPath on 32-bit Windows is not supported.
2424
:::
2525

26-
#### Installing the Windows .msi package
26+
### Installing the Windows .msi package
2727
Double-click to launch the installer.
2828

2929
Windows tries to protect you from software it does not know, so you'll probably see a scary-looking warning whenever the QuPath installer is first run:
@@ -57,7 +57,7 @@ If the QuPath installer does not start at all, you may not have administrator pr
5757
Try downloading the `.zip` file instead, which should not need such privileges.
5858
:::
5959

60-
#### Installing the Windows .zip package
60+
### Installing the Windows .zip package
6161
Right-click on the .zip file and choose to extract all the contents.
6262
This should give you a normal folder containing QuPath's files.
6363

@@ -70,7 +70,7 @@ The first time you try this, you might see similar warning dialogs to those show
7070
On Windows, you can either run `QuPath.exe` or `QuPath (console).exe`.
7171

7272
The difference is that `QuPath (console).exe` will also open a small window that contains QuPath's log messages.
73-
The console can be useful for debugging problems, or when using the {ref}`Command line`.
73+
The console can be useful for debugging problems, or when using the {ref}`docs/advanced/command_line:Command line`.
7474
:::
7575

7676
:::{admonition} QuPath won't launch!
@@ -170,4 +170,4 @@ QuPath for Linux was compiled on Ubuntu - with best efforts made to include all
170170

171171
## Running from source
172172

173-
If all else fails, you can try [](building) - which should work on Windows, macOS and Linux.
173+
If all else fails, you can try [](building) - which should work on Windows, macOS and Linux.

docs/reference/building.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Example of command line build success
6565
**That's it!**
6666
You can find QuPath inside the `./build/dist/` subdirectory.
6767

68-
If it *didn't* go so well, check out [](#Troubleshooting).
68+
If it *didn't* go so well, check out {ref}`docs/reference/building:Troubleshooting`.
6969

7070
:::{admonition} Which Java version do I need?
7171
:class: tip
@@ -181,7 +181,7 @@ Check out the docs associated with the specific version if this is the case.
181181
(building-qupath-fiji)=
182182
## Building with Fiji
183183
By default, QuPath embeds a version of [ImageJ](https://imagej.net/software/imagej/).
184-
This allows you to [send image regions to ImageJ, and even use custom ImageJ plugins](ImageJ).
184+
This allows you to [send image regions to ImageJ, and even use custom ImageJ plugins](docs/advanced/imagej:ImageJ).
185185

186186
[Fiji](https://fiji.sc) is a special distribution of ImageJ that contains a *lot* of custom plugins, and many extra features and other changes.
187187

docs/reference/faqs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ It is designed so that other machine learning libraries could potentially be use
131131

132132
### Why do I see a warning when I try to install QuPath?
133133

134-
See {ref}`Installation`.
134+
See {ref}`docs/intro/installation:Installation`.
135135

136136
(set-max-memory)=
137137

@@ -185,11 +185,11 @@ See {doc}`../intro/formats` for details about which formats are supported, and t
185185
### {menuselection}`File --> Open URI...` doesn't work for me!
186186

187187
{menuselection}`File --> Open URI...` requires a compatible extension needs to read images hosted remotely.
188-
See {ref}`Open URI` for more details.
188+
See {ref}`docs/intro/formats:Open URI` for more details.
189189

190190
### Why does my image open but look weird?
191191

192-
See {ref}`Why can't QuPath open my image?`
192+
See {ref}`docs/reference/faqs:Why can't QuPath open my image?`
193193

194194
### Is it possible to view slide labels?
195195

docs/reference/tips_and_tricks.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/tutorials/density_maps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ In some cases, density maps can even be a replacement for {doc}`pixel_classifica
2020

2121
:::{warning}
2222
Like most commands in QuPath, Density Maps are currently calculated only in 2D.
23-
And, like many other commands, you should create Density Maps within a {ref}`project <Projects>` if you want to reuse them later.
23+
And, like many other commands, you should create Density Maps within a {ref}`project <docs/tutorials/projects:Projects>` if you want to reuse them later.
2424
:::
2525

2626
## Getting started with density maps
@@ -61,7 +61,7 @@ Hovering your mouse over any option should provide some help text.
6161

6262
The {guilabel}`Object type` and {guilabel}`Main class` define which objects will contribute to the density map in some way.
6363

64-
Left to the defaults, the density map will make use of all detection objects (which {ref}`includes cells <types of object>`) regardless of their classification.
64+
Left to the defaults, the density map will make use of all detection objects (which {ref}`includes cells <docs/concepts/objects:types of object>`) regardless of their classification.
6565

6666
If I choose the {guilabel}`Main class` to be **Tumor**, then the density map will *only* include detections that are classified as **Tumor**.
6767

docs/tutorials/separating_stains.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
QuPath supports images of different kinds.
1717

1818
Some commands will work on almost any kind of image without complaint, while some need to know a bit more about the image.
19-
This information can be provided by {ref}`setting the image type <Setting the image type>`.
19+
This information can be provided by {ref}`setting the image type <docs/starting/first_steps:Setting the image type>`.
2020

2121
Typically the type will be either *Brightfield* or *Fluorescence*.
2222

@@ -118,7 +118,7 @@ The stain vectors are key to color deconvolution.
118118
They ought to give a normalized representation of the color of each 'pure' stain in the image, without regard for staining intensity.
119119
A similar color vector characterizing the background encodes what 'no stain' looks like, and also plays an important role in the calculations.
120120

121-
When {ref}`setting the image type <Setting the image type>` to *Brightfield (H&E)*, *Brightfield (H-DAB)* or *Brightfield (Other)*, QuPath will set default stain vectors to characterize hematoxylin, eosin or DAB.
121+
When {ref}`setting the image type <docs/starting/first_steps:Setting the image type>` to *Brightfield (H&E)*, *Brightfield (H-DAB)* or *Brightfield (Other)*, QuPath will set default stain vectors to characterize hematoxylin, eosin or DAB.
122122
However, you may see better results with some commands (e.g. *Cell detection*) by setting the stain and background vectors explicitly to better match the actual staining in the image.
123123

124124
This requires two steps:

0 commit comments

Comments
 (0)