Use Sensor Gain Adjustment for DJI sensors when calibration panels are not present/used

.github/workflows/executable_build_test.yaml

@@ -0,0 +1,44 @@
+name: Build and Test Executables
+on:
+  push:
+    branches-ignore:
+      [main]
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Build and Test Executables
+    runs-on: windows-2022
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        shell: pwsh
+        run: |
+          python -m pip install --upgrade pip
+          pip install pyinstaller
+          pip install .
+
+      - name: Build EXEs
+        shell: pwsh
+        run: |
+          pyinstaller correct_images_onefile.spec --noconfirm --clean
+          pyinstaller get_corrections_onefile.spec --noconfirm --clean
+
+      - name: Test EXEs
+        shell: pwsh
+        run: |
+          dist/ImageryCorrector.exe tests/6x_images --output_path dist/6x_images_test_output
+          dist/GetCorrectionsCsv.exe tests/6x_images --output_path dist/6x_images_test_output_csv
+

.github/workflows/lint-test.yaml

@@ -2,7 +2,7 @@ name: Lint and Test
 on:
   push:
     branches-ignore:
-      [master]
+      [main]
 
 jobs:
   lint:
@@ -16,9 +16,9 @@ jobs:
 
       - name: Install Exiftool
         run: |
-          wget https://exiftool.org/Image-ExifTool-13.50.tar.gz
-          gzip -dc Image-ExifTool-13.50.tar.gz | tar -xf -
-          cd Image-ExifTool-13.50
+          wget https://exiftool.org/Image-ExifTool-13.55.tar.gz
+          gzip -dc Image-ExifTool-13.55.tar.gz | tar -xf -
+          cd Image-ExifTool-13.55
           perl Makefile.PL
           sudo make install
           cd ..

.github/workflows/main-branch.yaml

@@ -9,13 +9,13 @@ on:
 jobs:
   release:
     name: Create GitHub Release
-    runs-on: ubuntu-22.04
+    runs-on: windows-2022
     permissions:
       contents: write
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -26,21 +26,47 @@ jobs:
           file: 'pyproject.toml'
           field: 'tool.poetry.version'
 
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        shell: pwsh
+        run: |
+          python -m pip install --upgrade pip
+          pip install pyinstaller
+          pip install .
+
+      - name: Build EXEs
+        shell: pwsh
+        run: |
+          pyinstaller correct_images_onefile.spec --noconfirm --clean
+          pyinstaller get_corrections_onefile.spec --noconfirm --clean
+          pyinstaller correct_images_gui_onefile.spec --noconfirm --clean
+
+      - name: Create zip files
+        run: |
+          cd "$GITHUB_WORKSPACE"
+          zip -r dist/ImageryCorrector.zip dist/ImageryCorrector.exe
+          zip -r dist/GetCorrectionsCsv.zip dist/GetCorrectionsCsv.exe
+          zip -r dist/SenteraRadiometricCorrectionsGUI.zip dist/SenteraRadiometricCorrectionsGUI.exe
+
+
+
       - name: Define TAG
+        shell: pwsh
         run: |
-          export VERSION="${{ steps.read_toml.outputs.value }}"
-          echo "TAG=v$VERSION" >> $GITHUB_ENV
+          "TAG=v${{ steps.read_toml.outputs.value }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
       - name: Create Release
-        uses: actions/github-script@v6
+        uses: softprops/action-gh-release@v2
         with:
