Skip to content

Commit ac443ac

Browse files
schroedtertschroedtert
committed
Add extra tab for trajectory tests
Allows to display the result of the current plausibility checks, e.g., inside ROI at begin or end, short trajectories, equality to other person or fast velocity variations, in a table. Clicking on the table jumps to the person(s) and frame of the failed check. A color encoded column shows if the issue was already resolved. The color will be automatically adjusted when a person is changed.
1 parent 23edcee commit ac443ac

35 files changed

+1687
-473
lines changed

‎CMakeLists.txt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Project setup
2121
################################################################################
2222
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
23-
project(petrack LANGUAGES CXX VERSION 0.9.4)
23+
project(petrack LANGUAGES CXX VERSION 0.10.0)
2424
set(CMAKE_CXX_STANDARD 17)
2525
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2626
set(CMAKE_CXX_EXTENSIONS OFF)
@@ -398,7 +398,9 @@ target_sources(petrack_core PRIVATE
398398
include/autosaveSettings.h
399399
include/editMoCapDialog.h
400400
include/moCapEditingWidget.h
401+
include/plausibility.h
401402
include/coordinateStructs.h
403+
include/correction.h
402404
)
403405

404406
target_sources(petrack_core PRIVATE
@@ -474,6 +476,8 @@ target_sources(petrack_core PRIVATE
474476
ui/coordinateSystemBox.ui
475477
ui/moCapEditingWidget.ui
476478
ui/editMoCapDialog.ui
479+
src/plausibility.cpp
480+
src/correction.cpp
477481
ui/about.ui
478482
ui/codeMarker.ui
479483
ui/colorMarker.ui
@@ -483,6 +487,7 @@ target_sources(petrack_core PRIVATE
483487
ui/control.ui
484488
ui/openMoCapDialog.ui
485489
ui/moCapSelectionWidget.ui
490+
ui/correction.ui
486491
ui/filterBeforeBox.ui
487492
ui/intrinsicBox.ui
488493
ui/extrinsicBox.ui
@@ -492,7 +497,8 @@ target_sources(petrack_core PRIVATE
492497

493498
target_sources(petrack PRIVATE
494499
petrack.rc
495-
icons/icons.qrc)
500+
icons/icons.qrc
501+
)
496502

497503
#*****************************************************************************
498504
# CODE AUS DER ALTEN .PRO DATEI, DER NOCH NICHT IN DIE CMAKE EINGEBAUT WURDE *

‎demo/00_files/00_empty.pet‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE PETRACK>
3-
<PETRACK VERSION="0.9.4">
3+
<PETRACK VERSION="0.10.0">
44
<MAIN SRC="" STATUS_HEIGHT="0"/>
55
<CONTROL TAB="0">
66
<CALIBRATION>
@@ -42,10 +42,6 @@
4242
<EXPORT_USE_METER ENABLED="0"/>
4343
<EXPORT_COMMENT ENABLED="0"/>
4444
<EXPORT_MARKERID ENABLED="0"/>
45-
<TEST_EQUAL ENABLED="1"/>
46-
<TEST_VELOCITY ENABLED="1"/>
47-
<TEST_INSIDE ENABLED="1"/>
48-
<TEST_LENGTH ENABLED="1"/>
4945
<TRACK_FILE FILENAME=""/>
5046
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
5147
<PATH AFTER="15" BEFORE="15" COLLECTIVE_COLOR_SIZE="11" COLOR_MARKER_LINE_WIDTH="1" COLOR_MARKER_SIZE="14" CURRENT_POINT_LINE_WIDTH="1" CURRENT_POINT_SIZE="60" FIX="0" GROUND_PATH_SIZE="1" GROUND_POSITION_SIZE="1" HEAD_SIZE="1" NUMBER_BOLD="1" NUMBER_SIZE="14" ONLY_PEOPLE="0" ONLY_PEOPLE_LIST="0" ONLY_PEOPLE_NR="1" ONLY_PEOPLE_NR_LIST="" ONLY_VISIBLE="0" PATH_SIZE="2" POINTS_COLORED="1" POINTS_SIZE="7" SHOW="1" SHOW_COLLECTIVE_COLOR="1" SHOW_COLOR_MARKER="1" SHOW_CURRENT_POINT="1" SHOW_GROUND_PATH="0" SHOW_GROUND_POSITION="0" SHOW_NUMBER="1" SHOW_PATH="1" SHOW_POINTS="0" SHOW_POINTS_LINE_WIDTH="1" TRACK_GROUND_PATH_COLOR="#00ff00" TRACK_PATH_COLOR="#ff0000"/>
@@ -55,6 +51,12 @@
5551
<MARK_ACTUAL ENABLED="0"/>
5652
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
5753
</ANALYSIS>
54+
<CORRECTION>
55+
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
56+
<VELOCITY ENABLED="1"/>
57+
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
58+
<INSIDE ENABLED="1" MARGIN="30"/>
59+
</CORRECTION>
5860
</CONTROL>
5961
<EXTR_CALIBRATION>
6062
<REPROJECTION_ERROR AVG_DH="0" AVG_PH="0" AVG_PX="0" MAX_DH="0" MAX_PH="0" MAX_PX="0" SD_DH="0" SD_PH="0" SD_PX="0" USED_HEIGHT="0"/>

‎demo/01_calibration/01_intrinsic.pet‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE PETRACK>
3-
<PETRACK VERSION="0.9.4">
3+
<PETRACK VERSION="0.10.0">
44
<MAIN SRC="" STATUS_HEIGHT="0"/>
55
<CONTROL TAB="0">
66
<CALIBRATION>
@@ -42,10 +42,6 @@
4242
<EXPORT_USE_METER ENABLED="0"/>
4343
<EXPORT_COMMENT ENABLED="0"/>
4444
<EXPORT_MARKERID ENABLED="0"/>
45-
<TEST_EQUAL ENABLED="1"/>
46-
<TEST_VELOCITY ENABLED="1"/>
47-
<TEST_INSIDE ENABLED="1"/>
48-
<TEST_LENGTH ENABLED="1"/>
4945
<TRACK_FILE FILENAME=""/>
5046
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
5147
<PATH AFTER="15" BEFORE="15" COLLECTIVE_COLOR_SIZE="11" COLOR_MARKER_LINE_WIDTH="1" COLOR_MARKER_SIZE="14" CURRENT_POINT_LINE_WIDTH="1" CURRENT_POINT_SIZE="60" FIX="0" GROUND_PATH_SIZE="1" GROUND_POSITION_SIZE="1" HEAD_SIZE="1" NUMBER_BOLD="1" NUMBER_SIZE="14" ONLY_PEOPLE="0" ONLY_PEOPLE_LIST="0" ONLY_PEOPLE_NR="1" ONLY_PEOPLE_NR_LIST="" ONLY_VISIBLE="0" PATH_SIZE="2" POINTS_COLORED="1" POINTS_SIZE="7" SHOW="1" SHOW_COLLECTIVE_COLOR="1" SHOW_COLOR_MARKER="1" SHOW_CURRENT_POINT="1" SHOW_GROUND_PATH="0" SHOW_GROUND_POSITION="0" SHOW_NUMBER="1" SHOW_PATH="1" SHOW_POINTS="0" SHOW_POINTS_LINE_WIDTH="1" TRACK_GROUND_PATH_COLOR="#00ff00" TRACK_PATH_COLOR="#ff0000"/>
@@ -55,6 +51,12 @@
5551
<MARK_ACTUAL ENABLED="0"/>
5652
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
5753
</ANALYSIS>
54+
<CORRECTION>
55+
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
56+
<VELOCITY ENABLED="1"/>
57+
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
58+
<INSIDE ENABLED="1" MARGIN="30"/>
59+
</CORRECTION>
5860
</CONTROL>
5961
<EXTR_CALIBRATION>
6062
<REPROJECTION_ERROR AVG_DH="0" AVG_PH="0" AVG_PX="0" MAX_DH="0" MAX_PH="0" MAX_PX="0" SD_DH="0" SD_PH="0" SD_PX="0" USED_HEIGHT="0"/>

‎demo/01_calibration/02_extrinsic.pet‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE PETRACK>
3-
<PETRACK VERSION="0.9.4">
3+
<PETRACK VERSION="0.10.0">
44
<MAIN SRC="../00_files/calibration/extrinsic/00_all.jpg" STATUS_HEIGHT="0"/>
55
<CONTROL TAB="0">
66
<CALIBRATION>
@@ -42,10 +42,6 @@
4242
<EXPORT_USE_METER ENABLED="0"/>
4343
<EXPORT_COMMENT ENABLED="0"/>
4444
<EXPORT_MARKERID ENABLED="0"/>
45-
<TEST_EQUAL ENABLED="1"/>
46-
<TEST_VELOCITY ENABLED="1"/>
47-
<TEST_INSIDE ENABLED="1"/>
48-
<TEST_LENGTH ENABLED="1"/>
4945
<TRACK_FILE FILENAME=""/>
5046
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
5147
<PATH AFTER="15" BEFORE="15" COLLECTIVE_COLOR_SIZE="11" COLOR_MARKER_LINE_WIDTH="1" COLOR_MARKER_SIZE="14" CURRENT_POINT_LINE_WIDTH="1" CURRENT_POINT_SIZE="60" FIX="0" GROUND_PATH_SIZE="1" GROUND_POSITION_SIZE="1" HEAD_SIZE="1" NUMBER_BOLD="1" NUMBER_SIZE="14" ONLY_PEOPLE="0" ONLY_PEOPLE_LIST="0" ONLY_PEOPLE_NR="1" ONLY_PEOPLE_NR_LIST="1" ONLY_VISIBLE="0" PATH_SIZE="2" POINTS_COLORED="1" POINTS_SIZE="7" SHOW="1" SHOW_COLLECTIVE_COLOR="1" SHOW_COLOR_MARKER="1" SHOW_CURRENT_POINT="1" SHOW_GROUND_PATH="0" SHOW_GROUND_POSITION="0" SHOW_NUMBER="1" SHOW_PATH="1" SHOW_POINTS="0" SHOW_POINTS_LINE_WIDTH="1" TRACK_GROUND_PATH_COLOR="#00ff00" TRACK_PATH_COLOR="#ff0000"/>
@@ -55,6 +51,12 @@
5551
<MARK_ACTUAL ENABLED="0"/>
5652
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
5753
</ANALYSIS>
54+
<CORRECTION>
55+
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
56+
<VELOCITY ENABLED="1"/>
57+
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
58+
<INSIDE ENABLED="1" MARGIN="30"/>
59+
</CORRECTION>
5860
</CONTROL>
5961
<EXTR_CALIBRATION>
6062
<REPROJECTION_ERROR AVG_DH="0" AVG_PH="0" AVG_PX="0" MAX_DH="1.5282007521032739" MAX_PH="1.9084653722971126" MAX_PX="2.9165169096333834" SD_DH="0.43009984448603678" SD_PH="0.47246997925264522" SD_PX="0.79801084449283222" USED_HEIGHT="180"/>

‎demo/01_calibration/03_calibrated_with_video.pet‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE PETRACK>
3-
<PETRACK VERSION="0.9.4">
3+
<PETRACK VERSION="0.10.0">
44
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
55
<CONTROL TAB="0">
66
<CALIBRATION>
@@ -42,10 +42,6 @@
4242
<EXPORT_USE_METER ENABLED="0"/>
4343
<EXPORT_COMMENT ENABLED="0"/>
4444
<EXPORT_MARKERID ENABLED="0"/>
45-
<TEST_EQUAL ENABLED="1"/>
46-
<TEST_VELOCITY ENABLED="1"/>
47-
<TEST_INSIDE ENABLED="1"/>
48-
<TEST_LENGTH ENABLED="1"/>
4945
<TRACK_FILE FILENAME=""/>
5046
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
5147
<PATH AFTER="15" BEFORE="15" COLLECTIVE_COLOR_SIZE="11" COLOR_MARKER_LINE_WIDTH="1" COLOR_MARKER_SIZE="14" CURRENT_POINT_LINE_WIDTH="1" CURRENT_POINT_SIZE="60" FIX="0" GROUND_PATH_SIZE="1" GROUND_POSITION_SIZE="1" HEAD_SIZE="1" NUMBER_BOLD="1" NUMBER_SIZE="14" ONLY_PEOPLE="0" ONLY_PEOPLE_LIST="0" ONLY_PEOPLE_NR="1" ONLY_PEOPLE_NR_LIST="1" ONLY_VISIBLE="0" PATH_SIZE="2" POINTS_COLORED="1" POINTS_SIZE="7" SHOW="1" SHOW_COLLECTIVE_COLOR="1" SHOW_COLOR_MARKER="1" SHOW_CURRENT_POINT="1" SHOW_GROUND_PATH="0" SHOW_GROUND_POSITION="0" SHOW_NUMBER="1" SHOW_PATH="1" SHOW_POINTS="0" SHOW_POINTS_LINE_WIDTH="1" TRACK_GROUND_PATH_COLOR="#00ff00" TRACK_PATH_COLOR="#ff0000"/>
@@ -55,6 +51,12 @@
5551
<MARK_ACTUAL ENABLED="0"/>
5652
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
5753
</ANALYSIS>
54+
<CORRECTION>
55+
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
56+
<VELOCITY ENABLED="1"/>
57+
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
58+
<INSIDE ENABLED="1" MARGIN="30"/>
59+
</CORRECTION>
5860
</CONTROL>
5961
<EXTR_CALIBRATION>
6062
<REPROJECTION_ERROR AVG_DH="0" AVG_PH="0" AVG_PX="0" MAX_DH="1.5282007521032739" MAX_PH="1.9084653722971126" MAX_PX="2.9165169096333834" SD_DH="0.43009984448603678" SD_PH="0.47246997925264522" SD_PX="0.79801084449283222" USED_HEIGHT="180"/>

‎demo/02_recognition/04_recognition.pet‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE PETRACK>
3-
<PETRACK VERSION="0.9.4">
3+
<PETRACK VERSION="0.10.0">
44
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
55
<CONTROL TAB="1">
66
<CALIBRATION>
@@ -46,10 +46,6 @@
4646
<EXPORT_USE_METER ENABLED="0"/>
4747
<EXPORT_COMMENT ENABLED="0"/>
4848
<EXPORT_MARKERID ENABLED="0"/>
49-
<TEST_EQUAL ENABLED="1"/>
50-
<TEST_VELOCITY ENABLED="1"/>
51-
<TEST_INSIDE ENABLED="1"/>
52-
<TEST_LENGTH ENABLED="1"/>
5349
<TRACK_FILE FILENAME=""/>
5450
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
5551
<PATH AFTER="15" BEFORE="15" COLLECTIVE_COLOR_SIZE="11" COLOR_MARKER_LINE_WIDTH="1" COLOR_MARKER_SIZE="14" CURRENT_POINT_LINE_WIDTH="1" CURRENT_POINT_SIZE="60" FIX="0" GROUND_PATH_SIZE="1" GROUND_POSITION_SIZE="1" HEAD_SIZE="1" NUMBER_BOLD="1" NUMBER_SIZE="14" ONLY_PEOPLE="0" ONLY_PEOPLE_LIST="0" ONLY_PEOPLE_NR="1" ONLY_PEOPLE_NR_LIST="1" ONLY_VISIBLE="0" PATH_SIZE="2" POINTS_COLORED="1" POINTS_SIZE="7" SHOW="1" SHOW_COLLECTIVE_COLOR="1" SHOW_COLOR_MARKER="1" SHOW_CURRENT_POINT="1" SHOW_GROUND_PATH="0" SHOW_GROUND_POSITION="0" SHOW_NUMBER="1" SHOW_PATH="1" SHOW_POINTS="0" SHOW_POINTS_LINE_WIDTH="1" TRACK_GROUND_PATH_COLOR="#00ff00" TRACK_PATH_COLOR="#ff0000"/>
@@ -59,6 +55,12 @@
5955
<MARK_ACTUAL ENABLED="0"/>
6056
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
6157
</ANALYSIS>
58+
<CORRECTION>
59+
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
60+
<VELOCITY ENABLED="1"/>
61+
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
62+
<INSIDE ENABLED="1" MARGIN="30"/>
63+
</CORRECTION>
6264
</CONTROL>
6365
<EXTR_CALIBRATION>
6466
<REPROJECTION_ERROR AVG_DH="0" AVG_PH="0" AVG_PX="0" MAX_DH="1.5282007521032739" MAX_PH="1.9084653722971126" MAX_PX="2.9165169096333834" SD_DH="0.43009984448603678" SD_PH="0.47246997925264522" SD_PX="0.79801084449283222" USED_HEIGHT="180"/>
@@ -89,7 +91,7 @@
8991
</MULTI_COLOR_MARKER>
9092
<MOCAP COLOR="#ffff37" SHOW="0" SIZE="2"/>
9193
<PLAYER FPS="25" FRAME="0" PLAYER_SPEED_FIXED="0" SOURCE_FRAME_IN="0" SOURCE_FRAME_OUT="420"/>
92-
<VIEW ANTIALIAS="0" CAMERA="2" HIDE_CONTROLS="0" OPENGL="0" SAVE_TRANSFORMED="0" TRANSFORMATION="208 0 0 0"/>
94+
<VIEW ANTIALIAS="0" CAMERA="2" HIDE_CONTROLS="0" OPENGL="0" SAVE_TRANSFORMED="0" TRANSFORMATION="194 0 0 0"/>
9395
<AUTO_TRACK BACK_TRACK="1" OPTIMZE_COLOR="0"/>
9496
<MISSING_FRAMES executed="0"/>
9597
</PETRACK>

‎demo/03_tracking/05_tracking.pet‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE PETRACK>
3-
<PETRACK VERSION="0.9.4">
3+
<PETRACK VERSION="0.10.0">
44
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
55
<CONTROL TAB="2">
66
<CALIBRATION>
@@ -46,10 +46,6 @@
4646
<EXPORT_USE_METER ENABLED="1"/>
4747
<EXPORT_COMMENT ENABLED="0"/>
4848
<EXPORT_MARKERID ENABLED="0"/>
49-
<TEST_EQUAL ENABLED="1"/>
50-
<TEST_VELOCITY ENABLED="1"/>
51-
<TEST_INSIDE ENABLED="1"/>
52-
<TEST_LENGTH ENABLED="1"/>
5349
<TRACK_FILE FILENAME=""/>
5450
<SEARCH_REGION ADAPTIVE="1" LEVELS="2" MAX_ERROR="0" SCALE="14" SHOW="0"/>
5551
<PATH AFTER="15" BEFORE="15" COLLECTIVE_COLOR_SIZE="11" COLOR_MARKER_LINE_WIDTH="1" COLOR_MARKER_SIZE="14" CURRENT_POINT_LINE_WIDTH="1" CURRENT_POINT_SIZE="7" FIX="0" GROUND_PATH_SIZE="1" GROUND_POSITION_SIZE="1" HEAD_SIZE="0" NUMBER_BOLD="1" NUMBER_SIZE="14" ONLY_PEOPLE="0" ONLY_PEOPLE_LIST="0" ONLY_PEOPLE_NR="1" ONLY_PEOPLE_NR_LIST="" ONLY_VISIBLE="0" PATH_SIZE="2" POINTS_COLORED="1" POINTS_SIZE="7" SHOW="1" SHOW_COLLECTIVE_COLOR="1" SHOW_COLOR_MARKER="1" SHOW_CURRENT_POINT="1" SHOW_GROUND_PATH="0" SHOW_GROUND_POSITION="0" SHOW_NUMBER="1" SHOW_PATH="1" SHOW_POINTS="0" SHOW_POINTS_LINE_WIDTH="1" TRACK_GROUND_PATH_COLOR="#00ff00" TRACK_PATH_COLOR="#ff0000"/>
@@ -59,6 +55,12 @@
5955
<MARK_ACTUAL ENABLED="0"/>
6056
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
6157
</ANALYSIS>
58+
<CORRECTION>
59+
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
60+
<VELOCITY ENABLED="1"/>
61+
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
62+
<INSIDE ENABLED="1" MARGIN="30"/>
63+
</CORRECTION>
6264
</CONTROL>
6365
<EXTR_CALIBRATION>
6466
<REPROJECTION_ERROR AVG_DH="0" AVG_PH="0" AVG_PX="0" MAX_DH="1.5282007521032739" MAX_PH="1.9084653722971126" MAX_PX="2.9165169096333834" SD_DH="0.43009984448603678" SD_PH="0.47246997925264522" SD_PX="0.79801084449283222" USED_HEIGHT="180"/>

‎demo/03_tracking/06_tracking_with_trajectories.pet‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE PETRACK>
3-
<PETRACK VERSION="0.9.4">
3+
<PETRACK VERSION="0.10.0">
44
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
55
<CONTROL TAB="2">
66
<CALIBRATION>
@@ -46,10 +46,6 @@
4646
<EXPORT_USE_METER ENABLED="1"/>
4747
<EXPORT_COMMENT ENABLED="0"/>
4848
<EXPORT_MARKERID ENABLED="0"/>
49-
<TEST_EQUAL ENABLED="1"/>
50-
<TEST_VELOCITY ENABLED="1"/>
51-
<TEST_INSIDE ENABLED="1"/>
52-
<TEST_LENGTH ENABLED="1"/>
5349
<TRACK_FILE FILENAME="06_exported_trajectories.trc"/>
5450
<SEARCH_REGION ADAPTIVE="1" LEVELS="2" MAX_ERROR="0" SCALE="14" SHOW="0"/>
5551
<PATH AFTER="15" BEFORE="15" COLLECTIVE_COLOR_SIZE="11" COLOR_MARKER_LINE_WIDTH="1" COLOR_MARKER_SIZE="14" CURRENT_POINT_LINE_WIDTH="1" CURRENT_POINT_SIZE="7" FIX="0" GROUND_PATH_SIZE="1" GROUND_POSITION_SIZE="1" HEAD_SIZE="0" NUMBER_BOLD="1" NUMBER_SIZE="14" ONLY_PEOPLE="0" ONLY_PEOPLE_LIST="0" ONLY_PEOPLE_NR="1" ONLY_PEOPLE_NR_LIST="" ONLY_VISIBLE="0" PATH_SIZE="2" POINTS_COLORED="1" POINTS_SIZE="7" SHOW="1" SHOW_COLLECTIVE_COLOR="1" SHOW_COLOR_MARKER="1" SHOW_CURRENT_POINT="1" SHOW_GROUND_PATH="0" SHOW_GROUND_POSITION="0" SHOW_NUMBER="1" SHOW_PATH="1" SHOW_POINTS="0" SHOW_POINTS_LINE_WIDTH="1" TRACK_GROUND_PATH_COLOR="#00ff00" TRACK_PATH_COLOR="#ff0000"/>
@@ -59,6 +55,12 @@
5955
<MARK_ACTUAL ENABLED="0"/>
6056
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
6157
</ANALYSIS>
58+
<CORRECTION>
59+
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
60+
<VELOCITY ENABLED="1"/>
61+
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
62+
<INSIDE ENABLED="1" MARGIN="30"/>
63+
</CORRECTION>
6264
</CONTROL>
6365
<EXTR_CALIBRATION>
6466
<REPROJECTION_ERROR AVG_DH="0" AVG_PH="0" AVG_PX="0" MAX_DH="1.5282007521032739" MAX_PH="1.9084653722971126" MAX_PX="2.9165169096333834" SD_DH="0.43009984448603678" SD_PH="0.47246997925264522" SD_PX="0.79801084449283222" USED_HEIGHT="180"/>

‎demo/04_correcting/07_corrected.pet‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE PETRACK>
3-
<PETRACK VERSION="0.9.4">
3+
<PETRACK VERSION="0.10.0">
44
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
55
<CONTROL TAB="2">
66
<CALIBRATION>
@@ -46,10 +46,6 @@
4646
<EXPORT_USE_METER ENABLED="1"/>
4747
<EXPORT_COMMENT ENABLED="0"/>
4848
<EXPORT_MARKERID ENABLED="0"/>
49-
<TEST_EQUAL ENABLED="1"/>
50-
<TEST_VELOCITY ENABLED="1"/>
51-
<TEST_INSIDE ENABLED="1"/>
52-
<TEST_LENGTH ENABLED="1"/>
5349
<TRACK_FILE FILENAME="07_corrected_trajectories.trc"/>
5450
<SEARCH_REGION ADAPTIVE="1" LEVELS="2" MAX_ERROR="0" SCALE="14" SHOW="0"/>
5551
<PATH AFTER="1000" BEFORE="1000" COLLECTIVE_COLOR_SIZE="11" COLOR_MARKER_LINE_WIDTH="1" COLOR_MARKER_SIZE="14" CURRENT_POINT_LINE_WIDTH="1" CURRENT_POINT_SIZE="7" FIX="0" GROUND_PATH_SIZE="1" GROUND_POSITION_SIZE="1" HEAD_SIZE="0" NUMBER_BOLD="1" NUMBER_SIZE="14" ONLY_PEOPLE="1" ONLY_PEOPLE_LIST="0" ONLY_PEOPLE_NR="1" ONLY_PEOPLE_NR_LIST="86" ONLY_VISIBLE="0" PATH_SIZE="2" POINTS_COLORED="1" POINTS_SIZE="7" SHOW="1" SHOW_COLLECTIVE_COLOR="1" SHOW_COLOR_MARKER="1" SHOW_CURRENT_POINT="1" SHOW_GROUND_PATH="0" SHOW_GROUND_POSITION="0" SHOW_NUMBER="1" SHOW_PATH="1" SHOW_POINTS="1" SHOW_POINTS_LINE_WIDTH="1" TRACK_GROUND_PATH_COLOR="#00ff00" TRACK_PATH_COLOR="#ff0000"/>
@@ -59,6 +55,12 @@
5955
<MARK_ACTUAL ENABLED="0"/>
6056
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
6157
</ANALYSIS>
58+
<CORRECTION>
59+
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
60+
<VELOCITY ENABLED="1"/>
61+
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
62+
<INSIDE ENABLED="1" MARGIN="30"/>
63+
</CORRECTION>
6264
</CONTROL>
6365
<EXTR_CALIBRATION>
6466
<REPROJECTION_ERROR AVG_DH="0" AVG_PH="0" AVG_PX="0" MAX_DH="1.5282007521032739" MAX_PH="1.9084653722971126" MAX_PX="2.9165169096333834" SD_DH="0.43009984448603678" SD_PH="0.47246997925264522" SD_PX="0.79801084449283222" USED_HEIGHT="180"/>

‎include/control.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include <Qt>
2727
#include <QtWidgets>
2828

29+
class Petrack;
30+
class Correction;
2931
class QGraphicsScene;
3032
class QDomElement;
3133
class IntrinsicBox;
@@ -211,7 +213,7 @@ class Control : public QWidget
211213
double getCameraAltitude() const;
212214

213215
void setXml(QDomElement &elem);
214-
void getXml(const QDomElement &elem);
216+
void getXml(const QDomElement &elem, const QString &version);
215217
bool isLoading() const;
216218
ColorPlot *getColorPlot() const;
217219
void replotColorplot();
@@ -255,7 +257,6 @@ class Control : public QWidget
255257
IntrinsicCameraParams getIntrinsicCameraParams() const;
256258
void runAutoCalib();
257259

258-
259260
#ifdef QWT
260261
AnalysePlot *getAnalysePlot() const;
261262
#endif
@@ -271,6 +272,7 @@ class Control : public QWidget
271272
return mMainWindow;
272273
}
273274

275+
void resetCorrection();
274276

275277
private slots:
276278
void on_anaCalculate_clicked();
@@ -320,7 +322,6 @@ private slots:
320322
void on_trackReset_clicked();
321323
void on_trackExport_clicked();
322324
void on_trackImport_clicked();
323-
void on_trackTest_clicked();
324325

325326
void on_trackRegionScale_valueChanged(int i);
326327
void on_trackRegionLevels_valueChanged(int i);
@@ -575,7 +576,9 @@ public slots:
575576
ExtrinsicBox *mExtr;
576577
CoordinateSystemBox *mCoordSys;
577578
QGraphicsScene *mScene;
578-
bool mColorChanging;
579+
Correction *mCorrectionWidget;
580+
581+
bool mColorChanging;
579582
bool mIndexChanging; // shows, if the index of the color model is really changing; nor while constructor (initialer
580583
// durchlauf) and may be while loading xml file
581584
bool mLoading; // shows, if new project is just loading

0 commit comments

Comments
 (0)