From 8d6c60e1d0a3286989fa4f4acb1c142b1b7ab4c3 Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Sun, 25 Aug 2024 19:08:17 +0200 Subject: [PATCH 01/10] logo 100 width #176 --- README.md | 5 +++++ docs/_static/orc_logo_color.png | Bin 0 -> 10441 bytes 2 files changed, 5 insertions(+) create mode 100644 docs/_static/orc_logo_color.png diff --git a/README.md b/README.md index 01b3f62..e7e96e5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +
+ , +
+ pyOpenRiverCam ============== diff --git a/docs/_static/orc_logo_color.png b/docs/_static/orc_logo_color.png new file mode 100644 index 0000000000000000000000000000000000000000..222e40e68e491947d97669c15b23316af021d702 GIT binary patch literal 10441 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 literal 0 HcmV?d00001 From aab623a4aae02be9f6a563f9202657a30516b736 Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Sun, 25 Aug 2024 19:18:20 +0200 Subject: [PATCH 02/10] ORC logo in markdown #176 --- README.md | 5 ++--- TRADEMARK.md | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e7e96e5..8086b9b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
- , +
pyOpenRiverCam @@ -13,7 +13,6 @@ pyOpenRiverCam [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/localdevices/pyorc.git/main?labpath=examples) [![License](https://img.shields.io/github/license/localdevices/pyorc?style=flat)](https://github.com/localdevices/pyorc/blob/main/LICENSE) - **pyorc**, short for "pyOpenRiverCam" is a fully Open Source library for performing image-based river flow analysis. It is the underlying library for computations on the fully open software stack OpenRiverCam. **pyorc** can only be successful if the underlying methods are made available openly for all. Currently **pyorc** implements Large-scale Particle Image Velocimetry (LSPIV) based diff --git a/TRADEMARK.md b/TRADEMARK.md index 8a1a29e..ea3b902 100644 --- a/TRADEMARK.md +++ b/TRADEMARK.md @@ -8,10 +8,14 @@ Our trademark names include: * OpenRiverCam * pyOpenRiverCam + * NodeOpenRiverCam + * LiveOpenRiverCam -> **_Note_**: Trademark logos are currently being established and will be included in an update of these trademark guidelines. Guidelines for logos are therefore already included in this guideline document. +Our logos include color and black-and-white versions of the following logo: -**If you want to report misuse of an OpenRiverCam trademark, please contact us via [this](https://rainbowsensing.com/index.php/contact-2/) link.** + ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/176-implement-openrivercam-logo/docs/_static/orc_logo_color.png) + +> **_Note_**: If you want to report misuse of an OpenRiverCam trademark, please contact us via [this](https://rainbowsensing.com/index.php/contact-2/) link. ## When do I need specific permission to use an OpenRiverCam trademark? From 19ae36f03ba0333d8dab300d266d14e40d783a47 Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Sun, 25 Aug 2024 19:21:47 +0200 Subject: [PATCH 03/10] Set titles to MD standard #176 --- README.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8086b9b..76352a0 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,7 @@ width=100 align="right"> -pyOpenRiverCam -============== +# pyOpenRiverCam [![PyPI](https://badge.fury.io/py/pyopenrivercam.svg)](https://pypi.org/project/pyopenrivercam) [![Conda-Forge](https://anaconda.org/conda-forge/pyopenrivercam/badges/version.svg)](https://anaconda.org/conda-forge/pyopenrivercam) @@ -47,8 +46,7 @@ If you wish to fund this or other work on features, please contact us at info@ra > **_compatibility:_** At this moment **pyorc** works with any video compatible with OpenCV as long as it has proper metadata. -Installation ------------- +## Installation To get started with **pyorc**, we recommend to setup a python virtual environment. We recommend using a Miniconda or Anaconda environment as this will ease installation, and will allow you to use all @@ -117,17 +115,14 @@ conda activate pyorc-dev pip install -e . ``` -Using pyorc ------------ +## Using pyorc To use **pyorc**, you can use the API for processing. A command-line interface is forthcoming pending funding. A manual is also still in the making. -Acknowledgement ---------------- +## Acknowledgement The first development of pyorc has been supported by the World Meteorological Organisation - HydroHub. -License -------- +## License **pyorc** is licensed under AGPL Version 3 (see [LICENSE](./LICENSE) file). **pyorc** uses the following libraries and software with said licenses. @@ -147,6 +142,7 @@ Project organisation . ├── README.md ├── LICENSE + ├── TRADEMARK.md ├── setup.py <- setup script compatible with pip ├── environment.yml <- YML-file for setting up a conda environment with dependencies ├── docs <- Sphinx documentation source code From 95c7a5297bca5d89ce8a519065b141d38408f8b9 Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Sun, 25 Aug 2024 19:38:19 +0200 Subject: [PATCH 04/10] logo svg #176 --- README.md | 2 +- TRADEMARK.md | 6 +- docs/_static/orc_favicon.svg | 220 ++++++++++++++++++++++++++++++++ docs/_static/orc_logo_bw.svg | 186 +++++++++++++++++++++++++++ docs/_static/orc_logo_color.svg | 189 +++++++++++++++++++++++++++ docs/_static/orc_logo_grey.svg | 186 +++++++++++++++++++++++++++ docs/conf.py | 2 + 7 files changed, 788 insertions(+), 3 deletions(-) create mode 100644 docs/_static/orc_favicon.svg create mode 100644 docs/_static/orc_logo_bw.svg create mode 100644 docs/_static/orc_logo_color.svg create mode 100644 docs/_static/orc_logo_grey.svg diff --git a/README.md b/README.md index 76352a0..45ed210 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-
diff --git a/TRADEMARK.md b/TRADEMARK.md index ea3b902..274188e 100644 --- a/TRADEMARK.md +++ b/TRADEMARK.md @@ -11,9 +11,11 @@ Our trademark names include: * NodeOpenRiverCam * LiveOpenRiverCam -Our logos include color and black-and-white versions of the following logo: +Our logos include a color, greyscale and and black-and-white logo as shown below: - ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/176-implement-openrivercam-logo/docs/_static/orc_logo_color.png) + ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/176-implement-openrivercam-logo/docs/_static/orc_logo_color.svg) + ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/176-implement-openrivercam-logo/docs/_static/orc_logo_grey.svg) + ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/176-implement-openrivercam-logo/docs/_static/orc_logo_bw.svg) > **_Note_**: If you want to report misuse of an OpenRiverCam trademark, please contact us via [this](https://rainbowsensing.com/index.php/contact-2/) link. diff --git a/docs/_static/orc_favicon.svg b/docs/_static/orc_favicon.svg new file mode 100644 index 0000000..49d6592 --- /dev/null +++ b/docs/_static/orc_favicon.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_static/orc_logo_bw.svg b/docs/_static/orc_logo_bw.svg new file mode 100644 index 0000000..75fd018 --- /dev/null +++ b/docs/_static/orc_logo_bw.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OpenRiverCam + + + + diff --git a/docs/_static/orc_logo_color.svg b/docs/_static/orc_logo_color.svg new file mode 100644 index 0000000..c891629 --- /dev/null +++ b/docs/_static/orc_logo_color.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OpenRiverCam + + + + diff --git a/docs/_static/orc_logo_grey.svg b/docs/_static/orc_logo_grey.svg new file mode 100644 index 0000000..49532b2 --- /dev/null +++ b/docs/_static/orc_logo_grey.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OpenRiverCam + + + + diff --git a/docs/conf.py b/docs/conf.py index 1ec1d68..b9faf30 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -96,6 +96,8 @@ def remove_dir_content(path: str) -> None: html_static_path = ['_static'] html_css_files = ["theme-localdevices.css"] +html_logo = "_static/orc_logo_color.svg" +html_favicon = "_static/orc_favicon.svg" html_theme_options = { "show_nav_level": 2, From 90fafeda5d887ef57985181964625805e0e04cf7 Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Sun, 25 Aug 2024 19:55:05 +0200 Subject: [PATCH 05/10] logo removed text #176 --- docs/_static/orc_logo_bw.svg | 35 +++++++++++++------------------- docs/_static/orc_logo_color.png | Bin 10441 -> 0 bytes docs/_static/orc_logo_color.svg | 35 +++++++++++++------------------- docs/_static/orc_logo_grey.svg | 31 +++++++++++----------------- 4 files changed, 40 insertions(+), 61 deletions(-) delete mode 100644 docs/_static/orc_logo_color.png diff --git a/docs/_static/orc_logo_bw.svg b/docs/_static/orc_logo_bw.svg index 75fd018..24862e1 100644 --- a/docs/_static/orc_logo_bw.svg +++ b/docs/_static/orc_logo_bw.svg @@ -1,11 +1,11 @@ + inkscape:current-layer="G2_Logo-7" />
From 416813ef7f38f9f87e1535f1d90bf317bb74d85b Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Sun, 25 Aug 2024 20:22:38 +0200 Subject: [PATCH 07/10] remove header lines #176 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b9189e..773991d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -
+
# pyOpenRiverCam From 8f3ee007cc446ae9ed02e47718d5a252822dac42 Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Sun, 25 Aug 2024 22:36:32 +0200 Subject: [PATCH 08/10] logo layout sphinx conf #176 --- docs/conf.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index b9faf30..d131dd1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -111,6 +111,9 @@ def remove_dir_content(path: str) -> None: "type": "local", }, ], + "logo": { + "text": f"pyOpenRiverCam {release}" + } } html_context = { From f99136568357058c9a326bbd85c335ca641084e7 Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Mon, 9 Sep 2024 08:59:37 +0200 Subject: [PATCH 09/10] logo links moved to main branch #176 --- README.md | 2 +- TRADEMARK.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 773991d..823f221 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-

diff --git a/TRADEMARK.md b/TRADEMARK.md index 274188e..cfa4ef3 100644 --- a/TRADEMARK.md +++ b/TRADEMARK.md @@ -13,9 +13,9 @@ Our trademark names include: Our logos include a color, greyscale and and black-and-white logo as shown below: - ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/176-implement-openrivercam-logo/docs/_static/orc_logo_color.svg) - ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/176-implement-openrivercam-logo/docs/_static/orc_logo_grey.svg) - ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/176-implement-openrivercam-logo/docs/_static/orc_logo_bw.svg) + ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/main/docs/_static/orc_logo_color.svg) + ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/main/docs/_static/orc_logo_grey.svg) + ![ORC](https://raw.githubusercontent.com/localdevices/pyorc/main/docs/_static/orc_logo_bw.svg) > **_Note_**: If you want to report misuse of an OpenRiverCam trademark, please contact us via [this](https://rainbowsensing.com/index.php/contact-2/) link. From c65058d1e554831ae9b241e4822311959c01c203 Mon Sep 17 00:00:00 2001 From: hcwinsemius Date: Mon, 9 Sep 2024 09:14:44 +0200 Subject: [PATCH 10/10] fix #83 --- pyorc/api/video.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pyorc/api/video.py b/pyorc/api/video.py index 887f33e..516af33 100644 --- a/pyorc/api/video.py +++ b/pyorc/api/video.py @@ -102,6 +102,11 @@ def __init__( "h_a was supplied, but camera config's gcps do not contain h_ref, this is needed for dynamic " \ "reprojection. You must supply z_0 and h_ref in the camera_config's gcps upon making a camera " \ "configuration. " + if not os.path.isfile(fn): + raise IOError(f"Video file {fn} does not exist. If you are on windows and using \\ as file " + f"separator ensure that the file string is prepended with an r, e.g. " + f"r'c:\\video_files\\filename.mp4'") + cap = cv2.VideoCapture(fn) cap.set(cv2.CAP_PROP_ORIENTATION_AUTO, 180.0) self.height = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT)) @@ -421,6 +426,8 @@ def get_frame( ), "frame number is larger than the difference between the start and end frame " # assert (method in ["grayscale", "rgb", # "hsv"]), f'method must be "grayscale", "rgb" or "hsv", method is "{method}"' + if not os.path.isfile(self.fn): + raise IOError(f"Video file {self.fn} does not exist.") cap = cv2.VideoCapture(self.fn) cap.set(cv2.CAP_PROP_POS_FRAMES, n + self.start_frame) ret, img = cv.get_frame(