-          result-encoding: string
-          retries: 3
-          script: |
-            github.rest.repos.createRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              tag_name: process.env.TAG,
-              target_commitish: context.sha,
-              name: process.env.TAG,
-              generate_release_notes: true
-            })
+          tag_name: ${{ env.TAG }}
+          name: ${{ env.TAG }}
+          target_commitish: ${{ github.sha }}
+          generate_release_notes: true
+          files: |
+            dist/ImageryCorrector.zip
+            dist/GetCorrectionsCsv.zip
+            dist/SenteraRadiometricCorrectionsGUI.zip

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
       additional_dependencies: [
           'flake8-docstrings',
           'flake8-builtins',
-          'flake8-logging-format',
+          'flake8-logging',
           'flake8-rst-docstrings',
           'pygments',
           'pep8-naming'

correct_images_dir.spec

@@ -1,13 +1,16 @@
 # -*- mode: python ; coding: utf-8 -*-
 
+from PyInstaller.utils.hooks import copy_metadata
 
 block_cipher = None
 
+metadata_datas = copy_metadata('imageio') + copy_metadata('imgcorrect')
+
 
 a = Analysis(['scripts\\correct_images.py'],
     pathex=['.'],
     binaries=[],
-    datas=[('exiftool/exiftool.exe', '.')],
+    datas=[('exiftool/exiftool.exe', '.'), ('cfg/exiftool.cfg', 'cfg'), ('cfg/reg_config.ini', 'cfg')] + metadata_datas,
     hiddenimports=['pkg_resources.py2_warn'],
     hookspath=[],
     runtime_hooks=[],

correct_images_gui_onefile.spec

@@ -1,12 +1,16 @@
 # -*- mode: python ; coding: utf-8 -*-
 
+from PyInstaller.utils.hooks import copy_metadata
+
 block_cipher = None
 
+metadata_datas = copy_metadata('imageio') + copy_metadata('imgcorrect')
+
 
 a = Analysis(['scripts\\correct_images_gui.py'],
              pathex=['.'],
              binaries=[],
-             datas=[('exiftool/exiftool.exe', '.'), ('cfg/exiftool.cfg', 'cfg'), ('cfg/reg_config.ini', 'cfg'), ('sentera_radiometric_corrections_icon.ico', '.')],
+             datas=[('exiftool/exiftool.exe', '.'), ('cfg/exiftool.cfg', 'cfg'), ('cfg/reg_config.ini', 'cfg'), ('sentera_radiometric_corrections_icon.ico', '.')] + metadata_datas,
              hiddenimports=['pkg_resources.py2_warn'],
              hookspath=[],
              runtime_hooks=[],
@@ -23,7 +27,7 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           [],
-          name='Sentera Radiometric Corrections GUI',
+          name='SenteraRadiometricCorrectionsGUI',
           icon='sentera_radiometric_corrections_icon.ico',
           debug=False,
           bootloader_ignore_signals=False,

correct_images_onefile.spec

@@ -1,12 +1,16 @@
 # -*- mode: python ; coding: utf-8 -*-
 
+from PyInstaller.utils.hooks import copy_metadata
+
 block_cipher = None
 
+metadata_datas = copy_metadata('imageio') + copy_metadata('imgcorrect')
+
 
 a = Analysis(['scripts\\correct_images.py'],
              pathex=['.'],
              binaries=[],
-             datas=[('exiftool/exiftool.exe', '.'), ('cfg/exiftool.cfg', 'cfg'), ('cfg/reg_config.ini', 'cfg')],
+             datas=[('exiftool/exiftool.exe', '.'), ('cfg/exiftool.cfg', 'cfg'), ('cfg/reg_config.ini', 'cfg')] + metadata_datas,
              hiddenimports=['pkg_resources.py2_warn'],
              hookspath=[],
              runtime_hooks=[],

environment.yml

@@ -23,4 +23,4 @@ dependencies:
   # subpackage dependencies
   # Sentera dependencies
   - pip:
-    - git+https://github.com/SenteraLLC/py-image-metadata-parser.git@v2.0.4
+    - git+https://github.com/SenteraLLC/py-image-metadata-parser.git@v2.0.10

get_corrections_dir.spec

@@ -1,12 +1,16 @@
 # -*- mode: python ; coding: utf-8 -*-
 
+from PyInstaller.utils.hooks import copy_metadata
+
 block_cipher = None
 
+metadata_datas = copy_metadata('imageio') + copy_metadata('imgcorrect')
+
 
 a = Analysis(['scripts\\get_corrections.py'],
     pathex=['.'],
     binaries=[],
-    datas=[('exiftool/exiftool.exe', '.')],
+    datas=[('exiftool/exiftool.exe', '.'), ('cfg/exiftool.cfg', 'cfg'), ('cfg/reg_config.ini', 'cfg')] + metadata_datas,
     hiddenimports=['pkg_resources.py2_warn'],
     hookspath=[],
     runtime_hooks=[],

get_corrections_onefile.spec

@@ -1,12 +1,16 @@
 # -*- mode: python ; coding: utf-8 -*-
 
+from PyInstaller.utils.hooks import copy_metadata
+
 block_cipher = None
 
+metadata_datas = copy_metadata('imageio') + copy_metadata('imgcorrect')
+
 
 a = Analysis(['scripts\\get_corrections.py'],
              pathex=['.'],
              binaries=[],
-             datas=[('exiftool/exiftool.exe', '.'), ('cfg/exiftool.cfg', 'cfg'), ('cfg/reg_config.ini', 'cfg')],
+             datas=[('exiftool/exiftool.exe', '.'), ('cfg/exiftool.cfg', 'cfg'), ('cfg/reg_config.ini', 'cfg')] + metadata_datas,
              hiddenimports=['pkg_resources.py2_warn'],
              hookspath=[],
              runtime_hooks=[],

imgcorrect/corrections.py

@@ -334,6 +334,9 @@ def get_sensitivity(row):
                     ]
                 )
                 return 1 / sensitivity
+            elif "drone-dji:SensorGainAdjustment" in xmp:
+                gain_adj = float(xmp["drone-dji:SensorGainAdjustment"])
+                return gain_adj
             else:
                 return 1
 

imgcorrect/io.py

@@ -89,7 +89,8 @@ def apply_sensor_settings(image_df):
         # remove images that don't appear in every band
         new_image_df = new_image_df[new_image_df.ID.isin(v.index[v.eq(band_count)])]
         logger.info(
-            f"Skipping {images_before_filtering - len(new_image_df.index)} images because they don't have data for all bands"
+            "Skipping %s images because they don't have data for all bands",
+            images_before_filtering - len(new_image_df.index),
         )
 
         return new_image_df

imgcorrect/thermal_convert.py

@@ -89,8 +89,8 @@ def convert_thermal(input_path, output_path, exiftool_path):
                         try:
                             os.remove(os.path.join(output_path, file))
                             logger.info("additional file deleted")
-                        except Exception as e:
-                            logger.error(f"File delete failed with error {e}")
+                        except Exception:
+                            logger.exception("File delete failed")
 
             else:
                 if overwrite: