Merge branch 'release-v1.1' into 'master'

Release v1.1

See merge request ped-dyn-emp/petrack!465

Author: Pix3lexe

.zenodo.json

@@ -27,6 +27,11 @@
       "name": "Dreßen, Luke",
       "orcid": "0000-0001-5425-010X"
     },
+    {
+      "affiliation": "Forschungszentrum Jülich GmbH",
+      "name": "Hermanns, Simon",
+      "orcid": "0009-0008-7918-0097"
+    },
     {
       "affiliation": "Forschungszentrum Jülich GmbH",
       "name": "Adrian, Juliane",

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 1.1
+
+- Export trajectories and metadata to hdf5. For file format infos see [here](https://ped.fz-juelich.de/dataarchive/doku.php?id=info)
+- Fix crash on windows on loading a machine learning model
+- Update to Qt6
+- Fix arrow of spinbox `show only` not updating after importing trajectories
+- Creating manual trackpoints or calibration points is now more intuitive
+- Regions of interest are now visible per default
+- Minor improvements to machine learning marker
+- `show` set to false implies `fix` is true now
+- Better warnings on incorrect 3dc files
+- Video export now exports the undistorted video
+- Add shortctut for jumping to start of trajectory
+- Text is not automatically selected anymore on input dialogs
+- Numbering for pedestrians on txt import is now always the same
+
 # 1.0
 
 - Downloads are now available on GitLab and GitHub without prior registration
@@ -43,7 +59,6 @@ For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compar
 
 **Highlights**
 
-
 - Option to show complete trajectory of selected person
 - Change shortcuts
 - Adapt default export settings
@@ -57,9 +72,10 @@ For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compar
 **Highlights**
 
 - Updated Layout of keybinding window
-- Start Sphinx-Documentation inside of repository, accessible on <https://go.fzj.de/petrack-docs> 
+- Start Sphinx-Documentation inside of repository, accessible on <https://go.fzj.de/petrack-docs>
 
 ## 0.10.2
+
 For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compare/8f17e1af...4dca7dbc)
 
 **Highlights**
@@ -69,6 +85,7 @@ For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compar
 - Add "Sequence FPS" used for export of txt-files, independent of playback FPS
 
 ## 0.10.1
+
 For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compare/e8b5afad...8f17e1af)
 
 **Highlights**
@@ -78,18 +95,20 @@ For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compar
 - Misc. bug fixes concerning intrinsic calibration
 
 ## 0.10.0
+
 For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compare/ac443ac3...e8b5afad)
 
 **Highlights**
 
 - Add new tab `correction` for quick sanity checks on the trajectories
 - `immutable` checkbox in the calibration tab
   - can be used to prevent accidental changes to the calibration values
-- Fixed freezing of GUI on Mac 
+- Fixed freezing of GUI on Mac
 
 # v0.9
 
 ## v0.9.4
+
 For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compare/3c490af3...ac443ac3)
 
 **Highlights**
@@ -111,6 +130,7 @@ For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compar
 - Missing frames computation is cached in .pet-file
 
 ## v0.9.2
+
 For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compare/aa0534e6...42a8a21b)
 
 **Highlights**
@@ -155,7 +175,7 @@ For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compar
 - Slanted view for external calibration
 - Coordinate system and grid is possible
 - Introduced multicolor marker with black dot
-- Video support for various codecs  
+- Video support for various codecs
 - Visualization of motion capturing files
 - Improvements to re-tracking
 - Implement code marker
