Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 in UPSP/upsp-proc from development to master
Squashed commit of the following: commit 3263811 Merge: a71db42 608ad21 Author: Shaw-Lecerf, Marc (ARC-AOX) <marc.a.shaw-lecerf@nasa.gov> Date: Thu Jan 12 11:24:31 2023 -0800 Merge pull request #5 in UPSP/upsp-proc from UPSP-704 to development * commit '608ad219c3a90f272889a80e6a4662602ad5be62': UPSP-704: Fix equation references UPSP-704: Make flowcharts clickable to see full size UPSP-704: Fix up doc string formatting following merge UPSP-704: PR comment np.float -> float Added input check to external_calibrate_two_stage_from_wtd UPSP-704: excal fix (read_json->read_test_config) UPSP-704: author -> authors bugfix UPSP-704: Added .flake8 UPSP-704: Sphinx docs: index.rst *.mov -> *.png UPSP-704: Sphinx docs: sphinx.ext.viewcode UPSP-704: Docstring fixups Sphinx docs updates Sphinx docs updates Sphinx docs updates Sphinx docs updates Sphinx docs updates Sphinx doc updates current documentation MD -> RST (w/ pandoc) Ported krlyons initial sphinx doc build system commit 608ad21 Author: Kenneth Lyons <kenneth.r.lyons@nasa.gov> Date: Thu Jan 12 10:07:36 2023 -0800 UPSP-704: Fix equation references commit 26e4ac5 Author: Kenneth Lyons <kenneth.r.lyons@nasa.gov> Date: Thu Jan 12 10:07:04 2023 -0800 UPSP-704: Make flowcharts clickable to see full size commit 2a851ab Author: Kenneth Lyons <kenneth.r.lyons@nasa.gov> Date: Thu Jan 12 09:49:45 2023 -0800 UPSP-704: Fix up doc string formatting following merge commit eba274a Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Tue Jan 10 17:26:31 2023 -0800 UPSP-704: PR comment np.float -> float commit 0df9afd Author: Nicholas Califano <ncalifan@pfe22.nas.nasa.gov> Date: Tue Jan 10 14:55:42 2023 -0800 Added input check to external_calibrate_two_stage_from_wtd commit bd18d77 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Tue Jan 10 09:08:24 2023 -0800 UPSP-704: excal fix (read_json->read_test_config) commit ecf8bba Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Jan 9 20:18:44 2023 -0500 UPSP-704: author -> authors bugfix commit 2e8cbd3 Merge: f591145 a71db42 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Jan 9 16:36:21 2023 -0500 Merge branch 'development' into UPSP-704 Conflicts: python/upsp/cam_cal_utils/photogrammetry.py python/upsp/cam_cal_utils/visibility.py commit a71db42 Merge: e1512a1 0056c6c Author: Shaw-Lecerf, Marc (ARC-AOX) <marc.a.shaw-lecerf@nasa.gov> Date: Mon Jan 9 13:03:21 2023 -0800 Merge pull request #3 in UPSP/upsp-proc from UPSP-851 to development * commit '0056c6ccce768d4c361c82d1ffd22ca3a0801680': UPSP-851: update .gitignore UPSP-851: address PR comments UPSP-853: batch processing: archive src JSONs UPSP-852: deprecate unity demo app utilities Batch processing updates for pip pkg Migrate deps from setup.py -> pyproject.toml Add setuputils_scm to build sys; add LICENSE.txt commit 0056c6c Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Jan 9 13:00:09 2023 -0800 UPSP-851: update .gitignore commit 51736bc Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Jan 9 12:58:28 2023 -0800 UPSP-851: address PR comments commit 61cb109 Merge: 43cc47a e1512a1 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Jan 9 10:54:14 2023 -0800 Merge branch 'development' into UPSP-851 commit f591145 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Jan 9 13:25:23 2023 -0500 UPSP-704: Added .flake8 commit 4e2dde7 Merge: a9d4f1b e1512a1 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Jan 9 12:43:56 2023 -0500 Merge branch 'development' into UPSP-704 Conflicts: python/upsp/cam_cal_utils/camera_tunnel_calibrate.py python/upsp/cam_cal_utils/external_calibrate.py python/upsp/cam_cal_utils/img_utils.py python/upsp/cam_cal_utils/internal_calibration.py python/upsp/cam_cal_utils/parsers.py python/upsp/cam_cal_utils/photogrammetry.py python/upsp/cam_cal_utils/target_bumping.py python/upsp/cam_cal_utils/visibility.py python/upsp/intensity_mapping/node_pixel_mapping.py python/upsp/intensity_mapping/patching.py python/upsp/target_localization/gaussian_fitting_methods.py commit e1512a1 Merge: f2ed962 748f924 Author: Califano, Nicholas W. (ARC-AOX)[Metis Technology Solutions] <nicholas.w.califano@nasa.gov> Date: Thu Jan 5 16:44:16 2023 -0800 Merge pull request #4 in UPSP/upsp-proc from UPSP-856 to development * commit '748f9240c90da31ae859a2fee73a59f07e1ea488': Copied changes from main upsp repo commit 748f924 Author: Nicholas Califano <ncalifan@pfe23.nas.nasa.gov> Date: Wed Jan 4 12:05:21 2023 -0800 Copied changes from main upsp repo commit a9d4f1b Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Thu Dec 22 14:00:41 2022 -0500 UPSP-704: Sphinx docs: index.rst *.mov -> *.png Video isn't working reliably. Readers are provided with a hyperlink to download the video, and a screenshot is used instead in the HTML docs. commit 95f6a28 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Thu Dec 22 13:51:28 2022 -0500 UPSP-704: Sphinx docs: sphinx.ext.viewcode commit 07ac35d Author: Kenneth Lyons <kenneth.r.lyons@nasa.gov> Date: Thu Dec 22 10:27:01 2022 -0800 UPSP-704: Docstring fixups - Make all docstrings numpydoc style compliant - Use type preprocessing and intersphinx - Make references work commit 43cc47a Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Tue Dec 20 07:44:44 2022 -0800 UPSP-853: batch processing: archive src JSONs Copy the original, user-provided JSON files to 02_configuration folder. This is a good practice to improve repeatability, it's easy to lose track of them otherwise. commit cb052d3 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Tue Dec 20 06:05:09 2022 -0800 UPSP-852: deprecate unity demo app utilities commit 1cd8bd1 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Dec 19 12:12:47 2022 -0800 Batch processing updates for pip pkg - hard dep on opencv-python-headless=4.5.2.54 (some function signature changes w/ 4.6.0 we haven't updated yet) - remove some autogenerated scripts from batch processing - run-unity-export: may deprecate this in the future - step+render_images: does not currently work as we removed the miniwall.py (demo code) interface. Need to rewrite this step, maybe make use of the PyTecplot API commit d07452b Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Dec 19 10:45:47 2022 -0800 Migrate deps from setup.py -> pyproject.toml - Requires setuputils >= 61 bump - Made this change due to warning when running "pip wheel" after migrating other stuff to the pyproject.toml. commit 70bcf3e Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Mon Dec 19 10:39:57 2022 -0800 Add setuputils_scm to build sys; add LICENSE.txt Latest usage of setuputils_scm relies on the pyproject.toml, which encouraged me to migrate some other pkg metadata like the project name + description. Also added the license file (NOSA 1.3). commit e819bf9 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Sat Dec 17 01:46:55 2022 -0500 Sphinx docs updates Embedded video of SLS AUAT pressure time history animation (from public NTRS archive, https://ntrs.nasa.gov/citations/20220005639). The NTRS entry has a *.pptx file available for download. The embedded video is loaded by a simple Javascript that grabs the PPT file, extracts it (*.pptx is essentially just a ZIP file), grabs the *.mov file out of the file tree, and loads it into an HTML <video> element. This is embedded in an <iframe> in the Sphinx documentation. A bit hacky but looks pretty decent on my system. (NOTE: does not load on Safari, but works on Chrome and Firefox). (Maybe we should just display a still image if the video fails to load ... need to update the JS to do that) commit a941313 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Fri Dec 16 17:18:21 2022 -0500 Sphinx docs updates - Added refs.bib, sphinxcontrib bibliography - Split out more pages from user-manual commit 9565b2a Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Fri Dec 16 16:35:17 2022 -0500 Sphinx docs updates Quick Start migrated to its own section + heavy updates Terminology own section Installation own section + cleanup commit e644024 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Fri Dec 16 09:27:43 2022 -0500 Sphinx docs updates - file-formats.rst - converted grid- to list-table - significant cleanup of hyperlinks, verbiage - made some stuff more "public-friendly" (eg a bit more context in the WTD file description, link to public UPWT docs on nasa.gov) commit 5c67816 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Thu Dec 15 19:58:04 2022 -0500 Sphinx docs updates - autosectionlabel extension - cleanup swdd.rst cross-refs - spellcheck + grammar commit f2ed962 Merge: 6cddf00 70ee462 Author: Shaw-Lecerf, Marc (ARC-AOX) <marc.a.shaw-lecerf@nasa.gov> Date: Thu Dec 15 16:46:24 2022 -0800 Merge pull request #2 in UPSP/upsp-proc from UPSP-848 to development * commit '70ee462bc7dce75bb1e44a8730bde31b536b7eea': scikit-build updates. Works after some RPATH hacks Ported over krlyons initial skbuild impl commit 99d5ad4 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Tue Dec 13 16:49:10 2022 -0500 Sphinx doc updates commit ec2ca31 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Tue Dec 13 10:26:31 2022 -0500 current documentation MD -> RST (w/ pandoc) commit f60442d Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Tue Dec 13 09:42:48 2022 -0500 Ported krlyons initial sphinx doc build system commit 70ee462 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Thu Dec 15 12:25:13 2022 -0800 scikit-build updates. Works after some RPATH hacks commit 77491b3 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Fri Dec 9 14:56:46 2022 -0500 Ported over krlyons initial skbuild impl commit 6cddf00 Merge: 10c8f1c ee84c74 Author: Shaw-Lecerf, Marc (ARC-AOX) <marc.a.shaw-lecerf@nasa.gov> Date: Wed Oct 26 12:32:55 2022 -0700 Merge pull request #1 in UPSP/upsp-proc from UPSP-842 to development * commit 'ee84c74e50ba605f66a18902904512bf45534545': UPSP-842: Update INSTALL tgt (missing *.py files) commit ee84c74 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Wed Oct 26 11:43:35 2022 -0700 UPSP-842: Update INSTALL tgt (missing *.py files) commit 10c8f1c Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Fri Oct 7 17:32:10 2022 -0700 Migrated second round of camera-to-tunnel updates commit e381963 Author: Marc Shaw-Lecerf <marc.a.shaw-lecerf@nasa.gov> Date: Thu Aug 18 10:47:59 2022 -0700 Migrated latest camera/tunnel calibration changes SHA e5ef37c74fa
- Loading branch information