From aab625efedb0ce0df7980c0b2bbab3ab2bb8c0ec Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 29 Jun 2023 17:31:16 +0200 Subject: [PATCH 1/6] Update utils.py --- opendm/dem/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendm/dem/utils.py b/opendm/dem/utils.py index 9fb383a92..9db20b606 100644 --- a/opendm/dem/utils.py +++ b/opendm/dem/utils.py @@ -7,4 +7,5 @@ def get_dem_vars(args): 'BLOCKYSIZE': 512, 'BIGTIFF': 'IF_SAFER', 'NUM_THREADS': args.max_concurrency, + 'multi':'', } From 0f0bcdc479d77814258fd5eba1c4347462680613 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Tue, 18 Jul 2023 16:22:46 +0200 Subject: [PATCH 2/6] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 5f7eeeee4..43607840b 100644 --- a/README.md +++ b/README.md @@ -267,6 +267,8 @@ Starting from version 3.0.4, ODM can automatically extract images from video fil Help improve our software! We welcome contributions from everyone, whether to add new features, improve speed, fix existing bugs or add support for more cameras. Check our [code of conduct](https://github.com/OpenDroneMap/documents/blob/master/CONDUCT.md), the [contributing guidelines](https://github.com/OpenDroneMap/documents/blob/master/CONTRIBUTING.md) and [how decisions are made](https://github.com/OpenDroneMap/documents/blob/master/GOVERNANCE.md#how-decisions-are-made). + +### Installation For Linux users, the easiest way to modify the software is to make sure docker is installed, clone the repository and then run from a shell: ```bash @@ -280,6 +282,10 @@ Run configure to set up the required third party libraries: (odmdev) [user:/code] master+* ± bash configure.sh reinstall ``` + +### run with modifications + +### attach docker You can now make changes to the ODM source. When you are ready to test the changes you can simply invoke: ```bash From 8cb4452ccfe739942361b7fe2541316889fdfaf0 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Tue, 18 Jul 2023 16:28:37 +0200 Subject: [PATCH 3/6] Update README.md Update Dev instructions --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 43607840b..640321d89 100644 --- a/README.md +++ b/README.md @@ -282,16 +282,18 @@ Run configure to set up the required third party libraries: (odmdev) [user:/code] master+* ± bash configure.sh reinstall ``` - -### run with modifications - -### attach docker You can now make changes to the ODM source. When you are ready to test the changes you can simply invoke: ```bash (odmdev) [user:/code] master+* ± ./run.sh --project-path /datasets mydataset ``` +### To come back to dev environement +``` +$ docker start -a odmdev +``` + + If you have questions, join the developer's chat at https://community.opendronemap.org/c/developers-chat/21 1. Try to keep commits clean and simple From 3409646904178382063a0f437d0ff806f7496dc8 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Tue, 18 Jul 2023 16:35:22 +0200 Subject: [PATCH 4/6] Update README.md --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 640321d89..0b45343f5 100644 --- a/README.md +++ b/README.md @@ -287,10 +287,13 @@ You can now make changes to the ODM source. When you are ready to test the chang ```bash (odmdev) [user:/code] master+* ± ./run.sh --project-path /datasets mydataset ``` - -### To come back to dev environement +### Stop dev container +```bash + docker stop odmdev ``` -$ docker start -a odmdev +### To come back to dev environement +```bash +docker start -a odmdev ``` From 166ff4d0817cfe8c79a13853819e2d3c1db1ba23 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Tue, 18 Jul 2023 17:03:52 +0200 Subject: [PATCH 5/6] Update README.md Update Dev instructions --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0b45343f5..29037d15c 100644 --- a/README.md +++ b/README.md @@ -268,7 +268,7 @@ Starting from version 3.0.4, ODM can automatically extract images from video fil Help improve our software! We welcome contributions from everyone, whether to add new features, improve speed, fix existing bugs or add support for more cameras. Check our [code of conduct](https://github.com/OpenDroneMap/documents/blob/master/CONDUCT.md), the [contributing guidelines](https://github.com/OpenDroneMap/documents/blob/master/CONTRIBUTING.md) and [how decisions are made](https://github.com/OpenDroneMap/documents/blob/master/GOVERNANCE.md#how-decisions-are-made). -### Installation +### Installation and first run For Linux users, the easiest way to modify the software is to make sure docker is installed, clone the repository and then run from a shell: ```bash @@ -292,8 +292,11 @@ You can now make changes to the ODM source. When you are ready to test the chang docker stop odmdev ``` ### To come back to dev environement +change your_username to your username ```bash -docker start -a odmdev +docker start odmdev +docker exec -ti odmdev bash +su your_username ``` From 6bd14dc2ddc6471e3433c10e76c7172339b313a0 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Tue, 18 Jul 2023 17:05:37 +0200 Subject: [PATCH 6/6] Update utils.py --- opendm/dem/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/opendm/dem/utils.py b/opendm/dem/utils.py index 9db20b606..9fb383a92 100644 --- a/opendm/dem/utils.py +++ b/opendm/dem/utils.py @@ -7,5 +7,4 @@ def get_dem_vars(args): 'BLOCKYSIZE': 512, 'BIGTIFF': 'IF_SAFER', 'NUM_THREADS': args.max_concurrency, - 'multi':'', }