Skip to content

Commit e914559

Browse files
authored
Merge branch 'LP_review' into feature/integrated-pr111-and-tests
2 parents a3d07b8 + 491faa7 commit e914559

File tree

3 files changed

+180
-61
lines changed

3 files changed

+180
-61
lines changed

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
This project falls under GPL (v3) license rules.
2-
For details see: https://www.gnu.org/licenses/gpl-3.0.en.html
1+
This project falls under GPL (v3) license rules.
2+
For details see: https://www.gnu.org/licenses/gpl-3.0.en.html

ReadMe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For most users, espcially those new to Python, the preferred way to run the stan
4444
We have created four versions of notebooks:
4545

4646
1) __TouchTerrain_standalone_jupyter_notebook.ipynb__ is meant to be run locally or via a docker container and is meant for those familiar with Python. The setup part is now somewhat outdated but the notebook may still form a useful basis. It allow the preview of the model for k3d.
47-
2) __TouchTerrain_jupyter_for_starters.ipynb__ is a modification of 1) meant for Python beginners. It tries to walk a beginner through the process in much more detail by providing a template (workflow) for all major parameters. As such is may be unnecessarily verbose for non-beginners. It also can preview the model via k3d and is again meant to be run locally on via a docker container.
47+
2) __TouchTerrain_jupyter_for_starters.ipynb__ is a modification of 1) meant for Python beginners. It tries to walk a beginner through the process in much more detail by providing a template (workflow) for all major parameters. As such is may be unnecessarily verbose for non-beginners. It also can preview the model via k3d and is again meant to be run locally on via a docker container.
4848
3) __TouchTerrain_jupyter_for_starters_colab.ipynb__ is a modification of 2) specifically for running on colab (free but Google account required). To run it just click on this badge: [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](http://colab.research.google.com/github/ChHarding/TouchTerrain_for_CAGEO/blob/main/TouchTerrain_jupyter_starters_colab.ipynb) and follow the instructions! With some caveats, this is __by far the easiest and fastest way to process DEM data with TouchTerrain standalone!__ The free runtime environment has plenty CPU power and disk space and, as most of the required Python packages are already installed, installation (despite being a bit quirky) is usually done under a minute. Sadly, k3d cannot be run and so it has now model preview.
4949
4) __TouchTerrain_jupyter_for_starters_binder.ipynb__ is similar to 3) but tailored to run on Binder [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ChHarding/TouchTerrain_for_CAGEO/HEAD?labpath=TouchTerrain_jupyter_starters_binder.ipynb) Binder sets up a free docker container within a slick web interface (nice!) and uses JupyterLab. But, in my experience the installation phase is slower and less reliable than Colab. As lots of Python packages have to be installed (more than 750 Mb!), installation can take 10 - 15 minutes, with long paused w/o progress indication. Refreshing the browser sometimes helps but I've had cases where the installation simply stopped and never finished. In addition, a created instance seems to time out quite quickly, meaning that if your don't use it right away after its lengthy installation, the instance will shut down, requiring a new installation.
5050

@@ -127,7 +127,7 @@ The JSON config file has the following format:
127127
- `poly_file` : path to a local kml file
128128
- `polyURL` : URL to a publicly readable(!) kml file on Google Drive
129129

130-
The standalone version also supports: `polygon` : a GeoJSON polygon,
130+
The standalone version also supports: `polygon` : a GeoJSON polygon,
131131

132132
- `bottom_image`: (default: `null`). If a filename to a valid greyscale (1-band) 8-bit local image is given (e.g. *TouchTerrain_bottom_example.png* in the *stuff* folder), the image is centered, uniformly resized to have a generous fringe and used to create a relief on the bottom. Low values (black pixels, 0) create a high relief (with a large gap from the buildplate), white pixels (255) make no relief. Must have a base thickness > 0.5 mm. The highest relief is scaled to be 80% of the base thickness. Note that this relief may adversely affect bed adhesion and will certainly make the first few layers considerably slower to print!
133133

0 commit comments

Comments
 (0)