diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c64dbcc9ad7365a7e8603160cbe485b8fb0d7332..a5e08f8e7b89e33dd9c1394c90ce5b168fd211a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,6 @@ pre-build-checks: stage: pre-build-checks script: - scripts/check-format-cpp.sh - allow_failure: true # Build petrack and petrack unit_tests build_linux: @@ -91,7 +90,6 @@ regression_test_linux: junit: "tests/regression_test/tests/pytest_report.xml" needs: ["build_linux"] - ############################################################################### # Windows CI ############################################################################### @@ -110,6 +108,7 @@ build_windows: paths: - "./build" expire_in: 2 hrs + needs: [] # Execute unit tests unit_test_windows: @@ -174,7 +173,6 @@ make_release_windows: - winInst=$(echo petrack-installer-*) - curl -k -T $winInst -u "${SCIEBO_WIN_INSTALLER_PATH}:" https://fz-juelich.sciebo.de/public.php/webdav/$winInst --fail-with-body - ############################################################################### # MacOS CI ############################################################################### @@ -186,11 +184,11 @@ build_macos: script: - mkdir build - cd build - - cmake -G Ninja .. - -DBUILD_BUNDLE=ON - -DBUILD_UNIT_TESTS=ON - -DFAIL_ON_WARNINGS=ON - -DCatch2_DIR=$Catch2_DIR + - cmake -G Ninja .. + -DBUILD_BUNDLE=ON + -DBUILD_UNIT_TESTS=ON + -DFAIL_ON_WARNINGS=ON + -DCatch2_DIR=$Catch2_DIR -Dtrompeloeil_DIR=$trompeloeil_DIR -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 - cmake --build . @@ -202,6 +200,7 @@ build_macos: - "build/" - "build/petrack-installer-*" expire_in: 2 hrs + needs: [] # Execute unit tests unit_test_macos: @@ -239,11 +238,11 @@ make_release_macos: image: $CI_REGISTRY/ped-dyn-emp/petrack/alpine stage: deploy rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - when: never - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == "schedule" + when: never + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH script: - - cd build - - macosInst=$(echo petrack-installer-*) - - curl -k -T $macosInst -u "${SCIEBO_MACOS_INSTALLER_PATH}:" https://fz-juelich.sciebo.de/public.php/webdav/$macosInst --fail-with-body - dependencies: [ "build_macos" ] + - cd build + - macosInst=$(echo petrack-installer-*) + - curl -k -T $macosInst -u "${SCIEBO_MACOS_INSTALLER_PATH}:" https://fz-juelich.sciebo.de/public.php/webdav/$macosInst --fail-with-body + dependencies: ["build_macos"] diff --git a/src/petrack.cpp b/src/petrack.cpp index 5897c043b53a5abea83d62040e330fd257761eb9..8028714902c45e2a0b4732d497ff704922e02853 100644 --- a/src/petrack.cpp +++ b/src/petrack.cpp @@ -1546,7 +1546,7 @@ void Petrack::print() // HighResolution font zu gross! und laengere laufzeit und eher overflow // aber so pixelig und keine schoenen linien QPrinter printer(QPrinter::ScreenResolution); // ScreenResolution, HighResolution// liefert zu hause: - // QWin32PrintEngine::initialize: GetPrinter failed () + // QWin32PrintEngine::initialize: GetPrinter failed () printer.setPageSize(QPageSize{QPageSize::PageSizeId::A4}); QPrintDialog dialog(&printer, this); if(dialog.exec()) @@ -2757,9 +2757,9 @@ void Petrack::exportTracker(QString dest) // default = "" mMultiColorMarkerWidget->autoCorrect->isChecked() && mMultiColorMarkerWidget->autoCorrectOnlyExport->isChecked(); - if(dest.right(4) == ".trc") - { - QTemporaryFile file; + if(dest.right(4) == ".trc") + { + QTemporaryFile file; if(!file.open() /*!file.open(QIODevice::WriteOnly | QIODevice::Text)*/) { @@ -2785,22 +2785,21 @@ void Petrack::exportTracker(QString dest) // default = "" trcVersion); QTextStream out(&file); - out << "version " << trcVersion << Qt::endl; - out << mPersonStorage.nbPersons() << Qt::endl; - const auto &persons = mPersonStorage.getPersons(); - for(size_t i = 0; i < persons.size(); ++i) - { - qApp->processEvents(); - progress.setLabelText( - QString("Export person %1 of %2 ...").arg(i + 1).arg(mPersonStorage.nbPersons())); - progress.setValue(static_cast<int>(i + 1)); - out << persons[i] << Qt::endl; - } - file.flush(); - file.close(); - - progress.setLabelText(QString("Save file ...")); + out << "version " << trcVersion << Qt::endl; + out << mPersonStorage.nbPersons() << Qt::endl; + const auto &persons = mPersonStorage.getPersons(); + for(size_t i = 0; i < persons.size(); ++i) + { qApp->processEvents(); + progress.setLabelText(QString("Export person %1 of %2 ...").arg(i + 1).arg(mPersonStorage.nbPersons())); + progress.setValue(static_cast<int>(i + 1)); + out << persons[i] << Qt::endl; + } + file.flush(); + file.close(); + + progress.setLabelText(QString("Save file ...")); + qApp->processEvents(); if(QFile::exists(dest)) { @@ -2825,8 +2824,8 @@ void Petrack::exportTracker(QString dest) // default = "" SPDLOG_INFO("finished."); mAutosave.resetTrackPersonCounter(); - mTrcFileName = - dest; // fuer Project-File, dann koennte track path direkt mitgeladen werden, wenn er// noch da ist + mTrcFileName = + dest; // fuer Project-File, dann koennte track path direkt mitgeladen werden, wenn er// noch da ist } else if(dest.right(4) == ".txt") { @@ -2840,40 +2839,40 @@ void Petrack::exportTracker(QString dest) // default = "" SPDLOG_INFO("export tracking data to {} ({} person(s))...", dest, mPersonStorage.nbPersons()); - // recalcHeight true, wenn personenhoehe ueber trackpoints neu berechnet werden soll (z.b. um + // recalcHeight true, wenn personenhoehe ueber trackpoints neu berechnet werden soll (z.b. um // waehrend play mehrfachberuecksichtigung von punkten auszuschliessen, aenderungen in altitude neu // in berechnung einfliessen zu lassen) - if(mControlWidget->isTrackRecalcHeightChecked()) + if(mControlWidget->isTrackRecalcHeightChecked()) + { + if(mControlWidget->getCalibCoordDimension() == 0) // 3D { - if(mControlWidget->getCalibCoordDimension() == 0) // 3D - { - ; // Nothing to be done because z already the right height - } - else // 2D - { - mPersonStorage.recalcHeight(mControlWidget->getCameraAltitude()); - } + ; // Nothing to be done because z already the right height + } + else // 2D + { + mPersonStorage.recalcHeight(mControlWidget->getCameraAltitude()); } + } - mTrackerReal->calculate( - this, - mTracker, - mImageItem, - mControlWidget->getColorPlot(), - mMissingFrames, - getImageBorderSize(), - mControlWidget->isTrackMissingFramesChecked(), - mStereoWidget->stereoUseForExport->isChecked(), - mControlWidget->getTrackAlternateHeight(), - mControlWidget->getCameraAltitude(), - mStereoWidget->stereoUseCalibrationCenter->isChecked(), - mControlWidget->isExportElimTpChecked(), - mControlWidget->isExportElimTrjChecked(), - mControlWidget->isExportSmoothChecked(), - mControlWidget->isExportViewDirChecked(), - mControlWidget->isExportAngleOfViewChecked(), - mControlWidget->isExportMarkerIDChecked(), - autoCorrectOnlyExport); + mTrackerReal->calculate( + this, + mTracker, + mImageItem, + mControlWidget->getColorPlot(), + mMissingFrames, + getImageBorderSize(), + mControlWidget->isTrackMissingFramesChecked(), + mStereoWidget->stereoUseForExport->isChecked(), + mControlWidget->getTrackAlternateHeight(), + mControlWidget->getCameraAltitude(), + mStereoWidget->stereoUseCalibrationCenter->isChecked(), + mControlWidget->isExportElimTpChecked(), + mControlWidget->isExportElimTrjChecked(), + mControlWidget->isExportSmoothChecked(), + mControlWidget->isExportViewDirChecked(), + mControlWidget->isExportAngleOfViewChecked(), + mControlWidget->isExportMarkerIDChecked(), + autoCorrectOnlyExport); QTextStream out(&file); @@ -2935,11 +2934,11 @@ void Petrack::exportTracker(QString dest) // default = "" statusBar()->showMessage(tr("Saved tracking data to %1.").arg(dest), 5000); } - SPDLOG_INFO("finished"); - } - else if(dest.right(4) == ".dat") - { - QTemporaryFile fileDat; + SPDLOG_INFO("finished"); + } + else if(dest.right(4) == ".dat") + { + QTemporaryFile fileDat; if(!fileDat.open()) //! fileDat.open(QIODevice::WriteOnly | QIODevice::Text)) {