Commit e153f743 authored by Schrödter, Tobias's avatar Schrödter, Tobias
Browse files

Merge branch '316-ext-model-always-enabled' into 'master'

Resolve "ext. model always enabled"

Closes #316

See merge request !205
parents 34ad4ab8 aa0534e6
Pipeline #73736 passed with stages
in 47 minutes and 53 seconds
......@@ -20,7 +20,7 @@
# Project setup
################################################################################
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
project(petrack LANGUAGES CXX VERSION 0.9.1)
project(petrack LANGUAGES CXX VERSION 0.9.2)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
......
......@@ -143,7 +143,7 @@ public:
void setCalibTAUYMax(double d);
double getCalibReprErrorValue() const;
void setCalibReprErrorValue(double d);
void setNewModelChecked(bool b);
void setExtModelChecked(bool b);
double getCalibExtrRot1();
void setCalibExtrRot1(double d);
......@@ -513,7 +513,7 @@ private slots:
void on_quadAspectRatio_stateChanged(int i);
void on_fixCenter_stateChanged(int i);
void on_tangDist_stateChanged(int i);
void on_newModelCheckBox_stateChanged(int i);
void on_extModelCheckBox_stateChanged(int i);
void on_autoCalib_clicked();
void on_calibFiles_clicked();
......
......@@ -292,7 +292,7 @@ inline clock_t getElapsedTime()
lastTime = clock();
return diffTime;
}
bool lessThanVersion(const QString &q1, const QString &q2);
bool newerThanVersion(const QString &q1, const QString &q2);
/**
......
......@@ -256,7 +256,7 @@ void AutoCalib::autoCalib()
{
flags |= CV_CALIB_ZERO_TANGENT_DIST;
}
if(mControlWidget->newModelCheckBox->isChecked())
if(mControlWidget->extModelCheckBox->isChecked())
{
flags |= CV_CALIB_RATIONAL_MODEL + CV_CALIB_THIN_PRISM_MODEL + CV_CALIB_TILTED_MODEL;
}
......
......@@ -164,7 +164,7 @@ Control::Control(
// will be done by designer: colorPlot->setParent(colorBox); //because it is just integrated via frame in designer
connect(newModelCheckBox, &QCheckBox::stateChanged, this, &Control::on_newModelCheckBox_stateChanged);
connect(extModelCheckBox, &QCheckBox::stateChanged, this, &Control::on_extModelCheckBox_stateChanged);
colorPlot->setControlWidget(this);
mIndexChanging = false;
......@@ -639,15 +639,15 @@ void Control::setCalibReprErrorValue(double d)
{
intrError->setText(QString("%1").arg(d));
}
void Control::setNewModelChecked(bool b)
void Control::setExtModelChecked(bool b)
{
if(b)
{
newModelCheckBox->setChecked(true);
extModelCheckBox->setChecked(true);
}
else
{
newModelCheckBox->setChecked(false);
extModelCheckBox->setChecked(false);
}
}
......@@ -2476,7 +2476,7 @@ void Control::on_tangDist_stateChanged(int i)
intrError->setText(QString("invalid"));
}
void Control::on_newModelCheckBox_stateChanged(int i)
void Control::on_extModelCheckBox_stateChanged(int i)
{
if(i == Qt::Checked)
{
......@@ -3044,6 +3044,7 @@ void Control::setXml(QDomElement &elem)
subSubElem.setAttribute("QUAD_ASPECT_RATIO", quadAspectRatio->isChecked());
subSubElem.setAttribute("FIX_CENTER", fixCenter->isChecked());
subSubElem.setAttribute("TANG_DIST", tangDist->isChecked());
subSubElem.setAttribute("EXT_MODEL_ENABLED", extModelCheckBox->isChecked());
// in dateiname darf kein , vorkommen - das blank ", " zur uebersich - beim einlesen wird nur ","
// genommen und blanks rundherum abgeschnitten, falls von hand editiert wurde
QStringList fl = mMainWindow->getAutoCalib()->getCalibFiles();
......@@ -3612,6 +3613,11 @@ void Control::getXml(QDomElement &elem)
tangDist->setCheckState(
subSubElem.attribute("TANG_DIST").toInt() ? Qt::Checked : Qt::Unchecked);
}
if(subSubElem.hasAttribute("EXT_MODEL_ENABLED"))
{
extModelCheckBox->setCheckState(
subSubElem.attribute("EXT_MODEL_ENABLED").toInt() ? Qt::Checked : Qt::Unchecked);
}
if(subSubElem.hasAttribute("CALIB_FILES"))
{
QStringList fl = (subSubElem.attribute("CALIB_FILES")).split(",");
......
......@@ -196,7 +196,7 @@ cv::Mat getRoi(cv::Mat &img, const QRect &roi, cv::Rect &rect, bool evenPixelNum
* @throws std::invalid_argument Thrown if one of the input strings is not in the right format
* @return boolean, whether the first version is higher than the second one
*/
bool lessThanVersion(const QString &q1, const QString &q2)
bool newerThanVersion(const QString &q1, const QString &q2)
{
QStringList version1 = q1.split(QLatin1Char('.'));
QStringList version2 = q2.split(QLatin1Char('.'));
......
......@@ -658,14 +658,26 @@ void Petrack::openProject(QString fileName, bool openSeq) // default fileName=""
openXml(doc, openSeq);
mLastTrackerExport = mTrcFileName;
if(!lessThanVersion(root.attribute("VERSION"), QString("0.9.0")))
if(newerThanVersion(QString("0.9.0"), root.attribute("VERSION")))
{
PWarning(
this,
tr("PeTrack"),
tr("You are using a project version lower than 0.9: Therefore, the extended intrinsic calibration "
"model is disabled."));
mControlWidget->setNewModelChecked(false);
mControlWidget->setExtModelChecked(false);
}
else if(newerThanVersion(QString("0.9.2"), root.attribute("VERSION")))
{
// only checking one parameter because if the ext. model is used all parameters are not equal to zero
if(mControlWidget->getCalibS1Value() == 0.)
{
mControlWidget->setExtModelChecked(false);
}
else
{
mControlWidget->setExtModelChecked(true);
}
}
updateWindowTitle();
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.1">
<PETRACK VERSION="0.9.2">
<MAIN SRC="blackdotMarker.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="2">
<CALIBRATION>
......@@ -10,7 +10,7 @@
<SWAP ENABLED="0" HORIZONTALLY="0" VERTICALLY="0"/>
<BG_SUB DELETE="1" DELETE_NUMBER="3" ENABLED="0" FILE="" SHOW="0" UPDATE="0"/>
<PATTERN BOARD_SIZE_X="6" BOARD_SIZE_Y="9" SQUARE_SIZE="3"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="1038" CY="798" ENABLED="1" FIX_CENTER="0" FX="835.65999999999997" FY="835.75999999999999" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.246701" R4="0.072692000000000007" R6="-0.010224" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="0.00033700000000000001" TY="6.9999999999999999e-06"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="1038" CY="798" ENABLED="1" EXT_MODEL_ENABLED="0" FIX_CENTER="0" FX="835.65999999999997" FY="835.75999999999999" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.246701" R4="0.072692000000000007" R6="-0.010224" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="0.00033700000000000001" TY="6.9999999999999999e-06"/>
<EXTRINSIC_PARAMETERS ALTITUDE="535" COORD3D_AXIS_LEN="200" COORD3D_SWAP_X="0" COORD3D_SWAP_Y="0" COORD3D_SWAP_Z="0" COORD3D_TRANS_X="225" COORD3D_TRANS_Y="350" COORD3D_TRANS_Z="0" COORD_DIMENSION="0" EXTERNAL_CALIB_FILE="" EXTR_ROT_1="-2.2050000000000001" EXTR_ROT_2="-2.177" EXTR_ROT_3="0.104" EXTR_TRANS_1="-224.46700000000001" EXTR_TRANS_2="-629.58500000000004" EXTR_TRANS_3="-408.82499999999999" FIX="1" ROTATE="0" SCALE="1" SHOW="0" SHOW_CALIB_POINTS="0" TRANS_X="0" TRANS_Y="0" UNIT="100" USE_INTRINSIC_CENTER="0"/>
<ALIGNMENT_GRID FIX="1" GRID3D_RESOLUTION="100" GRID3D_TRANS_X="75" GRID3D_TRANS_Y="-18" GRID3D_TRANS_Z="0" GRID_DIMENSION="0" ROTATE="0" SCALE="1" SHOW="0" TRANS_X="0" TRANS_Y="0"/>
</CALIBRATION>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.1">
<PETRACK VERSION="0.9.2">
<MAIN SRC="codeMarker.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="2">
<CALIBRATION>
......@@ -10,7 +10,7 @@
<SWAP ENABLED="0" HORIZONTALLY="0" VERTICALLY="0"/>
<BG_SUB DELETE="1" DELETE_NUMBER="3" ENABLED="0" FILE="" SHOW="0" UPDATE="0"/>
<PATTERN BOARD_SIZE_X="6" BOARD_SIZE_Y="8" SQUARE_SIZE="4.5999999"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="1397.98" CY="1138.9300000000001" ENABLED="1" FIX_CENTER="0" FX="835.65999999999997" FY="835.75999999999999" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.246701" R4="0.072692000000000007" R6="-0.010224" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="0.00033700000000000001" TY="6.9999999999999999e-06"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="1397.98" CY="1138.9300000000001" ENABLED="1" EXT_MODEL_ENABLED="0" FIX_CENTER="0" FX="835.65999999999997" FY="835.75999999999999" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.246701" R4="0.072692000000000007" R6="-0.010224" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="0.00033700000000000001" TY="6.9999999999999999e-06"/>
<EXTRINSIC_PARAMETERS ALTITUDE="535" COORD3D_AXIS_LEN="200" COORD3D_SWAP_X="0" COORD3D_SWAP_Y="0" COORD3D_SWAP_Z="0" COORD3D_TRANS_X="0" COORD3D_TRANS_Y="0" COORD3D_TRANS_Z="0" COORD_DIMENSION="0" EXTERNAL_CALIB_FILE="" EXTR_ROT_1="0.012" EXTR_ROT_2="-0.014" EXTR_ROT_3="0.22700000000000001" EXTR_TRANS_1="50.128" EXTR_TRANS_2="23.611999999999998" EXTR_TRANS_3="-400.09800000000001" FIX="1" ROTATE="0" SCALE="100" SHOW="0" SHOW_CALIB_POINTS="0" TRANS_X="0" TRANS_Y="0" UNIT="100" USE_INTRINSIC_CENTER="0"/>
<ALIGNMENT_GRID FIX="1" GRID3D_RESOLUTION="100" GRID3D_TRANS_X="0" GRID3D_TRANS_Y="0" GRID3D_TRANS_Z="0" GRID_DIMENSION="0" ROTATE="0" SCALE="100" SHOW="0" TRANS_X="0" TRANS_Y="0"/>
</CALIBRATION>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.1">
<PETRACK VERSION="0.9.2">
<MAIN SRC="markerCasern.avi" STATUS_HEIGHT="180"/>
<CONTROL TAB="0">
<CALIBRATION>
......@@ -10,7 +10,7 @@
<SWAP ENABLED="0" HORIZONTALLY="0" VERTICALLY="0"/>
<BG_SUB DELETE="1" DELETE_NUMBER="3" ENABLED="0" FILE="" SHOW="0" UPDATE="0"/>
<PATTERN BOARD_SIZE_X="6" BOARD_SIZE_Y="8" SQUARE_SIZE="4.5999999"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="589.5" CY="461.5" ENABLED="1" FIX_CENTER="1" FX="882.15999999999997" FY="882.15999999999997" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="1" R2="-0.378664" R4="0.15861700000000001" R6="0" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="-0.000241" TY="0.00031199999999999999"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="589.5" CY="461.5" ENABLED="1" EXT_MODEL_ENABLED="0" FIX_CENTER="1" FX="882.15999999999997" FY="882.15999999999997" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="1" R2="-0.378664" R4="0.15861700000000001" R6="0" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="-0.000241" TY="0.00031199999999999999"/>
<EXTRINSIC_PARAMETERS ALTITUDE="537" COORD3D_AXIS_LEN="200" COORD3D_SWAP_X="0" COORD3D_SWAP_Y="0" COORD3D_SWAP_Z="0" COORD3D_TRANS_X="0" COORD3D_TRANS_Y="0" COORD3D_TRANS_Z="0" COORD_DIMENSION="1" EXTERNAL_CALIB_FILE="" EXTR_ROT_1="0" EXTR_ROT_2="0" EXTR_ROT_3="0" EXTR_TRANS_1="0" EXTR_TRANS_2="0" EXTR_TRANS_3="-500" FIX="1" ROTATE="27" SCALE="767" SHOW="1" SHOW_CALIB_POINTS="0" TRANS_X="5179" TRANS_Y="2170" UNIT="46" USE_INTRINSIC_CENTER="0"/>
<ALIGNMENT_GRID FIX="1" GRID3D_RESOLUTION="100" GRID3D_TRANS_X="0" GRID3D_TRANS_Y="0" GRID3D_TRANS_Z="0" GRID_DIMENSION="1" ROTATE="27" SCALE="768" SHOW="1" TRANS_X="245" TRANS_Y="657"/>
</CALIBRATION>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.1">
<PETRACK VERSION="0.9.2">
<MAIN SRC="markerJapan/000100000.jpg" STATUS_HEIGHT="0"/>
<CONTROL TAB="0">
<CALIBRATION>
......@@ -10,7 +10,7 @@
<SWAP ENABLED="0" HORIZONTALLY="0" VERTICALLY="0"/>
<BG_SUB DELETE="1" DELETE_NUMBER="3" ENABLED="0" FILE="" SHOW="0" UPDATE="0"/>
<PATTERN BOARD_SIZE_X="6" BOARD_SIZE_Y="8" SQUARE_SIZE="4.5999999"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="973" CY="620" ENABLED="1" FIX_CENTER="0" FX="1653.49" FY="1673.5599999999999" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="0.00068099999999999996" R4="-0.22715399999999999" R6="0" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="0.0042729999999999999" TY="0.00044799999999999999"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="973" CY="620" ENABLED="1" EXT_MODEL_ENABLED="0" FIX_CENTER="0" FX="1653.49" FY="1673.5599999999999" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="0.00068099999999999996" R4="-0.22715399999999999" R6="0" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="0.0042729999999999999" TY="0.00044799999999999999"/>
<EXTRINSIC_PARAMETERS ALTITUDE="2035" COORD3D_AXIS_LEN="200" COORD3D_SWAP_X="0" COORD3D_SWAP_Y="0" COORD3D_SWAP_Z="0" COORD3D_TRANS_X="0" COORD3D_TRANS_Y="0" COORD3D_TRANS_Z="0" COORD_DIMENSION="1" EXTERNAL_CALIB_FILE="" EXTR_ROT_1="0" EXTR_ROT_2="0" EXTR_ROT_3="0" EXTR_TRANS_1="0" EXTR_TRANS_2="0" EXTR_TRANS_3="-500" FIX="1" ROTATE="3594" SCALE="1000" SHOW="1" SHOW_CALIB_POINTS="0" TRANS_X="14450" TRANS_Y="5468" UNIT="120" USE_INTRINSIC_CENTER="0"/>
<ALIGNMENT_GRID FIX="1" GRID3D_RESOLUTION="100" GRID3D_TRANS_X="0" GRID3D_TRANS_Y="0" GRID3D_TRANS_Z="0" GRID_DIMENSION="1" ROTATE="895" SCALE="1001" SHOW="0" TRANS_X="392" TRANS_Y="586"/>
</CALIBRATION>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.1">
<PETRACK VERSION="0.9.2">
<MAIN SRC="multiColorMarkerWithAruco.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="1">
<CALIBRATION>
......@@ -10,7 +10,7 @@
<SWAP ENABLED="0" HORIZONTALLY="0" VERTICALLY="0"/>
<BG_SUB DELETE="1" DELETE_NUMBER="3" ENABLED="0" FILE="" SHOW="0" UPDATE="0"/>
<PATTERN BOARD_SIZE_X="6" BOARD_SIZE_Y="8" SQUARE_SIZE="4.5999999"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="983.10000000000002" CY="572.13" ENABLED="1" FIX_CENTER="0" FX="1860.1700000000001" FY="1862.24" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.37733299999999997" R4="0.242947" R6="-0.15323500000000001" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="-0.0040350000000000004" TY="-0.001372"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="983.10000000000002" CY="572.13" ENABLED="1" EXT_MODEL_ENABLED="0" FIX_CENTER="0" FX="1860.1700000000001" FY="1862.24" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.37733299999999997" R4="0.242947" R6="-0.15323500000000001" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="-0.0040350000000000004" TY="-0.001372"/>
<EXTRINSIC_PARAMETERS ALTITUDE="535" COORD3D_AXIS_LEN="200" COORD3D_SWAP_X="0" COORD3D_SWAP_Y="0" COORD3D_SWAP_Z="0" COORD3D_TRANS_X="0" COORD3D_TRANS_Y="0" COORD3D_TRANS_Z="0" COORD_DIMENSION="0" EXTERNAL_CALIB_FILE="" EXTR_ROT_1="-2.1299999999999999" EXTR_ROT_2="2.1579999999999999" EXTR_ROT_3="-0.036999999999999998" EXTR_TRANS_1="14.253" EXTR_TRANS_2="14.198" EXTR_TRANS_3="-528.09799999999996" FIX="0" ROTATE="0" SCALE="100" SHOW="0" SHOW_CALIB_POINTS="0" TRANS_X="0" TRANS_Y="0" UNIT="100" USE_INTRINSIC_CENTER="0"/>
<ALIGNMENT_GRID FIX="0" GRID3D_RESOLUTION="100" GRID3D_TRANS_X="0" GRID3D_TRANS_Y="0" GRID3D_TRANS_Z="0" GRID_DIMENSION="0" ROTATE="0" SCALE="100" SHOW="0" TRANS_X="0" TRANS_Y="0"/>
</CALIBRATION>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.1">
<PETRACK VERSION="0.9.2">
<MAIN SRC="multiColorMarkerWithAruco_dictMip36h12.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="1">
<CALIBRATION>
......@@ -10,7 +10,7 @@
<SWAP ENABLED="0" HORIZONTALLY="0" VERTICALLY="0"/>
<BG_SUB DELETE="1" DELETE_NUMBER="3" ENABLED="0" FILE="" SHOW="0" UPDATE="0"/>
<PATTERN BOARD_SIZE_X="6" BOARD_SIZE_Y="8" SQUARE_SIZE="4.5999999"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="2380.0599999999999" CY="1911.8699999999999" ENABLED="1" FIX_CENTER="0" FX="1716.1300000000001" FY="1716.6199999999999" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.23147100000000001" R4="0.060733000000000002" R6="-0.0072639999999999996" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="0.000106" TY="0.00046500000000000003"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="2380.0599999999999" CY="1911.8699999999999" ENABLED="1" EXT_MODEL_ENABLED="0" FIX_CENTER="0" FX="1716.1300000000001" FY="1716.6199999999999" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.23147100000000001" R4="0.060733000000000002" R6="-0.0072639999999999996" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="0.000106" TY="0.00046500000000000003"/>
<EXTRINSIC_PARAMETERS ALTITUDE="535" COORD3D_AXIS_LEN="200" COORD3D_SWAP_X="0" COORD3D_SWAP_Y="0" COORD3D_SWAP_Z="0" COORD3D_TRANS_X="0" COORD3D_TRANS_Y="0" COORD3D_TRANS_Z="0" COORD_DIMENSION="0" EXTERNAL_CALIB_FILE="" EXTR_ROT_1="3.1219999999999999" EXTR_ROT_2="0.041000000000000002" EXTR_ROT_3="0.050999999999999997" EXTR_TRANS_1="-1.2969999999999999" EXTR_TRANS_2="6.5439999999999996" EXTR_TRANS_3="-423.565" FIX="0" ROTATE="0" SCALE="100" SHOW="0" SHOW_CALIB_POINTS="0" TRANS_X="0" TRANS_Y="0" UNIT="100" USE_INTRINSIC_CENTER="0"/>
<ALIGNMENT_GRID FIX="0" GRID3D_RESOLUTION="100" GRID3D_TRANS_X="0" GRID3D_TRANS_Y="0" GRID3D_TRANS_Z="0" GRID_DIMENSION="0" ROTATE="0" SCALE="100" SHOW="0" TRANS_X="0" TRANS_Y="0"/>
</CALIBRATION>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE PETRACK>
<PETRACK VERSION="0.9.1">
<PETRACK VERSION="0.9.2">
<MAIN SRC="multicolor.mp4" STATUS_HEIGHT="0"/>
<CONTROL TAB="2">
<CALIBRATION>
......@@ -10,7 +10,7 @@
<SWAP ENABLED="0" HORIZONTALLY="0" VERTICALLY="0"/>
<BG_SUB DELETE="1" DELETE_NUMBER="3" ENABLED="0" FILE="" SHOW="0" UPDATE="0"/>
<PATTERN BOARD_SIZE_X="6" BOARD_SIZE_Y="8" SQUARE_SIZE="4.5999999"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="1134.04" CY="880.72000000000003" ENABLED="1" FIX_CENTER="0" FX="842.57000000000005" FY="842.69000000000005" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.27662599999999998" R4="0.093287999999999996" R6="-0.01423" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="-0.00024699999999999999" TY="5.5000000000000002e-05"/>
<INTRINSIC_PARAMETERS CALIB_FILES="" CX="1134.04" CY="880.72000000000003" ENABLED="1" EXT_MODEL_ENABLED="0" FIX_CENTER="0" FX="842.57000000000005" FY="842.69000000000005" K4="0" K5="0" K6="0" QUAD_ASPECT_RATIO="0" R2="-0.27662599999999998" R4="0.093287999999999996" R6="-0.01423" ReprError="nan" S1="0" S2="0" S3="0" S4="0" TANG_DIST="1" TAUX="0" TAUY="0" TX="-0.00024699999999999999" TY="5.5000000000000002e-05"/>
<EXTRINSIC_PARAMETERS ALTITUDE="535" COORD3D_AXIS_LEN="200" COORD3D_SWAP_X="0" COORD3D_SWAP_Y="1" COORD3D_SWAP_Z="0" COORD3D_TRANS_X="0" COORD3D_TRANS_Y="0" COORD3D_TRANS_Z="0" COORD_DIMENSION="0" EXTERNAL_CALIB_FILE="" EXTR_ROT_1="-2.1920000000000002" EXTR_ROT_2="-2.1829999999999998" EXTR_ROT_3="0.016" EXTR_TRANS_1="-1043.473" EXTR_TRANS_2="13.741" EXTR_TRANS_3="-626.84199999999998" FIX="0" ROTATE="0" SCALE="100" SHOW="0" SHOW_CALIB_POINTS="0" TRANS_X="0" TRANS_Y="0" UNIT="100" USE_INTRINSIC_CENTER="0"/>
<ALIGNMENT_GRID FIX="0" GRID3D_RESOLUTION="100" GRID3D_TRANS_X="91" GRID3D_TRANS_Y="34" GRID3D_TRANS_Z="0" GRID_DIMENSION="0" ROTATE="0" SCALE="100" SHOW="0" TRANS_X="0" TRANS_Y="0"/>
</CALIBRATION>
......
......@@ -23,31 +23,31 @@
#include <catch2/catch.hpp>
TEST_CASE("Petrack version strings are compared", "[lessThanVersion]")
TEST_CASE("Petrack version strings are compared", "[newerThanVersion]")
{
CHECK(lessThanVersion(QString("0.9.1"), QString("0.9.0")));
CHECK(lessThanVersion(QString("0.9.0"), QString("0.8.0")));
CHECK(lessThanVersion(QString("1.8.0"), QString("0.9.0")));
CHECK(lessThanVersion(QString("0.9.15"), QString("0.9.3")));
CHECK(lessThanVersion(QString("0.130.1"), QString("0.9.3")));
CHECK(lessThanVersion(QString("15.9.16"), QString("0.9.3")));
CHECK(newerThanVersion(QString("0.9.1"), QString("0.9.0")));
CHECK(newerThanVersion(QString("0.9.0"), QString("0.8.0")));
CHECK(newerThanVersion(QString("1.8.0"), QString("0.9.0")));
CHECK(newerThanVersion(QString("0.9.15"), QString("0.9.3")));
CHECK(newerThanVersion(QString("0.130.1"), QString("0.9.3")));
CHECK(newerThanVersion(QString("15.9.16"), QString("0.9.3")));
CHECK_FALSE(lessThanVersion(QString("0.9.0"), QString("0.9.1")));
CHECK_FALSE(lessThanVersion(QString("0.8.0"), QString("0.9.0")));
CHECK_FALSE(lessThanVersion(QString("0.9.0"), QString("1.9.0")));
CHECK_FALSE(lessThanVersion(QString("0.9.0"), QString("0.9.0")));
CHECK_FALSE(lessThanVersion(QString("0.9.1"), QString("0.9.13")));
CHECK_FALSE(lessThanVersion(QString("0.9.1"), QString("0.967.13")));
CHECK_FALSE(lessThanVersion(QString("0.9.1"), QString("19.9.13")));
CHECK_FALSE(newerThanVersion(QString("0.9.0"), QString("0.9.1")));
CHECK_FALSE(newerThanVersion(QString("0.8.0"), QString("0.9.0")));
CHECK_FALSE(newerThanVersion(QString("0.9.0"), QString("1.9.0")));
CHECK_FALSE(newerThanVersion(QString("0.9.0"), QString("0.9.0")));
CHECK_FALSE(newerThanVersion(QString("0.9.1"), QString("0.9.13")));
CHECK_FALSE(newerThanVersion(QString("0.9.1"), QString("0.967.13")));
CHECK_FALSE(newerThanVersion(QString("0.9.1"), QString("19.9.13")));
CHECK_THROWS(lessThanVersion(QString("0.8.k"), QString("0.9.0")));
CHECK_THROWS(lessThanVersion(QString("0.8.9"), QString("0.9.k")));
CHECK_THROWS(lessThanVersion(QString("0.k.9"), QString("0.9.0")));
CHECK_THROWS(lessThanVersion(QString("0.8.9"), QString("0.k.9")));
CHECK_THROWS(lessThanVersion(QString("k.8.9"), QString("0.9.0")));
CHECK_THROWS(lessThanVersion(QString("0.8.9"), QString("k.9.0")));
CHECK_THROWS(lessThanVersion(QString("0.8.9"), QString("k.9.0")));
CHECK_THROWS(lessThanVersion(QString("0.8.9"), QString("k.15.0")));
CHECK_THROWS(lessThanVersion(QString("0.8k.9"), QString("0.15.0")));
CHECK_THROWS(lessThanVersion(QString("0.9.0.1"), QString("0.9.1")));
CHECK_THROWS(newerThanVersion(QString("0.8.k"), QString("0.9.0")));
CHECK_THROWS(newerThanVersion(QString("0.8.9"), QString("0.9.k")));
CHECK_THROWS(newerThanVersion(QString("0.k.9"), QString("0.9.0")));
CHECK_THROWS(newerThanVersion(QString("0.8.9"), QString("0.k.9")));
CHECK_THROWS(newerThanVersion(QString("k.8.9"), QString("0.9.0")));
CHECK_THROWS(newerThanVersion(QString("0.8.9"), QString("k.9.0")));
CHECK_THROWS(newerThanVersion(QString("0.8.9"), QString("k.9.0")));
CHECK_THROWS(newerThanVersion(QString("0.8.9"), QString("k.15.0")));
CHECK_THROWS(newerThanVersion(QString("0.8k.9"), QString("0.15.0")));
CHECK_THROWS(newerThanVersion(QString("0.9.0.1"), QString("0.9.1")));
}
......@@ -1120,7 +1120,7 @@
</widget>
</item>
<item row="0" column="3">
<widget class="QCheckBox" name="newModelCheckBox">
<widget class="QCheckBox" name="extModelCheckBox">
<property name="toolTip">
<string>Perform calibration with extended parameter set (14 instead of 5)</string>
</property>
......@@ -7891,7 +7891,7 @@
<tabstop>quadAspectRatio</tabstop>
<tabstop>fixCenter</tabstop>
<tabstop>tangDist</tabstop>
<tabstop>newModelCheckBox</tabstop>
<tabstop>extModelCheckBox</tabstop>
<tabstop>boardSizeX</tabstop>
<tabstop>boardSizeY</tabstop>
<tabstop>squareSize</tabstop>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment