Skip to content

Commit

Permalink
Add extra tab for trajectory tests
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
schroedtert committed Jun 22, 2023
1 parent 23edcee commit ac443ac
Show file tree
Hide file tree
Showing 35 changed files with 1,687 additions and 473 deletions.
10 changes: 8 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Project setup
################################################################################
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
project(petrack LANGUAGES CXX VERSION 0.9.4)
project(petrack LANGUAGES CXX VERSION 0.10.0)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down Expand Up @@ -398,7 +398,9 @@ target_sources(petrack_core PRIVATE
include/autosaveSettings.h
include/editMoCapDialog.h
include/moCapEditingWidget.h
include/plausibility.h
include/coordinateStructs.h
include/correction.h
)

target_sources(petrack_core PRIVATE
Expand Down Expand Up @@ -474,6 +476,8 @@ target_sources(petrack_core PRIVATE
ui/coordinateSystemBox.ui
ui/moCapEditingWidget.ui
ui/editMoCapDialog.ui
src/plausibility.cpp
src/correction.cpp
ui/about.ui
ui/codeMarker.ui
ui/colorMarker.ui
Expand All @@ -483,6 +487,7 @@ target_sources(petrack_core PRIVATE
ui/control.ui
ui/openMoCapDialog.ui
ui/moCapSelectionWidget.ui
ui/correction.ui
ui/filterBeforeBox.ui
ui/intrinsicBox.ui
ui/extrinsicBox.ui
Expand All @@ -492,7 +497,8 @@ target_sources(petrack_core PRIVATE

target_sources(petrack PRIVATE
petrack.rc
icons/icons.qrc)
icons/icons.qrc
)

#*****************************************************************************
# CODE AUS DER ALTEN .PRO DATEI, DER NOCH NICHT IN DIE CMAKE EINGEBAUT WURDE *
Expand Down
12 changes: 7 additions & 5 deletions demo/00_files/00_empty.pet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.4">
<PETRACK VERSION="0.10.0">
<MAIN SRC="" STATUS_HEIGHT="0"/>
<CONTROL TAB="0">
<CALIBRATION>
Expand Down Expand Up @@ -42,10 +42,6 @@
<EXPORT_USE_METER ENABLED="0"/>
<EXPORT_COMMENT ENABLED="0"/>
<EXPORT_MARKERID ENABLED="0"/>
<TEST_EQUAL ENABLED="1"/>
<TEST_VELOCITY ENABLED="1"/>
<TEST_INSIDE ENABLED="1"/>
<TEST_LENGTH ENABLED="1"/>
<TRACK_FILE FILENAME=""/>
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
<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"/>
Expand All @@ -55,6 +51,12 @@
<MARK_ACTUAL ENABLED="0"/>
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
</ANALYSIS>
<CORRECTION>
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
<VELOCITY ENABLED="1"/>
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
<INSIDE ENABLED="1" MARGIN="30"/>
</CORRECTION>
</CONTROL>
<EXTR_CALIBRATION>
<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"/>
Expand Down
12 changes: 7 additions & 5 deletions demo/01_calibration/01_intrinsic.pet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.4">
<PETRACK VERSION="0.10.0">
<MAIN SRC="" STATUS_HEIGHT="0"/>
<CONTROL TAB="0">
<CALIBRATION>
Expand Down Expand Up @@ -42,10 +42,6 @@
<EXPORT_USE_METER ENABLED="0"/>
<EXPORT_COMMENT ENABLED="0"/>
<EXPORT_MARKERID ENABLED="0"/>
<TEST_EQUAL ENABLED="1"/>
<TEST_VELOCITY ENABLED="1"/>
<TEST_INSIDE ENABLED="1"/>
<TEST_LENGTH ENABLED="1"/>
<TRACK_FILE FILENAME=""/>
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
<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"/>
Expand All @@ -55,6 +51,12 @@
<MARK_ACTUAL ENABLED="0"/>
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
</ANALYSIS>
<CORRECTION>
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
<VELOCITY ENABLED="1"/>
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
<INSIDE ENABLED="1" MARGIN="30"/>
</CORRECTION>
</CONTROL>
<EXTR_CALIBRATION>
<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"/>
Expand Down
12 changes: 7 additions & 5 deletions demo/01_calibration/02_extrinsic.pet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.4">
<PETRACK VERSION="0.10.0">
<MAIN SRC="../00_files/calibration/extrinsic/00_all.jpg" STATUS_HEIGHT="0"/>
<CONTROL TAB="0">
<CALIBRATION>
Expand Down Expand Up @@ -42,10 +42,6 @@
<EXPORT_USE_METER ENABLED="0"/>
<EXPORT_COMMENT ENABLED="0"/>
<EXPORT_MARKERID ENABLED="0"/>
<TEST_EQUAL ENABLED="1"/>
<TEST_VELOCITY ENABLED="1"/>
<TEST_INSIDE ENABLED="1"/>
<TEST_LENGTH ENABLED="1"/>
<TRACK_FILE FILENAME=""/>
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
<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"/>
Expand All @@ -55,6 +51,12 @@
<MARK_ACTUAL ENABLED="0"/>
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
</ANALYSIS>
<CORRECTION>
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
<VELOCITY ENABLED="1"/>
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
<INSIDE ENABLED="1" MARGIN="30"/>
</CORRECTION>
</CONTROL>
<EXTR_CALIBRATION>
<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"/>
Expand Down
12 changes: 7 additions & 5 deletions demo/01_calibration/03_calibrated_with_video.pet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.4">
<PETRACK VERSION="0.10.0">
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="0">
<CALIBRATION>
Expand Down Expand Up @@ -42,10 +42,6 @@
<EXPORT_USE_METER ENABLED="0"/>
<EXPORT_COMMENT ENABLED="0"/>
<EXPORT_MARKERID ENABLED="0"/>
<TEST_EQUAL ENABLED="1"/>
<TEST_VELOCITY ENABLED="1"/>
<TEST_INSIDE ENABLED="1"/>
<TEST_LENGTH ENABLED="1"/>
<TRACK_FILE FILENAME=""/>
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
<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"/>
Expand All @@ -55,6 +51,12 @@
<MARK_ACTUAL ENABLED="0"/>
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
</ANALYSIS>
<CORRECTION>
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
<VELOCITY ENABLED="1"/>
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
<INSIDE ENABLED="1" MARGIN="30"/>
</CORRECTION>
</CONTROL>
<EXTR_CALIBRATION>
<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"/>
Expand Down
14 changes: 8 additions & 6 deletions demo/02_recognition/04_recognition.pet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.4">
<PETRACK VERSION="0.10.0">
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="1">
<CALIBRATION>
Expand Down Expand Up @@ -46,10 +46,6 @@
<EXPORT_USE_METER ENABLED="0"/>
<EXPORT_COMMENT ENABLED="0"/>
<EXPORT_MARKERID ENABLED="0"/>
<TEST_EQUAL ENABLED="1"/>
<TEST_VELOCITY ENABLED="1"/>
<TEST_INSIDE ENABLED="1"/>
<TEST_LENGTH ENABLED="1"/>
<TRACK_FILE FILENAME=""/>
<SEARCH_REGION ADAPTIVE="0" LEVELS="3" MAX_ERROR="0" SCALE="16" SHOW="0"/>
<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"/>
Expand All @@ -59,6 +55,12 @@
<MARK_ACTUAL ENABLED="0"/>
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
</ANALYSIS>
<CORRECTION>
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
<VELOCITY ENABLED="1"/>
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
<INSIDE ENABLED="1" MARGIN="30"/>
</CORRECTION>
</CONTROL>
<EXTR_CALIBRATION>
<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"/>
Expand Down Expand Up @@ -89,7 +91,7 @@
</MULTI_COLOR_MARKER>
<MOCAP COLOR="#ffff37" SHOW="0" SIZE="2"/>
<PLAYER FPS="25" FRAME="0" PLAYER_SPEED_FIXED="0" SOURCE_FRAME_IN="0" SOURCE_FRAME_OUT="420"/>
<VIEW ANTIALIAS="0" CAMERA="2" HIDE_CONTROLS="0" OPENGL="0" SAVE_TRANSFORMED="0" TRANSFORMATION="208 0 0 0"/>
<VIEW ANTIALIAS="0" CAMERA="2" HIDE_CONTROLS="0" OPENGL="0" SAVE_TRANSFORMED="0" TRANSFORMATION="194 0 0 0"/>
<AUTO_TRACK BACK_TRACK="1" OPTIMZE_COLOR="0"/>
<MISSING_FRAMES executed="0"/>
</PETRACK>
12 changes: 7 additions & 5 deletions demo/03_tracking/05_tracking.pet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.4">
<PETRACK VERSION="0.10.0">
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="2">
<CALIBRATION>
Expand Down Expand Up @@ -46,10 +46,6 @@
<EXPORT_USE_METER ENABLED="1"/>
<EXPORT_COMMENT ENABLED="0"/>
<EXPORT_MARKERID ENABLED="0"/>
<TEST_EQUAL ENABLED="1"/>
<TEST_VELOCITY ENABLED="1"/>
<TEST_INSIDE ENABLED="1"/>
<TEST_LENGTH ENABLED="1"/>
<TRACK_FILE FILENAME=""/>
<SEARCH_REGION ADAPTIVE="1" LEVELS="2" MAX_ERROR="0" SCALE="14" SHOW="0"/>
<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"/>
Expand All @@ -59,6 +55,12 @@
<MARK_ACTUAL ENABLED="0"/>
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
</ANALYSIS>
<CORRECTION>
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
<VELOCITY ENABLED="1"/>
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
<INSIDE ENABLED="1" MARGIN="30"/>
</CORRECTION>
</CONTROL>
<EXTR_CALIBRATION>
<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"/>
Expand Down
12 changes: 7 additions & 5 deletions demo/03_tracking/06_tracking_with_trajectories.pet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.4">
<PETRACK VERSION="0.10.0">
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="2">
<CALIBRATION>
Expand Down Expand Up @@ -46,10 +46,6 @@
<EXPORT_USE_METER ENABLED="1"/>
<EXPORT_COMMENT ENABLED="0"/>
<EXPORT_MARKERID ENABLED="0"/>
<TEST_EQUAL ENABLED="1"/>
<TEST_VELOCITY ENABLED="1"/>
<TEST_INSIDE ENABLED="1"/>
<TEST_LENGTH ENABLED="1"/>
<TRACK_FILE FILENAME="06_exported_trajectories.trc"/>
<SEARCH_REGION ADAPTIVE="1" LEVELS="2" MAX_ERROR="0" SCALE="14" SHOW="0"/>
<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"/>
Expand All @@ -59,6 +55,12 @@
<MARK_ACTUAL ENABLED="0"/>
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
</ANALYSIS>
<CORRECTION>
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
<VELOCITY ENABLED="1"/>
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
<INSIDE ENABLED="1" MARGIN="30"/>
</CORRECTION>
</CONTROL>
<EXTR_CALIBRATION>
<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"/>
Expand Down
12 changes: 7 additions & 5 deletions demo/04_correcting/07_corrected.pet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.4">
<PETRACK VERSION="0.10.0">
<MAIN SRC="../00_files/video/video.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="2">
<CALIBRATION>
Expand Down Expand Up @@ -46,10 +46,6 @@
<EXPORT_USE_METER ENABLED="1"/>
<EXPORT_COMMENT ENABLED="0"/>
<EXPORT_MARKERID ENABLED="0"/>
<TEST_EQUAL ENABLED="1"/>
<TEST_VELOCITY ENABLED="1"/>
<TEST_INSIDE ENABLED="1"/>
<TEST_LENGTH ENABLED="1"/>
<TRACK_FILE FILENAME="07_corrected_trajectories.trc"/>
<SEARCH_REGION ADAPTIVE="1" LEVELS="2" MAX_ERROR="0" SCALE="14" SHOW="0"/>
<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"/>
Expand All @@ -59,6 +55,12 @@
<MARK_ACTUAL ENABLED="0"/>
<CALCULATION ABSOLUTE="0" CONSIDER_X="0" CONSIDER_Y="1" REVERSE="0" SHOW_VORONOI="0" STEP_SIZE="25"/>
</ANALYSIS>
<CORRECTION>
<EQUALITY DISTANCE="0.5" ENABLED="1"/>
<VELOCITY ENABLED="1"/>
<LENGTH ENABLED="1" MIN_LENGTH="10"/>
<INSIDE ENABLED="1" MARGIN="30"/>
</CORRECTION>
</CONTROL>
<EXTR_CALIBRATION>
<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"/>
Expand Down
11 changes: 7 additions & 4 deletions include/control.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include <Qt>
#include <QtWidgets>

class Petrack;
class Correction;
class QGraphicsScene;
class QDomElement;
class IntrinsicBox;
Expand Down Expand Up @@ -211,7 +213,7 @@ class Control : public QWidget
double getCameraAltitude() const;

void setXml(QDomElement &elem);
void getXml(const QDomElement &elem);
void getXml(const QDomElement &elem, const QString &version);
bool isLoading() const;
ColorPlot *getColorPlot() const;
void replotColorplot();
Expand Down Expand Up @@ -255,7 +257,6 @@ class Control : public QWidget
IntrinsicCameraParams getIntrinsicCameraParams() const;
void runAutoCalib();


#ifdef QWT
AnalysePlot *getAnalysePlot() const;
#endif
Expand All @@ -271,6 +272,7 @@ class Control : public QWidget
return mMainWindow;
}

void resetCorrection();

private slots:
void on_anaCalculate_clicked();
Expand Down Expand Up @@ -320,7 +322,6 @@ private slots:
void on_trackReset_clicked();
void on_trackExport_clicked();
void on_trackImport_clicked();
void on_trackTest_clicked();

void on_trackRegionScale_valueChanged(int i);
void on_trackRegionLevels_valueChanged(int i);
Expand Down Expand Up @@ -575,7 +576,9 @@ public slots:
ExtrinsicBox *mExtr;
CoordinateSystemBox *mCoordSys;
QGraphicsScene *mScene;
bool mColorChanging;
Correction *mCorrectionWidget;

bool mColorChanging;
bool mIndexChanging; // shows, if the index of the color model is really changing; nor while constructor (initialer
// durchlauf) and may be while loading xml file
bool mLoading; // shows, if new project is just loading
Expand Down
Loading

0 comments on commit ac443ac

Please sign in to comment.