@@ -175,27 +195,32 @@ For complete comparison see [here](https://github.com/ped-dyn-emp/PeTrack/compar
 - Some performance improvements
 
 # v0.7
+
 introduce stereo cameras; alternate height  
 background subtraction especially for stereo cameras; recognition of unmarked pedestrians; integration of 4 disparity algorithms  
 filter to swap picture; more video codecs; color blobs as marker using HSV triangle  
-marker with two dots added; export of viewing direction  
+marker with two dots added; export of viewing direction
 
-# v0.6 
-bug fixes; improve speed; expand visualization possibilities; add variable tracking region adapted to head size; provide program combine to merge trajectories  
+# v0.6
 
+bug fixes; improve speed; expand visualization possibilities; add variable tracking region adapted to head size; provide program combine to merge trajectories
 
 # v0.5
-improve robustness of tracking with interpolation and extrapolation; first analysis functionality  
 
+improve robustness of tracking with interpolation and extrapolation; first analysis functionality
 
 # v0.4
-tracking import and export; manual adding and deleting of trackpoints  
+
+tracking import and export; manual adding and deleting of trackpoints
 
 # v0.3
-recognition; tracking; color mapping  
+
+recognition; tracking; color mapping
 
 # v0.2
-add first recognition  
+
+add first recognition
 
 # v0.1
-only camera calibration is supported; import and export of video and image sequence  
+
+only camera calibration is supported; import and export of video and image sequence

CMakeLists.txt

@@ -15,7 +15,7 @@
 # Project setup
 ################################################################################
 cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
-project(petrack LANGUAGES CXX VERSION 1.0.0)
+project(petrack LANGUAGES CXX VERSION 1.1.0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

ReadMe.md

@@ -1,13 +1,13 @@
 # PeTrack
 
 [![Documentation Status](https://readthedocs.org/projects/petrack/badge/?version=latest)](https://petrack.readthedocs.io/en/latest/?badge=latest)
-[![pipeline status](https://jugit.fz-juelich.de/ped-dyn-emp/petrack/badges/master/pipeline.svg)](https://jugit.fz-juelich.de/ped-dyn-emp/petrack/-/commits/master) 
+[![pipeline status](https://jugit.fz-juelich.de/ped-dyn-emp/petrack/badges/master/pipeline.svg)](https://jugit.fz-juelich.de/ped-dyn-emp/petrack/-/commits/master)
 [![Latest Release](https://jugit.fz-juelich.de/ped-dyn-emp/petrack/-/badges/release.svg)](https://jugit.fz-juelich.de/ped-dyn-emp/petrack/-/releases)
 [![download](https://img.shields.io/badge/download-here-brightgreen?link=https://go.fzj.de/petrack-download&link=https://go.fzj.de/petrack-download)](https://go.fzj.de/petrack-download)
 [![DOI](https://zenodo.org/badge/DOI/10.1016/j.neucom.2012.01.036.svg)](https://doi.org/10.1016/j.neucom.2012.01.036)
 [![DOI](https://zenodo.org/badge/doi/10.5078176/zenodo.5078176.svg)](https://doi.org/10.5281/zenodo.5078176)
 [![License](https://img.shields.io/badge/License-GPLv3-blue)](https://opensource.org/license/gpl-3-0)
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md) 
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
 
 ![PeTrack logo](/icons/logo.png)
 
@@ -16,26 +16,28 @@ For the understanding of the dynamics inside crowds reliable empirical data are
 The program deals with wide angle lenses and a high density of pedestrians. Lens distortion and perspective view are taken into account. The procedure includes calibration, recognition, tracking and height detection.
 Different kinds of markers (e.g. with height information, head direction, individual code) are implemented. With a stereo camera more accurate height measurements and also markerless tracking is possible.
 
-
 ## Download & installation:
+
 We publish installers for windows. To get the latest installer, visit this
-[webpage](https://go.fzj.de/petrack-download) and download the current installer. 
+[webpage](https://go.fzj.de/petrack-download) and download the current installer.
 
 ## How to use PeTrack
 
-To learn how to use PeTrack, please have a look at our documentation [here](https://petrack.readthedocs.io/). 
+To learn how to use PeTrack, please have a look at our documentation [here](https://petrack.readthedocs.io/).
 
 > Note that PeTrack can only be used if some steps are considered **during the planning and execution of the experiments**. This includes, but is not limited to, calibration and selecting hats. See [Planning of Experiments](https://petrack.readthedocs.io/en/latest/planning/planning.html)
 
 After all of that, enjoy successful recognition and tracking 😃
 ![Picture of pedestrians with colored hats with indications of detected heads and tracked past trajectory](/docs/source/user_interface/images/past_path.png)
 
 Some documentation is built into PeTrack itself. For example, you can use the `help`-menu to find a list of all keybindings. For running in a "batch-mode", PeTrack has a CLI, whose options are listed by calling
+
 ```bash
 petrack -help
 ```
 
 ## Tutorial & demo
+
 A small demo project is provided in the `demo` folder. It contains all necessary
 files for setting up a project with PeTrack. You can download these files via
 [this link](https://go.fzj.de/petrack-demo-download). A tutorial leading through
@@ -45,9 +47,11 @@ The intermediate project files for each step are also included in the `demo`
 folder.
 
 ## How to cite
+
 Please cite the general paper and the corresponding software version in your publications if PeTrack helps your research.
 
 General Paper:
+
 - Boltes, M. and Seyfried, A.: Collecting Pedestrian Trajectories; In: Neurocomputing, Special Issue on Behaviours in Video, vol. 100, pp. 127-133 (2013)
 <details><summary>BibTeX</summary>
 
@@ -65,6 +69,7 @@ General Paper:
     keywords = {Pedestrian detection, Laboratory experiment},
 }
 ```
+
 </details>
 
 Software Version:
@@ -98,19 +103,21 @@ Software Version:
   url          = {https://doi.org/10.5281/zenodo.15119517},
 }
 ```
+
 </details>
 
 To find your corresponding version, check the `about` menu or look into the terminal output of PeTrack. To cite PeTrack as software without specifying a version, use the DOI [10.5281/zenodo.5078176](https://doi.org/10.5281/zenodo.5078176).
 
-
 ## License
+
 This project is licensed under the terms of the GPLv3 license. For further information see [LICENSE](./LICENSE).
 
 ## Changelog:
-See [CHANGELOG.md](./CHANGELOG.md)
 
+See [CHANGELOG.md](./CHANGELOG.md)
 
 ## Dependencies:
-* Qwt         (https://qwt.sf.net)
-* Qt          (https://www.qt.io/)
-* OpenCV      (https://opencv.org/)
+
+- Qwt (https://qwt.sf.net)
+- Qt (https://www.qt.io/)
+- OpenCV (https://opencv.org/)

demo/00_files/00_empty.pet

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE PETRACK>
-<PETRACK VERSION="1.0.0">
+<PETRACK VERSION="1.1.0">
     <MAIN SRC="" STATUS_HEIGHT="0"/>
     <STEREO>
         <DISPARITY ALGO="0" COLOR="0" HIDE_INVALID="1" OPACITY="100" SHOW="0">

demo/01_calibration/01_intrinsic.pet

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE PETRACK>
-<PETRACK VERSION="1.0.0">
+<PETRACK VERSION="1.1.0">
     <MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
     <STEREO>
         <DISPARITY ALGO="0" COLOR="0" HIDE_INVALID="1" OPACITY="100" SHOW="0">
@@ -40,7 +40,7 @@
         </CALIBRATION>
         <RECOGNITION>
             <PERFORM ENABLED="0" METHOD="5" MLMETHOD="0" STEP="1"/>
-            <REGION_OF_INTEREST FIX="0" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
+            <REGION_OF_INTEREST FIX="1" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
             <MARKER BRIGHTNESS="50" IGNORE_WITHOUT="1"/>
             <SIZE_COLOR AUTO_WB="0" DEFAULT_HEIGHT="180" GREY_LEVEL="50" MAP_NUMBER="0" MODEL="0" SHOW="1" SYMBOL_SIZE="10" X="0" Y="1" Z="255">
                 <MAP COLORED="1" FROM_HUE="0" FROM_SAT="0" FROM_VAL="128" HEIGHT="255" INV_HUE="0" MAP_HEIGHT="180" TO_HUE="359" TO_SAT="255" TO_VAL="255" WIDTH="359" X="0" Y="0"/>
@@ -54,7 +54,7 @@
             <EXTRAPOLATION ENABLED="1"/>
             <MERGE ENABLED="0"/>
             <ONLY_VISIBLE ENABLED="1"/>
-            <REGION_OF_INTEREST FIX="0" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
+            <REGION_OF_INTEREST FIX="1" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
             <SEARCH_MISSING_FRAMES ENABLED="1"/>
             <RECALCULATE_MEDIAN_HEIGHT ENABLED="1"/>
             <ALLOW_ALTERNATE_HEIGHT ENABLED="0"/>

demo/01_calibration/02_extrinsic.pet

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE PETRACK>
-<PETRACK VERSION="1.0.0">
+<PETRACK VERSION="1.1.0">
     <MAIN SRC="../00_files/calibration/extrinsic/00_all.png" STATUS_HEIGHT="0"/>
     <STEREO>
         <DISPARITY ALGO="0" COLOR="0" HIDE_INVALID="1" OPACITY="100" SHOW="0">
@@ -40,7 +40,7 @@
         </CALIBRATION>
         <RECOGNITION>
             <PERFORM ENABLED="0" METHOD="5" MLMETHOD="0" STEP="1"/>
-            <REGION_OF_INTEREST FIX="0" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
+            <REGION_OF_INTEREST FIX="1" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
             <MARKER BRIGHTNESS="50" IGNORE_WITHOUT="1"/>
             <SIZE_COLOR AUTO_WB="0" DEFAULT_HEIGHT="180" GREY_LEVEL="50" MAP_NUMBER="0" MODEL="0" SHOW="1" SYMBOL_SIZE="10" X="0" Y="1" Z="255">
                 <MAP COLORED="1" FROM_HUE="0" FROM_SAT="0" FROM_VAL="128" HEIGHT="255" INV_HUE="0" MAP_HEIGHT="180" TO_HUE="359" TO_SAT="255" TO_VAL="255" WIDTH="359" X="0" Y="0"/>
@@ -54,7 +54,7 @@
             <EXTRAPOLATION ENABLED="1"/>
             <MERGE ENABLED="0"/>
             <ONLY_VISIBLE ENABLED="1"/>
-            <REGION_OF_INTEREST FIX="0" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
+            <REGION_OF_INTEREST FIX="1" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
             <SEARCH_MISSING_FRAMES ENABLED="1"/>
             <RECALCULATE_MEDIAN_HEIGHT ENABLED="1"/>
             <ALLOW_ALTERNATE_HEIGHT ENABLED="0"/>

demo/01_calibration/03_calibrated_with_video.pet

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE PETRACK>
-<PETRACK VERSION="1.0.0">
+<PETRACK VERSION="1.1.0">
     <MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
     <STEREO>
         <DISPARITY ALGO="0" COLOR="0" HIDE_INVALID="1" OPACITY="100" SHOW="0">
@@ -40,7 +40,7 @@
         </CALIBRATION>
         <RECOGNITION>
             <PERFORM ENABLED="0" METHOD="5" MLMETHOD="0" STEP="1"/>
-            <REGION_OF_INTEREST FIX="0" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
+            <REGION_OF_INTEREST FIX="1" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
             <MARKER BRIGHTNESS="50" IGNORE_WITHOUT="1"/>
             <SIZE_COLOR AUTO_WB="0" DEFAULT_HEIGHT="180" GREY_LEVEL="50" MAP_NUMBER="0" MODEL="0" SHOW="1" SYMBOL_SIZE="10" X="0" Y="1" Z="255">
                 <MAP COLORED="1" FROM_HUE="0" FROM_SAT="0" FROM_VAL="128" HEIGHT="255" INV_HUE="0" MAP_HEIGHT="180" TO_HUE="359" TO_SAT="255" TO_VAL="255" WIDTH="359" X="0" Y="0"/>
@@ -54,7 +54,7 @@
             <EXTRAPOLATION ENABLED="1"/>
             <MERGE ENABLED="0"/>
             <ONLY_VISIBLE ENABLED="1"/>
-            <REGION_OF_INTEREST FIX="0" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
+            <REGION_OF_INTEREST FIX="1" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
             <SEARCH_MISSING_FRAMES ENABLED="1"/>
             <RECALCULATE_MEDIAN_HEIGHT ENABLED="1"/>
             <ALLOW_ALTERNATE_HEIGHT ENABLED="0"/>

demo/02_recognition/04_recognition_codemarker.pet

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE PETRACK>
-<PETRACK VERSION="1.0.0">
+<PETRACK VERSION="1.1.0">
     <MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
     <STEREO>
         <DISPARITY ALGO="0" COLOR="0" HIDE_INVALID="1" OPACITY="100" SHOW="0">
@@ -54,7 +54,7 @@
             <EXTRAPOLATION ENABLED="1"/>
             <MERGE ENABLED="0"/>
             <ONLY_VISIBLE ENABLED="1"/>
-            <REGION_OF_INTEREST FIX="0" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
+            <REGION_OF_INTEREST FIX="1" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
             <SEARCH_MISSING_FRAMES ENABLED="1"/>
             <RECALCULATE_MEDIAN_HEIGHT ENABLED="1"/>
             <ALLOW_ALTERNATE_HEIGHT ENABLED="0"/>

demo/02_recognition/04_recognition_multicolor.pet

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE PETRACK>
-<PETRACK VERSION="1.0.0">
+<PETRACK VERSION="1.1.0">
     <MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
     <STEREO>
         <DISPARITY ALGO="0" COLOR="0" HIDE_INVALID="1" OPACITY="100" SHOW="0">
@@ -54,7 +54,7 @@
             <EXTRAPOLATION ENABLED="1"/>
             <MERGE ENABLED="0"/>
             <ONLY_VISIBLE ENABLED="1"/>
-            <REGION_OF_INTEREST FIX="0" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
+            <REGION_OF_INTEREST FIX="1" HEIGHT="3000" SHOW="0" WIDTH="4000" X="0" Y="0"/>
             <SEARCH_MISSING_FRAMES ENABLED="1"/>
             <RECALCULATE_MEDIAN_HEIGHT ENABLED="1"/>
             <ALLOW_ALTERNATE_HEIGHT ENABLED="0"/>