Merge pull request #23 from meyerls/dev

Dev

.gitattributes

@@ -1,19 +1,15 @@
 # Set default behaviour to automatically normalize line endings.
 * text=auto
-
 # Force batch scripts to always use CRLF line endings so that if a repo is accessed
 # in Windows via a file share from Linux, the scripts will work.
 *.{cmd,[cC][mM][dD]} text eol=crlf
 *.{bat,[bB][aA][tT]} text eol=crlf
-
 # Force bash scripts to always use LF line endings so that if a repo is accessed
 # in Unix via a file share from Windows, the scripts will work.
 *.sh text eol=lf
-
 # Images
 *.jpg filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
-
 # COLMAP
 *.ply filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text

.github/workflows/python-package.yml

@@ -8,29 +8,27 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9"]
+        python-version: [ "3.7", "3.8", "3.9"]
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
-#      - name: Checkout submodules
-#        uses: srt32/[email protected]
-#        with:
-#          args: git config --global --add safe.directory /github/workspace && git submodule update --init --recursive
-#      - name: Install dependencies
-#        run: |
-#          python -m pip install --upgrade pip
-#          pip install flake8 pytest
-#          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-#      - name: Lint with flake8
-#        run: |
-#          # stop the build if there are Python syntax errors or undefined names
-#          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-#          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-#          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-#      - name: Test aruco estimator
-#        run: |
-#          python scale_estimator.py --test_data
+      - name: 'Install dependencies'
+        run: |
+          python -m pip install --upgrade pip
+          pip install .
+      - name: 'Test Aruco Scale Factor Estimation'
+        run: |
+          ls -la 
+          python3 scale_estimator.py --test_data
+          ls -la ${{ github.workspace }}
+          pwd
+      - name: 'Upload Artifact'
+        uses: actions/upload-artifact@v3
+        with:
+          name: skeleton-artifact
+          path: ${{ github.workspace }}/data/door/**/*
+          retention-days: 5

README.md

@@ -2,7 +2,7 @@
     <img width="100%" src="https://github.com/meyerls/aruco-estimator/blob/dev/img/wood.png?raw=true">
 </p>
 
-# Automatic Aruco marker-based scale factor estimation (Work in Progress!)
+# Automatic Estimation of the Scale Factor Based on Aruco Markers (Work in Progress!)
 
 <a href="https://pypi.org/project/aruco-estimator/"><img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/aruco-estimator"></a>
 <a href="https://pypi.org/project/aruco-estimator/"><img alt="PyPI" src="https://img.shields.io/pypi/v/aruco-estimator"></a>
@@ -71,7 +71,7 @@ aruco_distance = aruco_scale_factor.run()
 print('Size of the unscaled aruco markers: ', aruco_distance)
 
 # Calculate scaling factor, apply it to the scene and save scaled point cloud
-dense, scale_factor = aruco_scale_factor.apply(true_scale=dataset.scale)  # scale in cm
+dense, scale_factor = aruco_scale_factor.apply(true_scale=dataset.scale)  # scale in m
 print('Point cloud and poses are scaled by: ', scale_factor)
 print('Size of the scaled (true to scale) aruco markers in meters: ', aruco_distance * scale_factor)
 

setup.py

@@ -16,7 +16,7 @@
 
 setuptools.setup(
     name='aruco-estimator',
-    version='1.1.5',
+    version='1.1.6',
     description='Aruco Scale Factor Estimation',
     license="MIT",
     long_description=long_description,
@@ -31,9 +31,11 @@
                       "open3d",
                       "opencv-contrib-python",
                       "pyquaternion",
+                      "pycolmap",
                       "tqdm",
                       "wget"],  # external packages as dependencies
     classifiers=[
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         "License :: OSI Approved :: MIT License",