Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev beginning reading and writing opk file #1

Closed
wants to merge 44 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9ac1774
Update README.md
ACornuIGN Dec 18, 2023
aa76873
Update README.md
ACornuIGN Dec 18, 2023
27bcf6f
Update README.md
ACornuIGN Dec 18, 2023
a486360
<docs> : <readme message comande commit>
ACornuIGN Dec 18, 2023
cc7bcd2
<build>:<add reader file opk and test>
ACornuIGN Dec 18, 2023
828f003
<build>:<add fonction reader et writer>
ACornuIGN Dec 19, 2023
f6106d7
<build>:<argparse PinkLady>
ACornuIGN Dec 19, 2023
bcc5660
<build>:<pinklady build>
ACornuIGN Dec 19, 2023
d464dfa
<docs>:<documentations>
ACornuIGN Dec 19, 2023
b714a78
<focs>:<readme requirements>
ACornuIGN Dec 20, 2023
5715a0c
clean: remove docs directory
ACornuIGN Dec 20, 2023
ab931b9
fix: add docs to gitignore
ACornuIGN Dec 20, 2023
6ed5e7a
fix: rename module
ACornuIGN Dec 20, 2023
f88a726
docs: add clean to type commit
ACornuIGN Dec 20, 2023
8811f28
fix: change librairy pylint
ACornuIGN Dec 20, 2023
5cef274
test: add test
ACornuIGN Dec 20, 2023
7689fd2
fix: remove name module
ACornuIGN Dec 20, 2023
4780578
lint: lint code
ACornuIGN Dec 20, 2023
1f376a4
clean: rename module
ACornuIGN Dec 20, 2023
85dd66f
fix: add new type commit
ACornuIGN Dec 20, 2023
dbf50df
lint: lint code
ACornuIGN Dec 20, 2023
b78fbff
test: add import and edit function
ACornuIGN Dec 20, 2023
97298c3
build: add environment.yml
ACornuIGN Dec 20, 2023
00e5d51
build: add lint flake8 pytest function to pull-request
ACornuIGN Dec 20, 2023
2fba52b
fix: change workflows action
ACornuIGN Dec 21, 2023
a30d938
fix: change version checkout and bug
ACornuIGN Dec 21, 2023
0054a4b
clean: change package env
ACornuIGN Dec 21, 2023
fff37d7
refoactor: change name dir code to src
ACornuIGN Dec 21, 2023
22e746a
refactor: change import and def function
ACornuIGN Dec 21, 2023
9b5a84c
refactor: change import and def function
ACornuIGN Dec 21, 2023
63cdecd
fix: change follow dir docs
ACornuIGN Dec 21, 2023
e902de0
fix: add docs/_build for docs html
ACornuIGN Dec 21, 2023
e15420d
docs: add documentation html code
ACornuIGN Dec 21, 2023
954106e
docs: update documenbtation html
ACornuIGN Dec 21, 2023
e4895c2
docs: upgrade readme add path documentation
ACornuIGN Dec 21, 2023
4ea729c
docs: upgrade documentation
ACornuIGN Dec 21, 2023
b9ff4b0
docs: update readme restructuring
ACornuIGN Dec 22, 2023
67d8165
docs: correction
ACornuIGN Dec 22, 2023
0ea0c0d
refactor: change structure file
ACornuIGN Dec 22, 2023
1c0f142
fix: change name function and module name
ACornuIGN Dec 22, 2023
944e42d
build: add librairy
ACornuIGN Dec 22, 2023
f370d96
build: add and change path in the workflows
ACornuIGN Dec 22, 2023
78ce50a
docs: add librairy
ACornuIGN Dec 22, 2023
baa9d5c
build: lint code
ACornuIGN Dec 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/lint_python.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Lint_python

on:
push:
branches: [main]
tags:
pull_request:

jobs:
lint_python:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v1
with:
python-version: 3.10

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pylint flake8

- name: Analysing the code with pylint
run: |
pylint pink_lady.py src/reader/manage_reader.py src/reader/reader_opk.py src/shot.py src/worksite.py src/writer/writer.py

continue-on-error: true

- name: Analysing the code with flake8
run: |
flake8 --max-line-length 100 pink_lady.py src/reader/manage_reader.py src/reader/reader_opk.py src/shot.py src/worksite.py src/writer/writer.py

27 changes: 27 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: unitary_test

on:
pull_request:
branches:
- main

jobs:
test:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout branch
uses: actions/checkout@v4

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest pytest-shutil

- name: Run tests with pytest
with:
environment-file: environment.yml
run: python3 -m pytest -s ./test -v
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ instance/
.scrapy

# Sphinx documentation
docs/_build/
#docs/_build/

# PyBuilder
.pybuilder/
Expand Down
25 changes: 23 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Welcome to Pink Lady
# Welcome to Pink Lady !!!

Pink Lady is a photogrammetric conversion and acquisition program in .OPK format. Open-source with a few tools, such as calculation of the position in the image (l,c) of a terrain point (X,Y,Z).

First step: reading and writing an .OPK file and set up the associated tests
### Commit Message Header

```
<type>: <short summary>
│ │
│ └─⫸ Summary in present tense. Not capitalized. No period at the end.
└─⫸ Commit Type: build|docs|fix|refactor|test|clean|lint
```

### HTML documentation

Html documentation in docs/_build/html/index.hmlt

### Functionality

1. Reading and writing an OPK file
2. Restructuring of read files to allow the addition of read files without modifying functions
Structure file in reader folder:
- name : reader_ext.py
- function : def read(file: str) -> Worksite:
3. Reading a camera file (XML and txt)
1 change: 1 addition & 0 deletions ci/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3 -m pytest -s ./test -v
21 changes: 0 additions & 21 deletions code/Shot.py

This file was deleted.

35 changes: 0 additions & 35 deletions code/Worksite.py

This file was deleted.

20 changes: 20 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
Binary file added docs/_build/doctrees/environment.pickle
Binary file not shown.
Binary file added docs/_build/doctrees/index.doctree
Binary file not shown.
Binary file added docs/_build/doctrees/modules.doctree
Binary file not shown.
Binary file added docs/_build/doctrees/src.doctree
Binary file not shown.
4 changes: 4 additions & 0 deletions docs/_build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: f03d3f65f8574fccd2076660daad4aa7
tags: 645f666f9bcd5a90fca523b33c5a78b7
Loading
Loading