From 9cb1e268d879879f48f7ee42bfbaf5aeef42c0a4 Mon Sep 17 00:00:00 2001
From: "d.kilic" <d.kilic@fz-juelich.de>
Date: Wed, 31 Jan 2024 11:13:09 +0100
Subject: [PATCH] Restructure physical layout of source files
- no split between include/src anymore
- more directories grouping files by their function
- CMakeLists.txt setup to support file lists in each subdir
---
CMakeLists.txt | 204 +-----------------
scripts/check-format-cpp.sh | 1 -
scripts/check-license-header.py | 4 +-
scripts/format-cpp.sh | 1 -
scripts/update-license-header.py | 4 +-
src/CMakeLists.txt | 23 ++
src/IO/CMakeLists.txt | 30 +++
src/{ => IO}/IO.cpp | 0
{include => src/IO}/IO.h | 0
src/{ => IO}/animation.cpp | 0
{include => src/IO}/animation.h | 0
src/{ => IO}/autosave.cpp | 0
{include => src/IO}/autosave.h | 0
src/{ => IO}/aviFileWriter.cpp | 0
{include => src/IO}/aviFileWriter.h | 0
src/{ => IO}/moCapPersonMetadata.cpp | 0
{include => src/IO}/moCapPersonMetadata.h | 0
src/{ => IO}/skeletonTree.cpp | 0
{include => src/IO}/skeletonTree.h | 0
src/{ => IO}/skeletonTreeFactory.cpp | 0
{include => src/IO}/skeletonTreeFactory.h | 0
src/{ => IO}/stereoAviFile.cpp | 0
{include => src/IO}/stereoAviFile.h | 0
src/calibration/CMakeLists.txt | 14 ++
src/{ => calibration}/autoCalib.cpp | 0
{include => src/calibration}/autoCalib.h | 0
src/{ => calibration}/extrCalibration.cpp | 0
.../calibration}/extrCalibration.h | 0
.../calibration}/extrinsicParameters.h | 0
.../intrinsicCameraParams.cpp | 0
.../calibration}/intrinsicCameraParams.h | 0
src/{ => calibration}/stereoContext.cpp | 0
{include => src/calibration}/stereoContext.h | 0
.../calibration}/worldImageCorrespondence.h | 0
src/filter/CMakeLists.txt | 20 ++
src/{ => filter}/backgroundFilter.cpp | 0
{include => src/filter}/backgroundFilter.h | 0
src/{ => filter}/blurFilter.cpp | 0
{include => src/filter}/blurFilter.h | 0
src/{ => filter}/borderFilter.cpp | 0
{include => src/filter}/borderFilter.h | 0
src/{ => filter}/brightContrastFilter.cpp | 0
.../filter}/brightContrastFilter.h | 0
src/{ => filter}/calibFilter.cpp | 0
{include => src/filter}/calibFilter.h | 0
src/{ => filter}/calibStereoFilter.cpp | 0
{include => src/filter}/calibStereoFilter.h | 0
src/{ => filter}/filter.cpp | 0
{include => src/filter}/filter.h | 0
src/{ => filter}/swapFilter.cpp | 0
{include => src/filter}/swapFilter.h | 0
{include => src}/frameRange.h | 0
{include => src}/manualTrackpointMover.h | 0
{include => src}/personStorage.h | 0
{include => src}/petrack.h | 0
{include => src}/plausibility.h | 0
{include => src}/player.h | 0
src/recognition/CMakeLists.txt | 16 ++
src/{ => recognition}/ellipse.cpp | 0
{include => src/recognition}/ellipse.h | 0
src/{ => recognition}/markerCasern.cpp | 0
{include => src/recognition}/markerCasern.h | 0
src/{ => recognition}/markerHermes.cpp | 0
{include => src/recognition}/markerHermes.h | 0
src/{ => recognition}/markerJapan.cpp | 0
{include => src/recognition}/markerJapan.h | 0
src/{ => recognition}/person.cpp | 0
{include => src/recognition}/person.h | 0
src/{ => recognition}/recognition.cpp | 0
{include => src/recognition}/recognition.h | 0
src/tracking/CMakeLists.txt | 8 +
src/{ => tracking}/tracker.cpp | 0
{include => src/tracking}/tracker.h | 0
src/{ => tracking}/trackerReal.cpp | 0
{include => src/tracking}/trackerReal.h | 0
src/ui/CMakeLists.txt | 4 +
src/ui/dialogs/CMakeLists.txt | 42 ++++
{ui => src/ui/dialogs}/about.ui | 0
src/{ => ui/dialogs}/aboutDialog.cpp | 0
{include => src/ui/dialogs}/aboutDialog.h | 0
src/{ => ui/dialogs}/autosaveSettings.cpp | 0
.../ui/dialogs}/autosaveSettings.h | 0
{ui => src/ui/dialogs}/autosaveSettings.ui | 0
{ui => src/ui/dialogs}/codeMarker.ui | 0
src/{ => ui/dialogs}/codeMarkerWidget.cpp | 0
.../ui/dialogs}/codeMarkerWidget.h | 0
{ui => src/ui/dialogs}/colorMarker.ui | 0
src/{ => ui/dialogs}/colorMarkerWidget.cpp | 0
.../ui/dialogs}/colorMarkerWidget.h | 0
{ui => src/ui/dialogs}/colorRange.ui | 0
src/{ => ui/dialogs}/colorRangeWidget.cpp | 0
.../ui/dialogs}/colorRangeWidget.h | 0
src/{ => ui/dialogs}/editMoCapDialog.cpp | 0
{include => src/ui/dialogs}/editMoCapDialog.h | 0
{ui => src/ui/dialogs}/editMoCapDialog.ui | 0
src/{ => ui/dialogs}/logwindow.cpp | 0
{include => src/ui/dialogs}/logwindow.h | 0
{ui => src/ui/dialogs}/logwindow.ui | 0
src/{ => ui/dialogs}/moCapEditingWidget.cpp | 0
.../ui/dialogs}/moCapEditingWidget.h | 0
{ui => src/ui/dialogs}/moCapEditingWidget.ui | 0
src/{ => ui/dialogs}/moCapSelectionWidget.cpp | 0
.../ui/dialogs}/moCapSelectionWidget.h | 0
.../ui/dialogs}/moCapSelectionWidget.ui | 0
{ui => src/ui/dialogs}/multiColorMarker.ui | 0
.../dialogs}/multiColorMarkerWidget.cpp | 0
.../ui/dialogs}/multiColorMarkerWidget.h | 0
src/{ => ui/dialogs}/openMoCapDialog.cpp | 0
{include => src/ui/dialogs}/openMoCapDialog.h | 0
{ui => src/ui/dialogs}/openMoCapDialog.ui | 0
src/{ => ui/dialogs}/pMessageBox.cpp | 0
{include => src/ui/dialogs}/pMessageBox.h | 0
{ui => src/ui/dialogs}/stereo.ui | 0
src/{ => ui/dialogs}/stereoWidget.cpp | 0
{include => src/ui/dialogs}/stereoWidget.h | 0
src/ui/helper/CMakeLists.txt | 18 ++
src/{ => ui/helper}/pGroupBox.cpp | 0
{include => src/ui/helper}/pGroupBox.h | 0
{ui => src/ui/helper}/pGroupBox.ui | 0
src/{ => ui/helper}/pGroupBoxFrame.cpp | 0
{include => src/ui/helper}/pGroupBoxFrame.h | 0
{ui => src/ui/helper}/pGroupBoxFrame.ui | 0
src/{ => ui/helper}/pSlider.cpp | 0
{include => src/ui/helper}/pSlider.h | 0
src/{ => ui/helper}/pdoublespinbox.cpp | 0
{include => src/ui/helper}/pdoublespinbox.h | 0
src/{ => ui/helper}/pspinbox.cpp | 0
{include => src/ui/helper}/pspinbox.h | 0
src/{ => ui/helper}/qtColorTriangle.cpp | 0
{include => src/ui/helper}/qtColorTriangle.h | 0
src/ui/main-windows/CMakeLists.txt | 32 +++
.../main-windows}/alignmentGridBox.cpp | 0
.../ui/main-windows}/alignmentGridBox.h | 0
.../ui/main-windows}/alignmentGridBox.ui | 0
src/{ => ui/main-windows}/analysePlot.cpp | 0
.../ui/main-windows}/analysePlot.h | 0
src/{ => ui/main-windows}/colorPlot.cpp | 0
{include => src/ui/main-windows}/colorPlot.h | 0
src/{ => ui/main-windows}/control.cpp | 0
{include => src/ui/main-windows}/control.h | 0
{ui => src/ui/main-windows}/control.ui | 0
.../ui/main-windows}/coordinateStructs.h | 0
.../main-windows}/coordinateSystemBox.cpp | 0
.../ui/main-windows}/coordinateSystemBox.h | 0
.../ui/main-windows}/coordinateSystemBox.ui | 0
src/{ => ui/main-windows}/correction.cpp | 0
{include => src/ui/main-windows}/correction.h | 0
{ui => src/ui/main-windows}/correction.ui | 0
src/{ => ui/main-windows}/extrinsicBox.cpp | 0
.../ui/main-windows}/extrinsicBox.h | 0
{ui => src/ui/main-windows}/extrinsicBox.ui | 0
src/{ => ui/main-windows}/filterBeforeBox.cpp | 0
.../ui/main-windows}/filterBeforeBox.h | 0
.../ui/main-windows}/filterBeforeBox.ui | 0
src/{ => ui/main-windows}/intrinsicBox.cpp | 0
.../ui/main-windows}/intrinsicBox.h | 0
{ui => src/ui/main-windows}/intrinsicBox.ui | 0
src/{ => ui/main-windows}/view.cpp | 0
{include => src/ui/main-windows}/view.h | 0
src/ui/visualization/CMakeLists.txt | 32 +++
src/{ => ui/visualization}/backgroundItem.cpp | 0
.../ui/visualization}/backgroundItem.h | 0
src/{ => ui/visualization}/codeMarkerItem.cpp | 0
.../ui/visualization}/codeMarkerItem.h | 0
.../visualization}/colorMarkerItem.cpp | 0
.../ui/visualization}/colorMarkerItem.h | 0
src/{ => ui/visualization}/coordItem.cpp | 0
{include => src/ui/visualization}/coordItem.h | 0
src/{ => ui/visualization}/gridItem.cpp | 0
{include => src/ui/visualization}/gridItem.h | 0
src/{ => ui/visualization}/imageItem.cpp | 0
{include => src/ui/visualization}/imageItem.h | 0
src/{ => ui/visualization}/logoItem.cpp | 0
{include => src/ui/visualization}/logoItem.h | 0
.../visualization}/moCapController.cpp | 0
.../ui/visualization}/moCapController.h | 0
src/{ => ui/visualization}/moCapItem.cpp | 0
{include => src/ui/visualization}/moCapItem.h | 0
src/{ => ui/visualization}/moCapPerson.cpp | 0
.../ui/visualization}/moCapPerson.h | 0
.../visualization}/multiColorMarkerItem.cpp | 0
.../ui/visualization}/multiColorMarkerItem.h | 0
src/{ => ui/visualization}/roiItem.cpp | 0
{include => src/ui/visualization}/roiItem.h | 0
src/{ => ui/visualization}/stereoItem.cpp | 0
.../ui/visualization}/stereoItem.h | 0
src/{ => ui/visualization}/trackerItem.cpp | 0
.../ui/visualization}/trackerItem.h | 0
src/util/CMakeLists.txt | 11 +
{include => src/util}/circularStack.h | 0
{include => src/util}/compilerInformation.h | 0
src/{ => util}/helper.cpp | 0
{include => src/util}/helper.h | 0
{include => src/util}/logger.h | 0
src/{ => util}/vector.cpp | 0
{include => src/util}/vector.h | 0
tests/unit_test/CMakeLists.txt | 27 +--
tests/unit_test/IO/CMakeLists.txt | 4 +
tests/unit_test/{ => IO}/tst_SkeletonTree.cpp | 0
tests/unit_test/{ => IO}/tst_io.cpp | 0
tests/unit_test/calibration/CMakeLists.txt | 3 +
.../{ => calibration}/tst_extrCalibration.cpp | 0
tests/unit_test/filter/CMakeLists.txt | 3 +
tests/unit_test/{ => filter}/tst_filter.cpp | 0
tests/unit_test/general/CMakeLists.txt | 4 +
.../{ => general}/tst_circularStack.cpp | 0
tests/unit_test/{ => general}/tst_helper.cpp | 0
tests/unit_test/recognition/CMakeLists.txt | 3 +
.../{ => recognition}/tst_recognition.cpp | 0
tests/unit_test/tracking/CMakeLists.txt | 3 +
.../unit_test/{ => tracking}/tst_tracker.cpp | 0
tests/unit_test/tst_apptest.cpp | 30 ---
tests/unit_test/ui/CMakeLists.txt | 3 +
tests/unit_test/ui/dialogs/CMakeLists.txt | 3 +
.../{ => ui/dialogs}/tst_codeMarkerWidget.cpp | 0
.../unit_test/ui/main-windows/CMakeLists.txt | 7 +
.../{ => ui/main-windows}/tst_control.cpp | 0
.../main-windows}/tst_coordinateSystemBox.cpp | 0
.../{ => ui/main-windows}/tst_correction.cpp | 0
.../main-windows}/tst_extrinsicBox.cpp | 0
.../main-windows}/tst_intrinsicBox.cpp | 0
.../unit_test/ui/visualization/CMakeLists.txt | 3 +
.../visualization}/tst_moCapController.cpp | 0
223 files changed, 306 insertions(+), 251 deletions(-)
create mode 100644 src/CMakeLists.txt
create mode 100644 src/IO/CMakeLists.txt
rename src/{ => IO}/IO.cpp (100%)
rename {include => src/IO}/IO.h (100%)
rename src/{ => IO}/animation.cpp (100%)
rename {include => src/IO}/animation.h (100%)
rename src/{ => IO}/autosave.cpp (100%)
rename {include => src/IO}/autosave.h (100%)
rename src/{ => IO}/aviFileWriter.cpp (100%)
rename {include => src/IO}/aviFileWriter.h (100%)
rename src/{ => IO}/moCapPersonMetadata.cpp (100%)
rename {include => src/IO}/moCapPersonMetadata.h (100%)
rename src/{ => IO}/skeletonTree.cpp (100%)
rename {include => src/IO}/skeletonTree.h (100%)
rename src/{ => IO}/skeletonTreeFactory.cpp (100%)
rename {include => src/IO}/skeletonTreeFactory.h (100%)
rename src/{ => IO}/stereoAviFile.cpp (100%)
rename {include => src/IO}/stereoAviFile.h (100%)
create mode 100644 src/calibration/CMakeLists.txt
rename src/{ => calibration}/autoCalib.cpp (100%)
rename {include => src/calibration}/autoCalib.h (100%)
rename src/{ => calibration}/extrCalibration.cpp (100%)
rename {include => src/calibration}/extrCalibration.h (100%)
rename {include => src/calibration}/extrinsicParameters.h (100%)
rename src/{ => calibration}/intrinsicCameraParams.cpp (100%)
rename {include => src/calibration}/intrinsicCameraParams.h (100%)
rename src/{ => calibration}/stereoContext.cpp (100%)
rename {include => src/calibration}/stereoContext.h (100%)
rename {include => src/calibration}/worldImageCorrespondence.h (100%)
create mode 100644 src/filter/CMakeLists.txt
rename src/{ => filter}/backgroundFilter.cpp (100%)
rename {include => src/filter}/backgroundFilter.h (100%)
rename src/{ => filter}/blurFilter.cpp (100%)
rename {include => src/filter}/blurFilter.h (100%)
rename src/{ => filter}/borderFilter.cpp (100%)
rename {include => src/filter}/borderFilter.h (100%)
rename src/{ => filter}/brightContrastFilter.cpp (100%)
rename {include => src/filter}/brightContrastFilter.h (100%)
rename src/{ => filter}/calibFilter.cpp (100%)
rename {include => src/filter}/calibFilter.h (100%)
rename src/{ => filter}/calibStereoFilter.cpp (100%)
rename {include => src/filter}/calibStereoFilter.h (100%)
rename src/{ => filter}/filter.cpp (100%)
rename {include => src/filter}/filter.h (100%)
rename src/{ => filter}/swapFilter.cpp (100%)
rename {include => src/filter}/swapFilter.h (100%)
rename {include => src}/frameRange.h (100%)
rename {include => src}/manualTrackpointMover.h (100%)
rename {include => src}/personStorage.h (100%)
rename {include => src}/petrack.h (100%)
rename {include => src}/plausibility.h (100%)
rename {include => src}/player.h (100%)
create mode 100644 src/recognition/CMakeLists.txt
rename src/{ => recognition}/ellipse.cpp (100%)
rename {include => src/recognition}/ellipse.h (100%)
rename src/{ => recognition}/markerCasern.cpp (100%)
rename {include => src/recognition}/markerCasern.h (100%)
rename src/{ => recognition}/markerHermes.cpp (100%)
rename {include => src/recognition}/markerHermes.h (100%)
rename src/{ => recognition}/markerJapan.cpp (100%)
rename {include => src/recognition}/markerJapan.h (100%)
rename src/{ => recognition}/person.cpp (100%)
rename {include => src/recognition}/person.h (100%)
rename src/{ => recognition}/recognition.cpp (100%)
rename {include => src/recognition}/recognition.h (100%)
create mode 100644 src/tracking/CMakeLists.txt
rename src/{ => tracking}/tracker.cpp (100%)
rename {include => src/tracking}/tracker.h (100%)
rename src/{ => tracking}/trackerReal.cpp (100%)
rename {include => src/tracking}/trackerReal.h (100%)
create mode 100644 src/ui/CMakeLists.txt
create mode 100644 src/ui/dialogs/CMakeLists.txt
rename {ui => src/ui/dialogs}/about.ui (100%)
rename src/{ => ui/dialogs}/aboutDialog.cpp (100%)
rename {include => src/ui/dialogs}/aboutDialog.h (100%)
rename src/{ => ui/dialogs}/autosaveSettings.cpp (100%)
rename {include => src/ui/dialogs}/autosaveSettings.h (100%)
rename {ui => src/ui/dialogs}/autosaveSettings.ui (100%)
rename {ui => src/ui/dialogs}/codeMarker.ui (100%)
rename src/{ => ui/dialogs}/codeMarkerWidget.cpp (100%)
rename {include => src/ui/dialogs}/codeMarkerWidget.h (100%)
rename {ui => src/ui/dialogs}/colorMarker.ui (100%)
rename src/{ => ui/dialogs}/colorMarkerWidget.cpp (100%)
rename {include => src/ui/dialogs}/colorMarkerWidget.h (100%)
rename {ui => src/ui/dialogs}/colorRange.ui (100%)
rename src/{ => ui/dialogs}/colorRangeWidget.cpp (100%)
rename {include => src/ui/dialogs}/colorRangeWidget.h (100%)
rename src/{ => ui/dialogs}/editMoCapDialog.cpp (100%)
rename {include => src/ui/dialogs}/editMoCapDialog.h (100%)
rename {ui => src/ui/dialogs}/editMoCapDialog.ui (100%)
rename src/{ => ui/dialogs}/logwindow.cpp (100%)
rename {include => src/ui/dialogs}/logwindow.h (100%)
rename {ui => src/ui/dialogs}/logwindow.ui (100%)
rename src/{ => ui/dialogs}/moCapEditingWidget.cpp (100%)
rename {include => src/ui/dialogs}/moCapEditingWidget.h (100%)
rename {ui => src/ui/dialogs}/moCapEditingWidget.ui (100%)
rename src/{ => ui/dialogs}/moCapSelectionWidget.cpp (100%)
rename {include => src/ui/dialogs}/moCapSelectionWidget.h (100%)
rename {ui => src/ui/dialogs}/moCapSelectionWidget.ui (100%)
rename {ui => src/ui/dialogs}/multiColorMarker.ui (100%)
rename src/{ => ui/dialogs}/multiColorMarkerWidget.cpp (100%)
rename {include => src/ui/dialogs}/multiColorMarkerWidget.h (100%)
rename src/{ => ui/dialogs}/openMoCapDialog.cpp (100%)
rename {include => src/ui/dialogs}/openMoCapDialog.h (100%)
rename {ui => src/ui/dialogs}/openMoCapDialog.ui (100%)
rename src/{ => ui/dialogs}/pMessageBox.cpp (100%)
rename {include => src/ui/dialogs}/pMessageBox.h (100%)
rename {ui => src/ui/dialogs}/stereo.ui (100%)
rename src/{ => ui/dialogs}/stereoWidget.cpp (100%)
rename {include => src/ui/dialogs}/stereoWidget.h (100%)
create mode 100644 src/ui/helper/CMakeLists.txt
rename src/{ => ui/helper}/pGroupBox.cpp (100%)
rename {include => src/ui/helper}/pGroupBox.h (100%)
rename {ui => src/ui/helper}/pGroupBox.ui (100%)
rename src/{ => ui/helper}/pGroupBoxFrame.cpp (100%)
rename {include => src/ui/helper}/pGroupBoxFrame.h (100%)
rename {ui => src/ui/helper}/pGroupBoxFrame.ui (100%)
rename src/{ => ui/helper}/pSlider.cpp (100%)
rename {include => src/ui/helper}/pSlider.h (100%)
rename src/{ => ui/helper}/pdoublespinbox.cpp (100%)
rename {include => src/ui/helper}/pdoublespinbox.h (100%)
rename src/{ => ui/helper}/pspinbox.cpp (100%)
rename {include => src/ui/helper}/pspinbox.h (100%)
rename src/{ => ui/helper}/qtColorTriangle.cpp (100%)
rename {include => src/ui/helper}/qtColorTriangle.h (100%)
create mode 100644 src/ui/main-windows/CMakeLists.txt
rename src/{ => ui/main-windows}/alignmentGridBox.cpp (100%)
rename {include => src/ui/main-windows}/alignmentGridBox.h (100%)
rename {ui => src/ui/main-windows}/alignmentGridBox.ui (100%)
rename src/{ => ui/main-windows}/analysePlot.cpp (100%)
rename {include => src/ui/main-windows}/analysePlot.h (100%)
rename src/{ => ui/main-windows}/colorPlot.cpp (100%)
rename {include => src/ui/main-windows}/colorPlot.h (100%)
rename src/{ => ui/main-windows}/control.cpp (100%)
rename {include => src/ui/main-windows}/control.h (100%)
rename {ui => src/ui/main-windows}/control.ui (100%)
rename {include => src/ui/main-windows}/coordinateStructs.h (100%)
rename src/{ => ui/main-windows}/coordinateSystemBox.cpp (100%)
rename {include => src/ui/main-windows}/coordinateSystemBox.h (100%)
rename {ui => src/ui/main-windows}/coordinateSystemBox.ui (100%)
rename src/{ => ui/main-windows}/correction.cpp (100%)
rename {include => src/ui/main-windows}/correction.h (100%)
rename {ui => src/ui/main-windows}/correction.ui (100%)
rename src/{ => ui/main-windows}/extrinsicBox.cpp (100%)
rename {include => src/ui/main-windows}/extrinsicBox.h (100%)
rename {ui => src/ui/main-windows}/extrinsicBox.ui (100%)
rename src/{ => ui/main-windows}/filterBeforeBox.cpp (100%)
rename {include => src/ui/main-windows}/filterBeforeBox.h (100%)
rename {ui => src/ui/main-windows}/filterBeforeBox.ui (100%)
rename src/{ => ui/main-windows}/intrinsicBox.cpp (100%)
rename {include => src/ui/main-windows}/intrinsicBox.h (100%)
rename {ui => src/ui/main-windows}/intrinsicBox.ui (100%)
rename src/{ => ui/main-windows}/view.cpp (100%)
rename {include => src/ui/main-windows}/view.h (100%)
create mode 100644 src/ui/visualization/CMakeLists.txt
rename src/{ => ui/visualization}/backgroundItem.cpp (100%)
rename {include => src/ui/visualization}/backgroundItem.h (100%)
rename src/{ => ui/visualization}/codeMarkerItem.cpp (100%)
rename {include => src/ui/visualization}/codeMarkerItem.h (100%)
rename src/{ => ui/visualization}/colorMarkerItem.cpp (100%)
rename {include => src/ui/visualization}/colorMarkerItem.h (100%)
rename src/{ => ui/visualization}/coordItem.cpp (100%)
rename {include => src/ui/visualization}/coordItem.h (100%)
rename src/{ => ui/visualization}/gridItem.cpp (100%)
rename {include => src/ui/visualization}/gridItem.h (100%)
rename src/{ => ui/visualization}/imageItem.cpp (100%)
rename {include => src/ui/visualization}/imageItem.h (100%)
rename src/{ => ui/visualization}/logoItem.cpp (100%)
rename {include => src/ui/visualization}/logoItem.h (100%)
rename src/{ => ui/visualization}/moCapController.cpp (100%)
rename {include => src/ui/visualization}/moCapController.h (100%)
rename src/{ => ui/visualization}/moCapItem.cpp (100%)
rename {include => src/ui/visualization}/moCapItem.h (100%)
rename src/{ => ui/visualization}/moCapPerson.cpp (100%)
rename {include => src/ui/visualization}/moCapPerson.h (100%)
rename src/{ => ui/visualization}/multiColorMarkerItem.cpp (100%)
rename {include => src/ui/visualization}/multiColorMarkerItem.h (100%)
rename src/{ => ui/visualization}/roiItem.cpp (100%)
rename {include => src/ui/visualization}/roiItem.h (100%)
rename src/{ => ui/visualization}/stereoItem.cpp (100%)
rename {include => src/ui/visualization}/stereoItem.h (100%)
rename src/{ => ui/visualization}/trackerItem.cpp (100%)
rename {include => src/ui/visualization}/trackerItem.h (100%)
create mode 100644 src/util/CMakeLists.txt
rename {include => src/util}/circularStack.h (100%)
rename {include => src/util}/compilerInformation.h (100%)
rename src/{ => util}/helper.cpp (100%)
rename {include => src/util}/helper.h (100%)
rename {include => src/util}/logger.h (100%)
rename src/{ => util}/vector.cpp (100%)
rename {include => src/util}/vector.h (100%)
create mode 100644 tests/unit_test/IO/CMakeLists.txt
rename tests/unit_test/{ => IO}/tst_SkeletonTree.cpp (100%)
rename tests/unit_test/{ => IO}/tst_io.cpp (100%)
create mode 100644 tests/unit_test/calibration/CMakeLists.txt
rename tests/unit_test/{ => calibration}/tst_extrCalibration.cpp (100%)
create mode 100644 tests/unit_test/filter/CMakeLists.txt
rename tests/unit_test/{ => filter}/tst_filter.cpp (100%)
create mode 100644 tests/unit_test/general/CMakeLists.txt
rename tests/unit_test/{ => general}/tst_circularStack.cpp (100%)
rename tests/unit_test/{ => general}/tst_helper.cpp (100%)
create mode 100644 tests/unit_test/recognition/CMakeLists.txt
rename tests/unit_test/{ => recognition}/tst_recognition.cpp (100%)
create mode 100644 tests/unit_test/tracking/CMakeLists.txt
rename tests/unit_test/{ => tracking}/tst_tracker.cpp (100%)
delete mode 100644 tests/unit_test/tst_apptest.cpp
create mode 100644 tests/unit_test/ui/CMakeLists.txt
create mode 100644 tests/unit_test/ui/dialogs/CMakeLists.txt
rename tests/unit_test/{ => ui/dialogs}/tst_codeMarkerWidget.cpp (100%)
create mode 100644 tests/unit_test/ui/main-windows/CMakeLists.txt
rename tests/unit_test/{ => ui/main-windows}/tst_control.cpp (100%)
rename tests/unit_test/{ => ui/main-windows}/tst_coordinateSystemBox.cpp (100%)
rename tests/unit_test/{ => ui/main-windows}/tst_correction.cpp (100%)
rename tests/unit_test/{ => ui/main-windows}/tst_extrinsicBox.cpp (100%)
rename tests/unit_test/{ => ui/main-windows}/tst_intrinsicBox.cpp (100%)
create mode 100644 tests/unit_test/ui/visualization/CMakeLists.txt
rename tests/unit_test/{ => ui/visualization}/tst_moCapController.cpp (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a9ef4c21..18ffa9659 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,7 +180,11 @@ endif()
# Qt and Misc Stuff *
#**********************************************************
set(CMAKE_AUTOUIC ON)
-list(APPEND CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/ui" "./src")
+list(APPEND CMAKE_AUTOUIC_SEARCH_PATHS
+ "${CMAKE_SOURCE_DIR}/src/ui/dialogs"
+ "${CMAKE_SOURCE_DIR}/src/ui/helper"
+ "${CMAKE_SOURCE_DIR}/src/ui/main-windows"
+ "./src")
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(AUTOGEN_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${NAME}_autogen")
@@ -257,8 +261,6 @@ else()
target_link_libraries(petrack_core PUBLIC Qwt::Qwt)
endif()
-target_sources(petrack_core PRIVATE src/analysePlot.cpp)
-
#*****************************************************************
# Linking spdlog *
#*****************************************************************
@@ -282,8 +284,6 @@ if(AVI)
)
target_include_directories(petrack_core PRIVATE 3rdparty/avifile)
target_link_libraries(petrack_core PUBLIC avifil32 msvfw32)
-else()
- target_sources(petrack_core PRIVATE "src/aviFileWriter.cpp")
endif(AVI)
# WIN32 steht für Windows allgemein, nicht nur 32Bit
@@ -317,203 +317,13 @@ endif(BUILD_UNIT_TESTS)
#**************************************************************
# SOURCES *
#**************************************************************
-# An sich wäre nur target_include_diretories notwendig, aber AUTOUIC
-# sucht nur in target source nach, ob ein ui header included wurde.
-# Aus bequemlichkeit dann einfach alle aus der alten .pro rüberkopiert
-target_include_directories(petrack_core PUBLIC "./include")
-target_sources(petrack_core PRIVATE
- include/aboutDialog.h
- include/petrack.h
- include/helper.h
- include/control.h
- include/compilerInformation.h
- include/stereoWidget.h
- include/colorRangeWidget.h
- include/colorMarkerWidget.h
- include/codeMarkerWidget.h
- include/multiColorMarkerWidget.h
- include/imageItem.h
- include/logger.h
- include/logoItem.h
- include/gridItem.h
- include/coordItem.h
- include/trackerItem.h
- include/view.h
- include/animation.h
- include/player.h
- include/vector.h
- include/ellipse.h
- include/markerCasern.h
- include/markerJapan.h
- include/markerHermes.h
- include/tracker.h
- include/trackerReal.h
- include/recognition.h
- include/autoCalib.h
- include/filter.h
- include/brightContrastFilter.h
- include/blurFilter.h
- include/borderFilter.h
- include/backgroundFilter.h
- include/calibFilter.h
- include/calibStereoFilter.h
- include/colorPlot.h
- include/stereoItem.h
- include/stereoContext.h
- include/colorMarkerItem.h
- include/codeMarkerItem.h
- include/multiColorMarkerItem.h
- include/backgroundItem.h
- include/person.h
- include/qtColorTriangle.h
- include/swapFilter.h
- include/extrCalibration.h
- include/roiItem.h
- include/analysePlot.h
- include/IO.h
- include/skeletonTree.h
- include/skeletonTreeFactory.h
- include/moCapPerson.h
- include/moCapItem.h
- include/moCapController.h
- include/openMoCapDialog.h
- include/moCapPersonMetadata.h
- include/pMessageBox.h
- include/moCapSelectionWidget.h
- include/personStorage.h
- include/autosave.h
- include/manualTrackpointMover.h
- include/frameRange.h
- include/pdoublespinbox.h
- include/pspinbox.h
- include/pSlider.h
- include/filterBeforeBox.h
- include/intrinsicBox.h
- include/intrinsicCameraParams.h
- include/logwindow.h
- include/extrinsicBox.h
- include/extrinsicParameters.h
- include/coordinateSystemBox.h
- include/worldImageCorrespondence.h
- include/autosaveSettings.h
- include/editMoCapDialog.h
- include/moCapEditingWidget.h
- include/plausibility.h
- include/coordinateStructs.h
- include/correction.h
- include/pGroupBox.h
- include/pGroupBoxFrame.h
- include/alignmentGridBox.h
- include/circularStack.h
-)
-
-target_sources(petrack_core PRIVATE
- src/aboutDialog.cpp
- src/helper.cpp
- src/control.cpp
- src/petrack.cpp
- src/stereoWidget.cpp
- src/colorRangeWidget.cpp
- src/colorMarkerWidget.cpp
- src/codeMarkerWidget.cpp
- src/multiColorMarkerWidget.cpp
- src/imageItem.cpp
- src/logoItem.cpp
- src/gridItem.cpp
- src/coordItem.cpp
- src/trackerItem.cpp
- src/view.cpp
- src/animation.cpp
- src/player.cpp
- src/vector.cpp
- src/ellipse.cpp
- src/markerCasern.cpp
- src/markerHermes.cpp
- src/markerJapan.cpp
- src/tracker.cpp
- src/trackerReal.cpp
- src/recognition.cpp
- src/autoCalib.cpp
- src/filter.cpp
- src/brightContrastFilter.cpp
- src/blurFilter.cpp
- src/borderFilter.cpp
- src/backgroundFilter.cpp
- src/calibFilter.cpp
- src/calibStereoFilter.cpp
- src/stereoContext.cpp
- src/colorPlot.cpp
- src/stereoItem.cpp
- src/colorMarkerItem.cpp
- src/codeMarkerItem.cpp
- src/multiColorMarkerItem.cpp
- src/backgroundItem.cpp
- src/person.cpp
- src/qtColorTriangle.cpp
- src/swapFilter.cpp
- src/extrCalibration.cpp
- src/roiItem.cpp
- src/IO.cpp
- src/skeletonTree.cpp
- src/skeletonTreeFactory.cpp
- src/moCapPerson.cpp
- src/moCapItem.cpp
- src/moCapController.cpp
- src/openMoCapDialog.cpp
- src/moCapPersonMetadata.cpp
- src/pMessageBox.cpp
- src/moCapSelectionWidget.cpp
- src/personStorage.cpp
- src/autosave.cpp
- src/manualTrackpointMover.cpp
- src/pdoublespinbox.cpp
- src/pspinbox.cpp
- src/intrinsicBox.cpp
- src/filterBeforeBox.cpp
- src/intrinsicCameraParams.cpp
- src/logwindow.cpp
- src/extrinsicBox.cpp
- src/autosaveSettings.cpp
- src/coordinateSystemBox.cpp
- src/editMoCapDialog.cpp
- src/moCapEditingWidget.cpp
- src/pGroupBoxFrame.cpp
- ui/pGroupBoxFrame.ui
- ui/coordinateSystemBox.ui
- ui/moCapEditingWidget.ui
- ui/editMoCapDialog.ui
- src/plausibility.cpp
- src/correction.cpp
- src/pGroupBox.cpp
- ui/pGroupBox.ui
- src/alignmentGridBox.cpp
- ui/alignmentGridBox.ui
- src/pSlider.cpp
- ui/about.ui
- ui/codeMarker.ui
- ui/colorMarker.ui
- ui/colorRange.ui
- ui/multiColorMarker.ui
- ui/stereo.ui
- ui/control.ui
- ui/openMoCapDialog.ui
- ui/moCapSelectionWidget.ui
- ui/correction.ui
- ui/filterBeforeBox.ui
- ui/intrinsicBox.ui
- ui/extrinsicBox.ui
- ui/logwindow.ui
- ui/autosaveSettings.ui
-)
+add_subdirectory(src)
target_sources(petrack PRIVATE
petrack.rc
icons/icons.qrc
)
-#*****************************************************************************
-# CODE AUS DER ALTEN .PRO DATEI, DER NOCH NICHT IN DIE CMAKE EINGEBAUT WURDE *
-#*****************************************************************************
if(STEREO)
message("Stereo enabled! (PGR)")
target_compile_definitions(petrack_core PRIVATE STEREO)
@@ -525,8 +335,6 @@ if(STEREO)
target_include_directories(petrack_core PRIVATE 3rdparty/windows/triclops-3.4/include)
target_include_directories(petrack_core PRIVATE 3rdparty/avifile)
target_sources(petrack_core PRIVATE 3rdparty/avifile/pgrAviFile.cpp 3rdparty/avifile/pgrAviFile.h)
-else()
- target_sources(petrack_core PRIVATE src/stereoAviFile.cpp)
endif()
diff --git a/scripts/check-format-cpp.sh b/scripts/check-format-cpp.sh
index 35f92405d..9ee4084b0 100755
--- a/scripts/check-format-cpp.sh
+++ b/scripts/check-format-cpp.sh
@@ -4,7 +4,6 @@ set -e
origin=$(dirname "$(readlink -f "$0")")
files=$(find "$(readlink -f "${origin}"/../src)" -type f -regex "^.*\.\(hpp\|cpp\|h\|c\)$")
-files+=$'\n'$(find "$(readlink -f "${origin}"/../include)" -type f -regex "^.*\.\(hpp\|cpp\|h\|c\)$")
files+=$'\n'$(find "$(readlink -f "${origin}"/../tests)" -type f -regex "^.*\.\(hpp\|cpp\|h\|c\)$")
echo "${files}" | parallel clang-format-14 --dry-run -Werror
diff --git a/scripts/check-license-header.py b/scripts/check-license-header.py
index db3e7c2ae..f02b15d5c 100644
--- a/scripts/check-license-header.py
+++ b/scripts/check-license-header.py
@@ -14,13 +14,13 @@ from datetime import datetime
# directories and file endings to search fore license header
# base directory is given as command line attribute
-directories = ['include', 'src', 'tests']
+directories = ['src', 'tests']
file_endings = ['h', 'cpp', 'py']
# custom files that should be included
additional_files = ['.gitlab-ci.yml']
-blacklist = ['src/qtColorTriangle.cpp', 'include/qtColorTriangle.h']
+blacklist = ['src/ui/helper/qtColorTriangle.cpp', 'src/ui/helper/qtColorTriangle.h']
blacklist_dir = ('.pytest_cache', '__pycache__', 'regression_test/data')
# adjust directory path
diff --git a/scripts/format-cpp.sh b/scripts/format-cpp.sh
index 93c298946..f90b92ee9 100755
--- a/scripts/format-cpp.sh
+++ b/scripts/format-cpp.sh
@@ -4,7 +4,6 @@ set -e
origin=$(dirname "$(readlink -f "$0")")
files=$(find "$(readlink -f ${origin}/../src)" -type f -regex "^.*\.\(hpp\|cpp\|h\|c\)$")
-files+=$'\n'$(find "$(readlink -f ${origin}/../include)" -type f -regex "^.*\.\(hpp\|cpp\|h\|c\)$")
files+=$'\n'$(find "$(readlink -f ${origin}/../tests)" -type f -regex "^.*\.\(hpp\|cpp\|h\|c\)$")
echo "${files}" | parallel clang-format-14 -i
diff --git a/scripts/update-license-header.py b/scripts/update-license-header.py
index 3d70e1b0d..4eb594537 100644
--- a/scripts/update-license-header.py
+++ b/scripts/update-license-header.py
@@ -11,13 +11,13 @@ import re
from datetime import datetime
import fileinput
-directories = ['include', 'src', 'tests']
+directories = ['src', 'tests']
file_endings = ['h', 'cpp', 'py']
# custom files that should be included
additional_files = ['.gitlab-ci.yml']
-blacklist = ['src/qtColorTriangle.cpp', 'include/qtColorTriangle.h']
+blacklist = ['src/ui/helper/qtColorTriangle.cpp', 'src/ui/helper/qtColorTriangle.h']
blacklist_dir = ('.pytest_cache', '__pycache__', 'regression_test/data')
# adjust directory path
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 000000000..7e8a61b3b
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,23 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ frameRange.h
+ manualTrackpointMover.h
+ manualTrackpointMover.cpp
+ personStorage.h
+ personStorage.cpp
+ petrack.cpp
+ petrack.h
+ plausibility.h
+ plausibility.cpp
+ player.cpp
+ player.h
+)
+
+add_subdirectory(calibration)
+add_subdirectory(filter)
+add_subdirectory(util)
+add_subdirectory(IO)
+add_subdirectory(recognition)
+add_subdirectory(ui)
+add_subdirectory(tracking)
\ No newline at end of file
diff --git a/src/IO/CMakeLists.txt b/src/IO/CMakeLists.txt
new file mode 100644
index 000000000..b7f590bbf
--- /dev/null
+++ b/src/IO/CMakeLists.txt
@@ -0,0 +1,30 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ animation.cpp
+ animation.h
+ autosave.cpp
+ autosave.h
+ IO.cpp
+ IO.h
+ moCapPersonMetadata.cpp
+ moCapPersonMetadata.h
+ skeletonTree.cpp
+ skeletonTree.h
+ skeletonTreeFactory.cpp
+ skeletonTreeFactory.h
+)
+
+if(NOT AVI)
+ target_sources(petrack_core PRIVATE
+ aviFileWriter.cpp
+ aviFileWriter.h
+ )
+endif()
+
+if(NOT STEREO)
+ target_sources(petrack_core PRIVATE
+ stereoAviFile.cpp
+ stereoAviFile.h
+ )
+endif()
\ No newline at end of file
diff --git a/src/IO.cpp b/src/IO/IO.cpp
similarity index 100%
rename from src/IO.cpp
rename to src/IO/IO.cpp
diff --git a/include/IO.h b/src/IO/IO.h
similarity index 100%
rename from include/IO.h
rename to src/IO/IO.h
diff --git a/src/animation.cpp b/src/IO/animation.cpp
similarity index 100%
rename from src/animation.cpp
rename to src/IO/animation.cpp
diff --git a/include/animation.h b/src/IO/animation.h
similarity index 100%
rename from include/animation.h
rename to src/IO/animation.h
diff --git a/src/autosave.cpp b/src/IO/autosave.cpp
similarity index 100%
rename from src/autosave.cpp
rename to src/IO/autosave.cpp
diff --git a/include/autosave.h b/src/IO/autosave.h
similarity index 100%
rename from include/autosave.h
rename to src/IO/autosave.h
diff --git a/src/aviFileWriter.cpp b/src/IO/aviFileWriter.cpp
similarity index 100%
rename from src/aviFileWriter.cpp
rename to src/IO/aviFileWriter.cpp
diff --git a/include/aviFileWriter.h b/src/IO/aviFileWriter.h
similarity index 100%
rename from include/aviFileWriter.h
rename to src/IO/aviFileWriter.h
diff --git a/src/moCapPersonMetadata.cpp b/src/IO/moCapPersonMetadata.cpp
similarity index 100%
rename from src/moCapPersonMetadata.cpp
rename to src/IO/moCapPersonMetadata.cpp
diff --git a/include/moCapPersonMetadata.h b/src/IO/moCapPersonMetadata.h
similarity index 100%
rename from include/moCapPersonMetadata.h
rename to src/IO/moCapPersonMetadata.h
diff --git a/src/skeletonTree.cpp b/src/IO/skeletonTree.cpp
similarity index 100%
rename from src/skeletonTree.cpp
rename to src/IO/skeletonTree.cpp
diff --git a/include/skeletonTree.h b/src/IO/skeletonTree.h
similarity index 100%
rename from include/skeletonTree.h
rename to src/IO/skeletonTree.h
diff --git a/src/skeletonTreeFactory.cpp b/src/IO/skeletonTreeFactory.cpp
similarity index 100%
rename from src/skeletonTreeFactory.cpp
rename to src/IO/skeletonTreeFactory.cpp
diff --git a/include/skeletonTreeFactory.h b/src/IO/skeletonTreeFactory.h
similarity index 100%
rename from include/skeletonTreeFactory.h
rename to src/IO/skeletonTreeFactory.h
diff --git a/src/stereoAviFile.cpp b/src/IO/stereoAviFile.cpp
similarity index 100%
rename from src/stereoAviFile.cpp
rename to src/IO/stereoAviFile.cpp
diff --git a/include/stereoAviFile.h b/src/IO/stereoAviFile.h
similarity index 100%
rename from include/stereoAviFile.h
rename to src/IO/stereoAviFile.h
diff --git a/src/calibration/CMakeLists.txt b/src/calibration/CMakeLists.txt
new file mode 100644
index 000000000..82a5a4181
--- /dev/null
+++ b/src/calibration/CMakeLists.txt
@@ -0,0 +1,14 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ autoCalib.h
+ autoCalib.cpp
+ extrCalibration.h
+ extrCalibration.cpp
+ extrinsicParameters.h
+ intrinsicCameraParams.h
+ intrinsicCameraParams.cpp
+ stereoContext.h
+ stereoContext.cpp
+ worldImageCorrespondence.h
+)
\ No newline at end of file
diff --git a/src/autoCalib.cpp b/src/calibration/autoCalib.cpp
similarity index 100%
rename from src/autoCalib.cpp
rename to src/calibration/autoCalib.cpp
diff --git a/include/autoCalib.h b/src/calibration/autoCalib.h
similarity index 100%
rename from include/autoCalib.h
rename to src/calibration/autoCalib.h
diff --git a/src/extrCalibration.cpp b/src/calibration/extrCalibration.cpp
similarity index 100%
rename from src/extrCalibration.cpp
rename to src/calibration/extrCalibration.cpp
diff --git a/include/extrCalibration.h b/src/calibration/extrCalibration.h
similarity index 100%
rename from include/extrCalibration.h
rename to src/calibration/extrCalibration.h
diff --git a/include/extrinsicParameters.h b/src/calibration/extrinsicParameters.h
similarity index 100%
rename from include/extrinsicParameters.h
rename to src/calibration/extrinsicParameters.h
diff --git a/src/intrinsicCameraParams.cpp b/src/calibration/intrinsicCameraParams.cpp
similarity index 100%
rename from src/intrinsicCameraParams.cpp
rename to src/calibration/intrinsicCameraParams.cpp
diff --git a/include/intrinsicCameraParams.h b/src/calibration/intrinsicCameraParams.h
similarity index 100%
rename from include/intrinsicCameraParams.h
rename to src/calibration/intrinsicCameraParams.h
diff --git a/src/stereoContext.cpp b/src/calibration/stereoContext.cpp
similarity index 100%
rename from src/stereoContext.cpp
rename to src/calibration/stereoContext.cpp
diff --git a/include/stereoContext.h b/src/calibration/stereoContext.h
similarity index 100%
rename from include/stereoContext.h
rename to src/calibration/stereoContext.h
diff --git a/include/worldImageCorrespondence.h b/src/calibration/worldImageCorrespondence.h
similarity index 100%
rename from include/worldImageCorrespondence.h
rename to src/calibration/worldImageCorrespondence.h
diff --git a/src/filter/CMakeLists.txt b/src/filter/CMakeLists.txt
new file mode 100644
index 000000000..3edc4bd82
--- /dev/null
+++ b/src/filter/CMakeLists.txt
@@ -0,0 +1,20 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ backgroundFilter.h
+ backgroundFilter.cpp
+ blurFilter.h
+ blurFilter.cpp
+ borderFilter.h
+ borderFilter.cpp
+ brightContrastFilter.h
+ brightContrastFilter.cpp
+ calibFilter.h
+ calibFilter.cpp
+ calibStereoFilter.h
+ calibStereoFilter.cpp
+ filter.h
+ filter.cpp
+ swapFilter.h
+ swapFilter.cpp
+)
\ No newline at end of file
diff --git a/src/backgroundFilter.cpp b/src/filter/backgroundFilter.cpp
similarity index 100%
rename from src/backgroundFilter.cpp
rename to src/filter/backgroundFilter.cpp
diff --git a/include/backgroundFilter.h b/src/filter/backgroundFilter.h
similarity index 100%
rename from include/backgroundFilter.h
rename to src/filter/backgroundFilter.h
diff --git a/src/blurFilter.cpp b/src/filter/blurFilter.cpp
similarity index 100%
rename from src/blurFilter.cpp
rename to src/filter/blurFilter.cpp
diff --git a/include/blurFilter.h b/src/filter/blurFilter.h
similarity index 100%
rename from include/blurFilter.h
rename to src/filter/blurFilter.h
diff --git a/src/borderFilter.cpp b/src/filter/borderFilter.cpp
similarity index 100%
rename from src/borderFilter.cpp
rename to src/filter/borderFilter.cpp
diff --git a/include/borderFilter.h b/src/filter/borderFilter.h
similarity index 100%
rename from include/borderFilter.h
rename to src/filter/borderFilter.h
diff --git a/src/brightContrastFilter.cpp b/src/filter/brightContrastFilter.cpp
similarity index 100%
rename from src/brightContrastFilter.cpp
rename to src/filter/brightContrastFilter.cpp
diff --git a/include/brightContrastFilter.h b/src/filter/brightContrastFilter.h
similarity index 100%
rename from include/brightContrastFilter.h
rename to src/filter/brightContrastFilter.h
diff --git a/src/calibFilter.cpp b/src/filter/calibFilter.cpp
similarity index 100%
rename from src/calibFilter.cpp
rename to src/filter/calibFilter.cpp
diff --git a/include/calibFilter.h b/src/filter/calibFilter.h
similarity index 100%
rename from include/calibFilter.h
rename to src/filter/calibFilter.h
diff --git a/src/calibStereoFilter.cpp b/src/filter/calibStereoFilter.cpp
similarity index 100%
rename from src/calibStereoFilter.cpp
rename to src/filter/calibStereoFilter.cpp
diff --git a/include/calibStereoFilter.h b/src/filter/calibStereoFilter.h
similarity index 100%
rename from include/calibStereoFilter.h
rename to src/filter/calibStereoFilter.h
diff --git a/src/filter.cpp b/src/filter/filter.cpp
similarity index 100%
rename from src/filter.cpp
rename to src/filter/filter.cpp
diff --git a/include/filter.h b/src/filter/filter.h
similarity index 100%
rename from include/filter.h
rename to src/filter/filter.h
diff --git a/src/swapFilter.cpp b/src/filter/swapFilter.cpp
similarity index 100%
rename from src/swapFilter.cpp
rename to src/filter/swapFilter.cpp
diff --git a/include/swapFilter.h b/src/filter/swapFilter.h
similarity index 100%
rename from include/swapFilter.h
rename to src/filter/swapFilter.h
diff --git a/include/frameRange.h b/src/frameRange.h
similarity index 100%
rename from include/frameRange.h
rename to src/frameRange.h
diff --git a/include/manualTrackpointMover.h b/src/manualTrackpointMover.h
similarity index 100%
rename from include/manualTrackpointMover.h
rename to src/manualTrackpointMover.h
diff --git a/include/personStorage.h b/src/personStorage.h
similarity index 100%
rename from include/personStorage.h
rename to src/personStorage.h
diff --git a/include/petrack.h b/src/petrack.h
similarity index 100%
rename from include/petrack.h
rename to src/petrack.h
diff --git a/include/plausibility.h b/src/plausibility.h
similarity index 100%
rename from include/plausibility.h
rename to src/plausibility.h
diff --git a/include/player.h b/src/player.h
similarity index 100%
rename from include/player.h
rename to src/player.h
diff --git a/src/recognition/CMakeLists.txt b/src/recognition/CMakeLists.txt
new file mode 100644
index 000000000..22c31d926
--- /dev/null
+++ b/src/recognition/CMakeLists.txt
@@ -0,0 +1,16 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ ellipse.cpp
+ ellipse.h
+ markerCasern.cpp
+ markerCasern.h
+ markerHermes.cpp
+ markerHermes.h
+ markerJapan.cpp
+ markerJapan.h
+ person.cpp
+ person.h
+ recognition.cpp
+ recognition.h
+)
\ No newline at end of file
diff --git a/src/ellipse.cpp b/src/recognition/ellipse.cpp
similarity index 100%
rename from src/ellipse.cpp
rename to src/recognition/ellipse.cpp
diff --git a/include/ellipse.h b/src/recognition/ellipse.h
similarity index 100%
rename from include/ellipse.h
rename to src/recognition/ellipse.h
diff --git a/src/markerCasern.cpp b/src/recognition/markerCasern.cpp
similarity index 100%
rename from src/markerCasern.cpp
rename to src/recognition/markerCasern.cpp
diff --git a/include/markerCasern.h b/src/recognition/markerCasern.h
similarity index 100%
rename from include/markerCasern.h
rename to src/recognition/markerCasern.h
diff --git a/src/markerHermes.cpp b/src/recognition/markerHermes.cpp
similarity index 100%
rename from src/markerHermes.cpp
rename to src/recognition/markerHermes.cpp
diff --git a/include/markerHermes.h b/src/recognition/markerHermes.h
similarity index 100%
rename from include/markerHermes.h
rename to src/recognition/markerHermes.h
diff --git a/src/markerJapan.cpp b/src/recognition/markerJapan.cpp
similarity index 100%
rename from src/markerJapan.cpp
rename to src/recognition/markerJapan.cpp
diff --git a/include/markerJapan.h b/src/recognition/markerJapan.h
similarity index 100%
rename from include/markerJapan.h
rename to src/recognition/markerJapan.h
diff --git a/src/person.cpp b/src/recognition/person.cpp
similarity index 100%
rename from src/person.cpp
rename to src/recognition/person.cpp
diff --git a/include/person.h b/src/recognition/person.h
similarity index 100%
rename from include/person.h
rename to src/recognition/person.h
diff --git a/src/recognition.cpp b/src/recognition/recognition.cpp
similarity index 100%
rename from src/recognition.cpp
rename to src/recognition/recognition.cpp
diff --git a/include/recognition.h b/src/recognition/recognition.h
similarity index 100%
rename from include/recognition.h
rename to src/recognition/recognition.h
diff --git a/src/tracking/CMakeLists.txt b/src/tracking/CMakeLists.txt
new file mode 100644
index 000000000..25c1d85f7
--- /dev/null
+++ b/src/tracking/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ tracker.cpp
+ tracker.h
+ trackerReal.cpp
+ trackerReal.h
+)
\ No newline at end of file
diff --git a/src/tracker.cpp b/src/tracking/tracker.cpp
similarity index 100%
rename from src/tracker.cpp
rename to src/tracking/tracker.cpp
diff --git a/include/tracker.h b/src/tracking/tracker.h
similarity index 100%
rename from include/tracker.h
rename to src/tracking/tracker.h
diff --git a/src/trackerReal.cpp b/src/tracking/trackerReal.cpp
similarity index 100%
rename from src/trackerReal.cpp
rename to src/tracking/trackerReal.cpp
diff --git a/include/trackerReal.h b/src/tracking/trackerReal.h
similarity index 100%
rename from include/trackerReal.h
rename to src/tracking/trackerReal.h
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
new file mode 100644
index 000000000..4a231e8bd
--- /dev/null
+++ b/src/ui/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(dialogs)
+add_subdirectory(helper)
+add_subdirectory(main-windows)
+add_subdirectory(visualization)
\ No newline at end of file
diff --git a/src/ui/dialogs/CMakeLists.txt b/src/ui/dialogs/CMakeLists.txt
new file mode 100644
index 000000000..604621ea7
--- /dev/null
+++ b/src/ui/dialogs/CMakeLists.txt
@@ -0,0 +1,42 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ about.ui
+ aboutDialog.cpp
+ aboutDialog.h
+ autosaveSettings.cpp
+ autosaveSettings.h
+ autosaveSettings.ui
+ codeMarker.ui
+ codeMarkerWidget.cpp
+ codeMarkerWidget.h
+ colorMarker.ui
+ colorMarkerWidget.cpp
+ colorMarkerWidget.h
+ colorRange.ui
+ colorRangeWidget.cpp
+ colorRangeWidget.h
+ editMoCapDialog.cpp
+ editMoCapDialog.h
+ editMoCapDialog.ui
+ logwindow.cpp
+ logwindow.h
+ logwindow.ui
+ moCapEditingWidget.cpp
+ moCapEditingWidget.h
+ moCapEditingWidget.ui
+ moCapSelectionWidget.cpp
+ moCapSelectionWidget.h
+ moCapSelectionWidget.ui
+ multiColorMarker.ui
+ multiColorMarkerWidget.cpp
+ multiColorMarkerWidget.h
+ openMoCapDialog.cpp
+ openMoCapDialog.h
+ openMoCapDialog.ui
+ pMessageBox.cpp
+ pMessageBox.h
+ stereo.ui
+ stereoWidget.cpp
+ stereoWidget.h
+)
\ No newline at end of file
diff --git a/ui/about.ui b/src/ui/dialogs/about.ui
similarity index 100%
rename from ui/about.ui
rename to src/ui/dialogs/about.ui
diff --git a/src/aboutDialog.cpp b/src/ui/dialogs/aboutDialog.cpp
similarity index 100%
rename from src/aboutDialog.cpp
rename to src/ui/dialogs/aboutDialog.cpp
diff --git a/include/aboutDialog.h b/src/ui/dialogs/aboutDialog.h
similarity index 100%
rename from include/aboutDialog.h
rename to src/ui/dialogs/aboutDialog.h
diff --git a/src/autosaveSettings.cpp b/src/ui/dialogs/autosaveSettings.cpp
similarity index 100%
rename from src/autosaveSettings.cpp
rename to src/ui/dialogs/autosaveSettings.cpp
diff --git a/include/autosaveSettings.h b/src/ui/dialogs/autosaveSettings.h
similarity index 100%
rename from include/autosaveSettings.h
rename to src/ui/dialogs/autosaveSettings.h
diff --git a/ui/autosaveSettings.ui b/src/ui/dialogs/autosaveSettings.ui
similarity index 100%
rename from ui/autosaveSettings.ui
rename to src/ui/dialogs/autosaveSettings.ui
diff --git a/ui/codeMarker.ui b/src/ui/dialogs/codeMarker.ui
similarity index 100%
rename from ui/codeMarker.ui
rename to src/ui/dialogs/codeMarker.ui
diff --git a/src/codeMarkerWidget.cpp b/src/ui/dialogs/codeMarkerWidget.cpp
similarity index 100%
rename from src/codeMarkerWidget.cpp
rename to src/ui/dialogs/codeMarkerWidget.cpp
diff --git a/include/codeMarkerWidget.h b/src/ui/dialogs/codeMarkerWidget.h
similarity index 100%
rename from include/codeMarkerWidget.h
rename to src/ui/dialogs/codeMarkerWidget.h
diff --git a/ui/colorMarker.ui b/src/ui/dialogs/colorMarker.ui
similarity index 100%
rename from ui/colorMarker.ui
rename to src/ui/dialogs/colorMarker.ui
diff --git a/src/colorMarkerWidget.cpp b/src/ui/dialogs/colorMarkerWidget.cpp
similarity index 100%
rename from src/colorMarkerWidget.cpp
rename to src/ui/dialogs/colorMarkerWidget.cpp
diff --git a/include/colorMarkerWidget.h b/src/ui/dialogs/colorMarkerWidget.h
similarity index 100%
rename from include/colorMarkerWidget.h
rename to src/ui/dialogs/colorMarkerWidget.h
diff --git a/ui/colorRange.ui b/src/ui/dialogs/colorRange.ui
similarity index 100%
rename from ui/colorRange.ui
rename to src/ui/dialogs/colorRange.ui
diff --git a/src/colorRangeWidget.cpp b/src/ui/dialogs/colorRangeWidget.cpp
similarity index 100%
rename from src/colorRangeWidget.cpp
rename to src/ui/dialogs/colorRangeWidget.cpp
diff --git a/include/colorRangeWidget.h b/src/ui/dialogs/colorRangeWidget.h
similarity index 100%
rename from include/colorRangeWidget.h
rename to src/ui/dialogs/colorRangeWidget.h
diff --git a/src/editMoCapDialog.cpp b/src/ui/dialogs/editMoCapDialog.cpp
similarity index 100%
rename from src/editMoCapDialog.cpp
rename to src/ui/dialogs/editMoCapDialog.cpp
diff --git a/include/editMoCapDialog.h b/src/ui/dialogs/editMoCapDialog.h
similarity index 100%
rename from include/editMoCapDialog.h
rename to src/ui/dialogs/editMoCapDialog.h
diff --git a/ui/editMoCapDialog.ui b/src/ui/dialogs/editMoCapDialog.ui
similarity index 100%
rename from ui/editMoCapDialog.ui
rename to src/ui/dialogs/editMoCapDialog.ui
diff --git a/src/logwindow.cpp b/src/ui/dialogs/logwindow.cpp
similarity index 100%
rename from src/logwindow.cpp
rename to src/ui/dialogs/logwindow.cpp
diff --git a/include/logwindow.h b/src/ui/dialogs/logwindow.h
similarity index 100%
rename from include/logwindow.h
rename to src/ui/dialogs/logwindow.h
diff --git a/ui/logwindow.ui b/src/ui/dialogs/logwindow.ui
similarity index 100%
rename from ui/logwindow.ui
rename to src/ui/dialogs/logwindow.ui
diff --git a/src/moCapEditingWidget.cpp b/src/ui/dialogs/moCapEditingWidget.cpp
similarity index 100%
rename from src/moCapEditingWidget.cpp
rename to src/ui/dialogs/moCapEditingWidget.cpp
diff --git a/include/moCapEditingWidget.h b/src/ui/dialogs/moCapEditingWidget.h
similarity index 100%
rename from include/moCapEditingWidget.h
rename to src/ui/dialogs/moCapEditingWidget.h
diff --git a/ui/moCapEditingWidget.ui b/src/ui/dialogs/moCapEditingWidget.ui
similarity index 100%
rename from ui/moCapEditingWidget.ui
rename to src/ui/dialogs/moCapEditingWidget.ui
diff --git a/src/moCapSelectionWidget.cpp b/src/ui/dialogs/moCapSelectionWidget.cpp
similarity index 100%
rename from src/moCapSelectionWidget.cpp
rename to src/ui/dialogs/moCapSelectionWidget.cpp
diff --git a/include/moCapSelectionWidget.h b/src/ui/dialogs/moCapSelectionWidget.h
similarity index 100%
rename from include/moCapSelectionWidget.h
rename to src/ui/dialogs/moCapSelectionWidget.h
diff --git a/ui/moCapSelectionWidget.ui b/src/ui/dialogs/moCapSelectionWidget.ui
similarity index 100%
rename from ui/moCapSelectionWidget.ui
rename to src/ui/dialogs/moCapSelectionWidget.ui
diff --git a/ui/multiColorMarker.ui b/src/ui/dialogs/multiColorMarker.ui
similarity index 100%
rename from ui/multiColorMarker.ui
rename to src/ui/dialogs/multiColorMarker.ui
diff --git a/src/multiColorMarkerWidget.cpp b/src/ui/dialogs/multiColorMarkerWidget.cpp
similarity index 100%
rename from src/multiColorMarkerWidget.cpp
rename to src/ui/dialogs/multiColorMarkerWidget.cpp
diff --git a/include/multiColorMarkerWidget.h b/src/ui/dialogs/multiColorMarkerWidget.h
similarity index 100%
rename from include/multiColorMarkerWidget.h
rename to src/ui/dialogs/multiColorMarkerWidget.h
diff --git a/src/openMoCapDialog.cpp b/src/ui/dialogs/openMoCapDialog.cpp
similarity index 100%
rename from src/openMoCapDialog.cpp
rename to src/ui/dialogs/openMoCapDialog.cpp
diff --git a/include/openMoCapDialog.h b/src/ui/dialogs/openMoCapDialog.h
similarity index 100%
rename from include/openMoCapDialog.h
rename to src/ui/dialogs/openMoCapDialog.h
diff --git a/ui/openMoCapDialog.ui b/src/ui/dialogs/openMoCapDialog.ui
similarity index 100%
rename from ui/openMoCapDialog.ui
rename to src/ui/dialogs/openMoCapDialog.ui
diff --git a/src/pMessageBox.cpp b/src/ui/dialogs/pMessageBox.cpp
similarity index 100%
rename from src/pMessageBox.cpp
rename to src/ui/dialogs/pMessageBox.cpp
diff --git a/include/pMessageBox.h b/src/ui/dialogs/pMessageBox.h
similarity index 100%
rename from include/pMessageBox.h
rename to src/ui/dialogs/pMessageBox.h
diff --git a/ui/stereo.ui b/src/ui/dialogs/stereo.ui
similarity index 100%
rename from ui/stereo.ui
rename to src/ui/dialogs/stereo.ui
diff --git a/src/stereoWidget.cpp b/src/ui/dialogs/stereoWidget.cpp
similarity index 100%
rename from src/stereoWidget.cpp
rename to src/ui/dialogs/stereoWidget.cpp
diff --git a/include/stereoWidget.h b/src/ui/dialogs/stereoWidget.h
similarity index 100%
rename from include/stereoWidget.h
rename to src/ui/dialogs/stereoWidget.h
diff --git a/src/ui/helper/CMakeLists.txt b/src/ui/helper/CMakeLists.txt
new file mode 100644
index 000000000..468a79735
--- /dev/null
+++ b/src/ui/helper/CMakeLists.txt
@@ -0,0 +1,18 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ pdoublespinbox.cpp
+ pdoublespinbox.h
+ pGroupBox.cpp
+ pGroupBox.h
+ pGroupBox.ui
+ pGroupBoxFrame.cpp
+ pGroupBoxFrame.h
+ pGroupBoxFrame.ui
+ pSlider.cpp
+ pSlider.h
+ pspinbox.cpp
+ pspinbox.h
+ qtColorTriangle.cpp
+ qtColorTriangle.h
+)
\ No newline at end of file
diff --git a/src/pGroupBox.cpp b/src/ui/helper/pGroupBox.cpp
similarity index 100%
rename from src/pGroupBox.cpp
rename to src/ui/helper/pGroupBox.cpp
diff --git a/include/pGroupBox.h b/src/ui/helper/pGroupBox.h
similarity index 100%
rename from include/pGroupBox.h
rename to src/ui/helper/pGroupBox.h
diff --git a/ui/pGroupBox.ui b/src/ui/helper/pGroupBox.ui
similarity index 100%
rename from ui/pGroupBox.ui
rename to src/ui/helper/pGroupBox.ui
diff --git a/src/pGroupBoxFrame.cpp b/src/ui/helper/pGroupBoxFrame.cpp
similarity index 100%
rename from src/pGroupBoxFrame.cpp
rename to src/ui/helper/pGroupBoxFrame.cpp
diff --git a/include/pGroupBoxFrame.h b/src/ui/helper/pGroupBoxFrame.h
similarity index 100%
rename from include/pGroupBoxFrame.h
rename to src/ui/helper/pGroupBoxFrame.h
diff --git a/ui/pGroupBoxFrame.ui b/src/ui/helper/pGroupBoxFrame.ui
similarity index 100%
rename from ui/pGroupBoxFrame.ui
rename to src/ui/helper/pGroupBoxFrame.ui
diff --git a/src/pSlider.cpp b/src/ui/helper/pSlider.cpp
similarity index 100%
rename from src/pSlider.cpp
rename to src/ui/helper/pSlider.cpp
diff --git a/include/pSlider.h b/src/ui/helper/pSlider.h
similarity index 100%
rename from include/pSlider.h
rename to src/ui/helper/pSlider.h
diff --git a/src/pdoublespinbox.cpp b/src/ui/helper/pdoublespinbox.cpp
similarity index 100%
rename from src/pdoublespinbox.cpp
rename to src/ui/helper/pdoublespinbox.cpp
diff --git a/include/pdoublespinbox.h b/src/ui/helper/pdoublespinbox.h
similarity index 100%
rename from include/pdoublespinbox.h
rename to src/ui/helper/pdoublespinbox.h
diff --git a/src/pspinbox.cpp b/src/ui/helper/pspinbox.cpp
similarity index 100%
rename from src/pspinbox.cpp
rename to src/ui/helper/pspinbox.cpp
diff --git a/include/pspinbox.h b/src/ui/helper/pspinbox.h
similarity index 100%
rename from include/pspinbox.h
rename to src/ui/helper/pspinbox.h
diff --git a/src/qtColorTriangle.cpp b/src/ui/helper/qtColorTriangle.cpp
similarity index 100%
rename from src/qtColorTriangle.cpp
rename to src/ui/helper/qtColorTriangle.cpp
diff --git a/include/qtColorTriangle.h b/src/ui/helper/qtColorTriangle.h
similarity index 100%
rename from include/qtColorTriangle.h
rename to src/ui/helper/qtColorTriangle.h
diff --git a/src/ui/main-windows/CMakeLists.txt b/src/ui/main-windows/CMakeLists.txt
new file mode 100644
index 000000000..2d4d0e5c0
--- /dev/null
+++ b/src/ui/main-windows/CMakeLists.txt
@@ -0,0 +1,32 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ alignmentGridBox.cpp
+ alignmentGridBox.h
+ alignmentGridBox.ui
+ analysePlot.cpp
+ analysePlot.h
+ colorPlot.cpp
+ colorPlot.h
+ control.cpp
+ control.h
+ control.ui
+ coordinateStructs.h
+ coordinateSystemBox.cpp
+ coordinateSystemBox.h
+ coordinateSystemBox.ui
+ correction.cpp
+ correction.h
+ correction.ui
+ extrinsicBox.cpp
+ extrinsicBox.h
+ extrinsicBox.ui
+ filterBeforeBox.cpp
+ filterBeforeBox.h
+ filterBeforeBox.ui
+ intrinsicBox.cpp
+ intrinsicBox.h
+ intrinsicBox.ui
+ view.cpp
+ view.h
+)
\ No newline at end of file
diff --git a/src/alignmentGridBox.cpp b/src/ui/main-windows/alignmentGridBox.cpp
similarity index 100%
rename from src/alignmentGridBox.cpp
rename to src/ui/main-windows/alignmentGridBox.cpp
diff --git a/include/alignmentGridBox.h b/src/ui/main-windows/alignmentGridBox.h
similarity index 100%
rename from include/alignmentGridBox.h
rename to src/ui/main-windows/alignmentGridBox.h
diff --git a/ui/alignmentGridBox.ui b/src/ui/main-windows/alignmentGridBox.ui
similarity index 100%
rename from ui/alignmentGridBox.ui
rename to src/ui/main-windows/alignmentGridBox.ui
diff --git a/src/analysePlot.cpp b/src/ui/main-windows/analysePlot.cpp
similarity index 100%
rename from src/analysePlot.cpp
rename to src/ui/main-windows/analysePlot.cpp
diff --git a/include/analysePlot.h b/src/ui/main-windows/analysePlot.h
similarity index 100%
rename from include/analysePlot.h
rename to src/ui/main-windows/analysePlot.h
diff --git a/src/colorPlot.cpp b/src/ui/main-windows/colorPlot.cpp
similarity index 100%
rename from src/colorPlot.cpp
rename to src/ui/main-windows/colorPlot.cpp
diff --git a/include/colorPlot.h b/src/ui/main-windows/colorPlot.h
similarity index 100%
rename from include/colorPlot.h
rename to src/ui/main-windows/colorPlot.h
diff --git a/src/control.cpp b/src/ui/main-windows/control.cpp
similarity index 100%
rename from src/control.cpp
rename to src/ui/main-windows/control.cpp
diff --git a/include/control.h b/src/ui/main-windows/control.h
similarity index 100%
rename from include/control.h
rename to src/ui/main-windows/control.h
diff --git a/ui/control.ui b/src/ui/main-windows/control.ui
similarity index 100%
rename from ui/control.ui
rename to src/ui/main-windows/control.ui
diff --git a/include/coordinateStructs.h b/src/ui/main-windows/coordinateStructs.h
similarity index 100%
rename from include/coordinateStructs.h
rename to src/ui/main-windows/coordinateStructs.h
diff --git a/src/coordinateSystemBox.cpp b/src/ui/main-windows/coordinateSystemBox.cpp
similarity index 100%
rename from src/coordinateSystemBox.cpp
rename to src/ui/main-windows/coordinateSystemBox.cpp
diff --git a/include/coordinateSystemBox.h b/src/ui/main-windows/coordinateSystemBox.h
similarity index 100%
rename from include/coordinateSystemBox.h
rename to src/ui/main-windows/coordinateSystemBox.h
diff --git a/ui/coordinateSystemBox.ui b/src/ui/main-windows/coordinateSystemBox.ui
similarity index 100%
rename from ui/coordinateSystemBox.ui
rename to src/ui/main-windows/coordinateSystemBox.ui
diff --git a/src/correction.cpp b/src/ui/main-windows/correction.cpp
similarity index 100%
rename from src/correction.cpp
rename to src/ui/main-windows/correction.cpp
diff --git a/include/correction.h b/src/ui/main-windows/correction.h
similarity index 100%
rename from include/correction.h
rename to src/ui/main-windows/correction.h
diff --git a/ui/correction.ui b/src/ui/main-windows/correction.ui
similarity index 100%
rename from ui/correction.ui
rename to src/ui/main-windows/correction.ui
diff --git a/src/extrinsicBox.cpp b/src/ui/main-windows/extrinsicBox.cpp
similarity index 100%
rename from src/extrinsicBox.cpp
rename to src/ui/main-windows/extrinsicBox.cpp
diff --git a/include/extrinsicBox.h b/src/ui/main-windows/extrinsicBox.h
similarity index 100%
rename from include/extrinsicBox.h
rename to src/ui/main-windows/extrinsicBox.h
diff --git a/ui/extrinsicBox.ui b/src/ui/main-windows/extrinsicBox.ui
similarity index 100%
rename from ui/extrinsicBox.ui
rename to src/ui/main-windows/extrinsicBox.ui
diff --git a/src/filterBeforeBox.cpp b/src/ui/main-windows/filterBeforeBox.cpp
similarity index 100%
rename from src/filterBeforeBox.cpp
rename to src/ui/main-windows/filterBeforeBox.cpp
diff --git a/include/filterBeforeBox.h b/src/ui/main-windows/filterBeforeBox.h
similarity index 100%
rename from include/filterBeforeBox.h
rename to src/ui/main-windows/filterBeforeBox.h
diff --git a/ui/filterBeforeBox.ui b/src/ui/main-windows/filterBeforeBox.ui
similarity index 100%
rename from ui/filterBeforeBox.ui
rename to src/ui/main-windows/filterBeforeBox.ui
diff --git a/src/intrinsicBox.cpp b/src/ui/main-windows/intrinsicBox.cpp
similarity index 100%
rename from src/intrinsicBox.cpp
rename to src/ui/main-windows/intrinsicBox.cpp
diff --git a/include/intrinsicBox.h b/src/ui/main-windows/intrinsicBox.h
similarity index 100%
rename from include/intrinsicBox.h
rename to src/ui/main-windows/intrinsicBox.h
diff --git a/ui/intrinsicBox.ui b/src/ui/main-windows/intrinsicBox.ui
similarity index 100%
rename from ui/intrinsicBox.ui
rename to src/ui/main-windows/intrinsicBox.ui
diff --git a/src/view.cpp b/src/ui/main-windows/view.cpp
similarity index 100%
rename from src/view.cpp
rename to src/ui/main-windows/view.cpp
diff --git a/include/view.h b/src/ui/main-windows/view.h
similarity index 100%
rename from include/view.h
rename to src/ui/main-windows/view.h
diff --git a/src/ui/visualization/CMakeLists.txt b/src/ui/visualization/CMakeLists.txt
new file mode 100644
index 000000000..7bbc1658d
--- /dev/null
+++ b/src/ui/visualization/CMakeLists.txt
@@ -0,0 +1,32 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ backgroundItem.cpp
+ backgroundItem.h
+ codeMarkerItem.cpp
+ codeMarkerItem.h
+ colorMarkerItem.cpp
+ colorMarkerItem.h
+ coordItem.cpp
+ coordItem.h
+ gridItem.cpp
+ gridItem.h
+ imageItem.cpp
+ imageItem.h
+ logoItem.cpp
+ logoItem.h
+ moCapController.cpp
+ moCapController.h
+ moCapItem.cpp
+ moCapItem.h
+ moCapPerson.cpp
+ moCapPerson.h
+ multiColorMarkerItem.cpp
+ multiColorMarkerItem.h
+ roiItem.cpp
+ roiItem.h
+ stereoItem.cpp
+ stereoItem.h
+ trackerItem.cpp
+ trackerItem.h
+)
\ No newline at end of file
diff --git a/src/backgroundItem.cpp b/src/ui/visualization/backgroundItem.cpp
similarity index 100%
rename from src/backgroundItem.cpp
rename to src/ui/visualization/backgroundItem.cpp
diff --git a/include/backgroundItem.h b/src/ui/visualization/backgroundItem.h
similarity index 100%
rename from include/backgroundItem.h
rename to src/ui/visualization/backgroundItem.h
diff --git a/src/codeMarkerItem.cpp b/src/ui/visualization/codeMarkerItem.cpp
similarity index 100%
rename from src/codeMarkerItem.cpp
rename to src/ui/visualization/codeMarkerItem.cpp
diff --git a/include/codeMarkerItem.h b/src/ui/visualization/codeMarkerItem.h
similarity index 100%
rename from include/codeMarkerItem.h
rename to src/ui/visualization/codeMarkerItem.h
diff --git a/src/colorMarkerItem.cpp b/src/ui/visualization/colorMarkerItem.cpp
similarity index 100%
rename from src/colorMarkerItem.cpp
rename to src/ui/visualization/colorMarkerItem.cpp
diff --git a/include/colorMarkerItem.h b/src/ui/visualization/colorMarkerItem.h
similarity index 100%
rename from include/colorMarkerItem.h
rename to src/ui/visualization/colorMarkerItem.h
diff --git a/src/coordItem.cpp b/src/ui/visualization/coordItem.cpp
similarity index 100%
rename from src/coordItem.cpp
rename to src/ui/visualization/coordItem.cpp
diff --git a/include/coordItem.h b/src/ui/visualization/coordItem.h
similarity index 100%
rename from include/coordItem.h
rename to src/ui/visualization/coordItem.h
diff --git a/src/gridItem.cpp b/src/ui/visualization/gridItem.cpp
similarity index 100%
rename from src/gridItem.cpp
rename to src/ui/visualization/gridItem.cpp
diff --git a/include/gridItem.h b/src/ui/visualization/gridItem.h
similarity index 100%
rename from include/gridItem.h
rename to src/ui/visualization/gridItem.h
diff --git a/src/imageItem.cpp b/src/ui/visualization/imageItem.cpp
similarity index 100%
rename from src/imageItem.cpp
rename to src/ui/visualization/imageItem.cpp
diff --git a/include/imageItem.h b/src/ui/visualization/imageItem.h
similarity index 100%
rename from include/imageItem.h
rename to src/ui/visualization/imageItem.h
diff --git a/src/logoItem.cpp b/src/ui/visualization/logoItem.cpp
similarity index 100%
rename from src/logoItem.cpp
rename to src/ui/visualization/logoItem.cpp
diff --git a/include/logoItem.h b/src/ui/visualization/logoItem.h
similarity index 100%
rename from include/logoItem.h
rename to src/ui/visualization/logoItem.h
diff --git a/src/moCapController.cpp b/src/ui/visualization/moCapController.cpp
similarity index 100%
rename from src/moCapController.cpp
rename to src/ui/visualization/moCapController.cpp
diff --git a/include/moCapController.h b/src/ui/visualization/moCapController.h
similarity index 100%
rename from include/moCapController.h
rename to src/ui/visualization/moCapController.h
diff --git a/src/moCapItem.cpp b/src/ui/visualization/moCapItem.cpp
similarity index 100%
rename from src/moCapItem.cpp
rename to src/ui/visualization/moCapItem.cpp
diff --git a/include/moCapItem.h b/src/ui/visualization/moCapItem.h
similarity index 100%
rename from include/moCapItem.h
rename to src/ui/visualization/moCapItem.h
diff --git a/src/moCapPerson.cpp b/src/ui/visualization/moCapPerson.cpp
similarity index 100%
rename from src/moCapPerson.cpp
rename to src/ui/visualization/moCapPerson.cpp
diff --git a/include/moCapPerson.h b/src/ui/visualization/moCapPerson.h
similarity index 100%
rename from include/moCapPerson.h
rename to src/ui/visualization/moCapPerson.h
diff --git a/src/multiColorMarkerItem.cpp b/src/ui/visualization/multiColorMarkerItem.cpp
similarity index 100%
rename from src/multiColorMarkerItem.cpp
rename to src/ui/visualization/multiColorMarkerItem.cpp
diff --git a/include/multiColorMarkerItem.h b/src/ui/visualization/multiColorMarkerItem.h
similarity index 100%
rename from include/multiColorMarkerItem.h
rename to src/ui/visualization/multiColorMarkerItem.h
diff --git a/src/roiItem.cpp b/src/ui/visualization/roiItem.cpp
similarity index 100%
rename from src/roiItem.cpp
rename to src/ui/visualization/roiItem.cpp
diff --git a/include/roiItem.h b/src/ui/visualization/roiItem.h
similarity index 100%
rename from include/roiItem.h
rename to src/ui/visualization/roiItem.h
diff --git a/src/stereoItem.cpp b/src/ui/visualization/stereoItem.cpp
similarity index 100%
rename from src/stereoItem.cpp
rename to src/ui/visualization/stereoItem.cpp
diff --git a/include/stereoItem.h b/src/ui/visualization/stereoItem.h
similarity index 100%
rename from include/stereoItem.h
rename to src/ui/visualization/stereoItem.h
diff --git a/src/trackerItem.cpp b/src/ui/visualization/trackerItem.cpp
similarity index 100%
rename from src/trackerItem.cpp
rename to src/ui/visualization/trackerItem.cpp
diff --git a/include/trackerItem.h b/src/ui/visualization/trackerItem.h
similarity index 100%
rename from include/trackerItem.h
rename to src/ui/visualization/trackerItem.h
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
new file mode 100644
index 000000000..fc9829bfa
--- /dev/null
+++ b/src/util/CMakeLists.txt
@@ -0,0 +1,11 @@
+target_include_directories(petrack_core PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_sources(petrack_core PRIVATE
+ circularStack.h
+ compilerInformation.h
+ helper.cpp
+ helper.h
+ logger.h
+ vector.cpp
+ vector.h
+)
diff --git a/include/circularStack.h b/src/util/circularStack.h
similarity index 100%
rename from include/circularStack.h
rename to src/util/circularStack.h
diff --git a/include/compilerInformation.h b/src/util/compilerInformation.h
similarity index 100%
rename from include/compilerInformation.h
rename to src/util/compilerInformation.h
diff --git a/src/helper.cpp b/src/util/helper.cpp
similarity index 100%
rename from src/helper.cpp
rename to src/util/helper.cpp
diff --git a/include/helper.h b/src/util/helper.h
similarity index 100%
rename from include/helper.h
rename to src/util/helper.h
diff --git a/include/logger.h b/src/util/logger.h
similarity index 100%
rename from include/logger.h
rename to src/util/logger.h
diff --git a/src/vector.cpp b/src/util/vector.cpp
similarity index 100%
rename from src/vector.cpp
rename to src/util/vector.cpp
diff --git a/include/vector.h b/src/util/vector.h
similarity index 100%
rename from include/vector.h
rename to src/util/vector.h
diff --git a/tests/unit_test/CMakeLists.txt b/tests/unit_test/CMakeLists.txt
index d300becd0..224245ba2 100644
--- a/tests/unit_test/CMakeLists.txt
+++ b/tests/unit_test/CMakeLists.txt
@@ -1,23 +1,16 @@
add_executable(petrack_tests)
+target_include_directories(petrack_tests PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+
target_sources(petrack_tests PRIVATE
main.cpp
- tst_apptest.cpp
- tst_control.cpp
- tst_io.cpp
- tst_SkeletonTree.cpp
- tst_moCapController.cpp
- tst_recognition.cpp
- tst_codeMarkerWidget.cpp
- tst_helper.cpp
- tst_petrack.cpp
- tst_extrCalibration.cpp
- tst_filter.cpp
- tst_intrinsicBox.cpp
util.h
- tst_extrinsicBox.cpp
- tst_coordinateSystemBox.cpp
- tst_tracker.cpp
- tst_correction.cpp
- tst_circularStack.cpp
+ tst_petrack.cpp
)
+
+add_subdirectory(calibration)
+add_subdirectory(filter)
+add_subdirectory(general)
+add_subdirectory(IO)
+add_subdirectory(recognition)
+add_subdirectory(tracking)
\ No newline at end of file
diff --git a/tests/unit_test/IO/CMakeLists.txt b/tests/unit_test/IO/CMakeLists.txt
new file mode 100644
index 000000000..574cbcc19
--- /dev/null
+++ b/tests/unit_test/IO/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(petrack_tests PRIVATE
+ tst_io.cpp
+ tst_SkeletonTree.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_SkeletonTree.cpp b/tests/unit_test/IO/tst_SkeletonTree.cpp
similarity index 100%
rename from tests/unit_test/tst_SkeletonTree.cpp
rename to tests/unit_test/IO/tst_SkeletonTree.cpp
diff --git a/tests/unit_test/tst_io.cpp b/tests/unit_test/IO/tst_io.cpp
similarity index 100%
rename from tests/unit_test/tst_io.cpp
rename to tests/unit_test/IO/tst_io.cpp
diff --git a/tests/unit_test/calibration/CMakeLists.txt b/tests/unit_test/calibration/CMakeLists.txt
new file mode 100644
index 000000000..5ae6930ab
--- /dev/null
+++ b/tests/unit_test/calibration/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(petrack_tests PRIVATE
+ tst_extrCalibration.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_extrCalibration.cpp b/tests/unit_test/calibration/tst_extrCalibration.cpp
similarity index 100%
rename from tests/unit_test/tst_extrCalibration.cpp
rename to tests/unit_test/calibration/tst_extrCalibration.cpp
diff --git a/tests/unit_test/filter/CMakeLists.txt b/tests/unit_test/filter/CMakeLists.txt
new file mode 100644
index 000000000..a75ec598b
--- /dev/null
+++ b/tests/unit_test/filter/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(petrack_tests PRIVATE
+ tst_filter.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_filter.cpp b/tests/unit_test/filter/tst_filter.cpp
similarity index 100%
rename from tests/unit_test/tst_filter.cpp
rename to tests/unit_test/filter/tst_filter.cpp
diff --git a/tests/unit_test/general/CMakeLists.txt b/tests/unit_test/general/CMakeLists.txt
new file mode 100644
index 000000000..2c79d9c30
--- /dev/null
+++ b/tests/unit_test/general/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(petrack_tests PRIVATE
+ tst_helper.cpp
+ tst_circularStack.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_circularStack.cpp b/tests/unit_test/general/tst_circularStack.cpp
similarity index 100%
rename from tests/unit_test/tst_circularStack.cpp
rename to tests/unit_test/general/tst_circularStack.cpp
diff --git a/tests/unit_test/tst_helper.cpp b/tests/unit_test/general/tst_helper.cpp
similarity index 100%
rename from tests/unit_test/tst_helper.cpp
rename to tests/unit_test/general/tst_helper.cpp
diff --git a/tests/unit_test/recognition/CMakeLists.txt b/tests/unit_test/recognition/CMakeLists.txt
new file mode 100644
index 000000000..f0647d96f
--- /dev/null
+++ b/tests/unit_test/recognition/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(petrack_tests PRIVATE
+ tst_recognition.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_recognition.cpp b/tests/unit_test/recognition/tst_recognition.cpp
similarity index 100%
rename from tests/unit_test/tst_recognition.cpp
rename to tests/unit_test/recognition/tst_recognition.cpp
diff --git a/tests/unit_test/tracking/CMakeLists.txt b/tests/unit_test/tracking/CMakeLists.txt
new file mode 100644
index 000000000..70407d31a
--- /dev/null
+++ b/tests/unit_test/tracking/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(petrack_tests PRIVATE
+ tst_tracker.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_tracker.cpp b/tests/unit_test/tracking/tst_tracker.cpp
similarity index 100%
rename from tests/unit_test/tst_tracker.cpp
rename to tests/unit_test/tracking/tst_tracker.cpp
diff --git a/tests/unit_test/tst_apptest.cpp b/tests/unit_test/tst_apptest.cpp
deleted file mode 100644
index 37bed097e..000000000
--- a/tests/unit_test/tst_apptest.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * PeTrack - Software for tracking pedestrians movement in videos
- * Copyright (C) 2024 Forschungszentrum Jülich GmbH, IAS-7
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <QSignalSpy>
-#include <catch2/catch.hpp>
-#include <iostream>
-
-
-SCENARIO("Application Tests", "[app]")
-{
- GIVEN("Hello World")
- {
- REQUIRE(true);
- }
-}
diff --git a/tests/unit_test/ui/CMakeLists.txt b/tests/unit_test/ui/CMakeLists.txt
new file mode 100644
index 000000000..75f4fb9e7
--- /dev/null
+++ b/tests/unit_test/ui/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(visualization)
+add_subdirectory(dialogs)
+add_subdirectory(main-windows)
\ No newline at end of file
diff --git a/tests/unit_test/ui/dialogs/CMakeLists.txt b/tests/unit_test/ui/dialogs/CMakeLists.txt
new file mode 100644
index 000000000..6d735279a
--- /dev/null
+++ b/tests/unit_test/ui/dialogs/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(petrack_tests PRIVATE
+ tst_codeMarkerWidget.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_codeMarkerWidget.cpp b/tests/unit_test/ui/dialogs/tst_codeMarkerWidget.cpp
similarity index 100%
rename from tests/unit_test/tst_codeMarkerWidget.cpp
rename to tests/unit_test/ui/dialogs/tst_codeMarkerWidget.cpp
diff --git a/tests/unit_test/ui/main-windows/CMakeLists.txt b/tests/unit_test/ui/main-windows/CMakeLists.txt
new file mode 100644
index 000000000..156b94345
--- /dev/null
+++ b/tests/unit_test/ui/main-windows/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(petrack_tests PRIVATE
+ tst_control.cpp
+ tst_intrinsicBox.cpp
+ tst_extrinsicBox.cpp
+ tst_coordinateSystemBox.cpp
+ tst_correction.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_control.cpp b/tests/unit_test/ui/main-windows/tst_control.cpp
similarity index 100%
rename from tests/unit_test/tst_control.cpp
rename to tests/unit_test/ui/main-windows/tst_control.cpp
diff --git a/tests/unit_test/tst_coordinateSystemBox.cpp b/tests/unit_test/ui/main-windows/tst_coordinateSystemBox.cpp
similarity index 100%
rename from tests/unit_test/tst_coordinateSystemBox.cpp
rename to tests/unit_test/ui/main-windows/tst_coordinateSystemBox.cpp
diff --git a/tests/unit_test/tst_correction.cpp b/tests/unit_test/ui/main-windows/tst_correction.cpp
similarity index 100%
rename from tests/unit_test/tst_correction.cpp
rename to tests/unit_test/ui/main-windows/tst_correction.cpp
diff --git a/tests/unit_test/tst_extrinsicBox.cpp b/tests/unit_test/ui/main-windows/tst_extrinsicBox.cpp
similarity index 100%
rename from tests/unit_test/tst_extrinsicBox.cpp
rename to tests/unit_test/ui/main-windows/tst_extrinsicBox.cpp
diff --git a/tests/unit_test/tst_intrinsicBox.cpp b/tests/unit_test/ui/main-windows/tst_intrinsicBox.cpp
similarity index 100%
rename from tests/unit_test/tst_intrinsicBox.cpp
rename to tests/unit_test/ui/main-windows/tst_intrinsicBox.cpp
diff --git a/tests/unit_test/ui/visualization/CMakeLists.txt b/tests/unit_test/ui/visualization/CMakeLists.txt
new file mode 100644
index 000000000..4ffd9c15f
--- /dev/null
+++ b/tests/unit_test/ui/visualization/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(petrack_tests PRIVATE
+ tst_moCapController.cpp
+)
\ No newline at end of file
diff --git a/tests/unit_test/tst_moCapController.cpp b/tests/unit_test/ui/visualization/tst_moCapController.cpp
similarity index 100%
rename from tests/unit_test/tst_moCapController.cpp
rename to tests/unit_test/ui/visualization/tst_moCapController.cpp
--
GitLab