diff --git a/src/imagepipeline.cpp b/src/imagepipeline.cpp index 30ecf13..9cfc8ba 100644 --- a/src/imagepipeline.cpp +++ b/src/imagepipeline.cpp @@ -99,7 +99,12 @@ cv::Mat ImagePipeline::process(const Profile profile, std::vector RemapedImage remaped = applyRemap(image.mat, camera.remapMap); qDebug()<<"Camera"< if(remapedImages.size() > 0) { - std::sort(remapedImages.begin(), remapedImages.end(), [](const RemapedImage& imgA, const RemapedImage& imgB) -> bool {return imgA.origin.x < imgB.origin.x;}); + std::sort(remapedImages.begin(), remapedImages.end(), + [](const RemapedImage& imgA, const RemapedImage& imgB) -> bool {return imgA.origin.x < imgB.origin.x;}); cv::Mat output; if(simpleStichingAlg) output = simpleStich(remapedImages); diff --git a/src/profile.cpp b/src/profile.cpp index 0c36839..09cad30 100644 --- a/src/profile.cpp +++ b/src/profile.cpp @@ -66,6 +66,7 @@ void Profile::store(QSettings& settings) const settings.setValue(GROUP + QString("/exposureTime"), exposureTime); settings.setValue(GROUP + QString("/name"), name_); settings.setValue(GROUP + QString("/nodistort"), nodistort); + settings.setValue(GROUP + QString("/kfact"), kFactor); if(lightmap.data) cv::imwrite((profileLocation() + QString::number(id) + ".lightmap.png").toStdString(), lightmap); @@ -97,6 +98,8 @@ void Profile::load(QSettings &settings) name_ = settings.value(GROUP + QString("/name"), "NULL").toString(); nodistort = settings.value(GROUP + QString("/nodistort"), "NULL").toBool(); + kFactor = settings.value(GROUP + QString("/kfact"), 0).toDouble(); + lightmap = cv::imread((profileLocation() + QString::number(id) + ".lightmap.png").toStdString()); int size = settings.beginReadArray(GROUP + QString("/cameras")); diff --git a/src/profile.h b/src/profile.h index 3b73827..1ce2e00 100644 --- a/src/profile.h +++ b/src/profile.h @@ -48,6 +48,7 @@ public: cv::Mat calcurve; std::vector cameras; bool nodistort = false; + float kFactor = 0; Profile(const QString& name = ""); void store(QSettings& settings) const; diff --git a/src/ui/editprofiledialog.cpp b/src/ui/editprofiledialog.cpp index fef18d9..40490c3 100644 --- a/src/ui/editprofiledialog.cpp +++ b/src/ui/editprofiledialog.cpp @@ -50,6 +50,7 @@ EditProfileDialog::EditProfileDialog(Cameras* cameras, const Profile profile, QW connect(ui->doubleSpinBoxBrightness, QOverload::of(&QDoubleSpinBox::valueChanged), [this](double in){profile_.lighting.brightness = in/100.0;}); connect(ui->doubleSpinBoxExposure, QOverload::of(&QDoubleSpinBox::valueChanged), [this](double in){profile_.exposureTime = in;}); + connect(ui->doubleSpinBox_kFactor, QOverload::of(&QDoubleSpinBox::valueChanged), [this](double in){profile_.kFactor = in;}); connect(ui->lineEditName, &QLineEdit::textChanged, [this](QString in){profile_.setName(in);}); connect(ui->checkBoxCh1, &QCheckBox::clicked, this, &EditProfileDialog::setMask); connect(ui->checkBoxCh2, &QCheckBox::clicked, this, &EditProfileDialog::setMask); diff --git a/src/ui/editprofiledialog.ui b/src/ui/editprofiledialog.ui index 5c4552b..8066c6e 100644 --- a/src/ui/editprofiledialog.ui +++ b/src/ui/editprofiledialog.ui @@ -192,25 +192,35 @@ + + + + 10 + + + + + k factor: + + + + + + + -100.000000000000000 + + + 100.000000000000000 + + + + + 10 - - - - Calibration curve: - - - - - - - Lightmap: - - - @@ -227,6 +237,20 @@ + + + + Load + + + + + + + Lightmap: + + + @@ -240,10 +264,17 @@ - - + + - Load + Clear + + + + + + + Calibration curve: @@ -263,13 +294,6 @@ - - - - Clear - - -