Skip to content

Commit 0dbb77d

Browse files
authored
Merge pull request #212 from bbean23/211-code-feature-merge-in-tool-changes-from-bbean-wip
211 code feature merge in tool changes from bbean wip
2 parents 1fc1322 + f3bb23b commit 0dbb77d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+778
-319
lines changed

.github/workflows/ubi8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040
run: |
4141
python3 -m pip install -r ../requirements.txt
4242
export PYTHONPATH=$PWD/../
43-
pytest --color=yes -rs -vv --cov=. --cov-report term --cov-config=.coveragerc
43+
pytest --color=yes -rs -vv --cov=. --cov-report term --cov-config=.coveragerc

.github/workflows/windows2022.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ jobs:
4848
set PYTHONPATH="$PWD\.."
4949
echo "$PYTHONPATH"
5050
$env:PYTHONPATH="$PWD\.."
51-
pytest --color=yes -rs -vv --cov=. --cov-report term --cov-config=.coveragerc
51+
pytest --color=yes -rs -vv --cov=. --cov-report term --cov-config=.coveragerc

opencsp/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
OpenCSP:
2+
OpenCSP:
33
========
44
Open source python libraies for concentrating solar power reserach and development
55

opencsp/app/camera_calibration/lib/image_processing.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""Library of image processing functions used for camera calibration
2-
"""
1+
"""Library of image processing functions used for camera calibration"""
32

43
import cv2 as cv
54
import numpy as np

opencsp/app/scene_reconstruction/lib/SceneReconstruction.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""Photogrammetric reconstruction class based on images of Aruco markers
2-
"""
1+
"""Photogrammetric reconstruction class based on images of Aruco markers"""
32

43
from glob import glob
54
from os.path import join

opencsp/app/sofast/lib/AbstractMeasurementSofast.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""Measurement class for SofastFringe
2-
"""
1+
"""Measurement class for SofastFringe"""
32

43
from abc import ABC
54
import datetime as dt

opencsp/app/sofast/lib/CalibrateSofastFixedDots.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""Fixed pattern dot location calibration.
2-
"""
1+
"""Fixed pattern dot location calibration."""
32

43
import os
54

opencsp/app/sofast/lib/DefinitionEnsemble.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""Data class to store facet ensemble optic definition for sofast
2-
"""
1+
"""Data class to store facet ensemble optic definition for sofast"""
32

43
from copy import deepcopy
54
import json

opencsp/app/sofast/lib/DefinitionFacet.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""Data class to store single facet optic definition
2-
"""
1+
"""Data class to store single facet optic definition"""
32

43
import json
54

opencsp/app/sofast/lib/MeasurementSofastFringe.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""Measurement class for SofastFringe
2-
"""
1+
"""Measurement class for SofastFringe"""
32

43
import datetime as dt
54

0 commit comments

Comments
 (0)