From a914006dd570e72f34f8d706da761787b778f810 Mon Sep 17 00:00:00 2001 From: "Shaw-Lecerf, Marc (ARC-AOX)" Date: Thu, 12 Jan 2023 11:38:04 -0800 Subject: [PATCH] Merge pull request #6 in UPSP/upsp-proc from development to master Squashed commit of the following: commit 326381174a7b705b591c10d71b956ca2a9459366 Merge: a71db42 608ad21 Author: Shaw-Lecerf, Marc (ARC-AOX) 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 608ad219c3a90f272889a80e6a4662602ad5be62 Author: Kenneth Lyons Date: Thu Jan 12 10:07:36 2023 -0800 UPSP-704: Fix equation references commit 26e4ac5b5d80c977529098a3825c696a0815080f Author: Kenneth Lyons Date: Thu Jan 12 10:07:04 2023 -0800 UPSP-704: Make flowcharts clickable to see full size commit 2a851abb5054ad096110195dac0be9cd5840e156 Author: Kenneth Lyons Date: Thu Jan 12 09:49:45 2023 -0800 UPSP-704: Fix up doc string formatting following merge commit eba274addfef9f3583f8bf1653ccf35c633962cd Author: Marc Shaw-Lecerf Date: Tue Jan 10 17:26:31 2023 -0800 UPSP-704: PR comment np.float -> float commit 0df9afd54fb1a8ac8ec8999dbc6e060c4be12849 Author: Nicholas Califano Date: Tue Jan 10 14:55:42 2023 -0800 Added input check to external_calibrate_two_stage_from_wtd commit bd18d7764a5ecf81205116cabbcedda6f67eea9f Author: Marc Shaw-Lecerf Date: Tue Jan 10 09:08:24 2023 -0800 UPSP-704: excal fix (read_json->read_test_config) commit ecf8bba65133098bba331f633be9797bf23c5651 Author: Marc Shaw-Lecerf Date: Mon Jan 9 20:18:44 2023 -0500 UPSP-704: author -> authors bugfix commit 2e8cbd314faacae039fc39b710273e7bb1e9dd22 Merge: f591145 a71db42 Author: Marc Shaw-Lecerf 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 a71db423203bf7b5216ed124aa3ebce1c0270053 Merge: e1512a1 0056c6c Author: Shaw-Lecerf, Marc (ARC-AOX) 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 0056c6ccce768d4c361c82d1ffd22ca3a0801680 Author: Marc Shaw-Lecerf Date: Mon Jan 9 13:00:09 2023 -0800 UPSP-851: update .gitignore commit 51736bc71b185d1fb05c59eccdf27e389e3f4447 Author: Marc Shaw-Lecerf Date: Mon Jan 9 12:58:28 2023 -0800 UPSP-851: address PR comments commit 61cb109a953a6f34076a47b16a5576b4c3c28eec Merge: 43cc47a e1512a1 Author: Marc Shaw-Lecerf Date: Mon Jan 9 10:54:14 2023 -0800 Merge branch 'development' into UPSP-851 commit f59114592c055f0f02d24af3a1199f9d687e5a09 Author: Marc Shaw-Lecerf Date: Mon Jan 9 13:25:23 2023 -0500 UPSP-704: Added .flake8 commit 4e2dde7a57c78697711f1e1a0d51ad5e05262edc Merge: a9d4f1b e1512a1 Author: Marc Shaw-Lecerf 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 e1512a15ba5bc8a8f2c62258ce35fc1bfb29b155 Merge: f2ed962 748f924 Author: Califano, Nicholas W. (ARC-AOX)[Metis Technology Solutions] 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 748f9240c90da31ae859a2fee73a59f07e1ea488 Author: Nicholas Califano Date: Wed Jan 4 12:05:21 2023 -0800 Copied changes from main upsp repo commit a9d4f1b62ece1ce4a6c1e4b3ff444d40c234f22b Author: Marc Shaw-Lecerf 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 95f6a283d189e3b624add561198fdac66c4f75b2 Author: Marc Shaw-Lecerf Date: Thu Dec 22 13:51:28 2022 -0500 UPSP-704: Sphinx docs: sphinx.ext.viewcode commit 07ac35ddae36e9537b23b6e839f79b2c04876c67 Author: Kenneth Lyons 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 43cc47ac0313d002020f9f227c406f3fec16ce27 Author: Marc Shaw-Lecerf 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 cb052d3522ba6953bdd60210abfccdedaae58988 Author: Marc Shaw-Lecerf Date: Tue Dec 20 06:05:09 2022 -0800 UPSP-852: deprecate unity demo app utilities commit 1cd8bd1956366584975fec07248f11d339854471 Author: Marc Shaw-Lecerf 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 d07452b6681f902dad1a8efb336477e224c36e0b Author: Marc Shaw-Lecerf 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 70bcf3ed60ae43317ad97fdfcb5ba2e4feed9104 Author: Marc Shaw-Lecerf 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 e819bf964e0fb0dcd774f6d9a9a904e11cb788ed Author: Marc Shaw-Lecerf 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