From c5de4256efb6dca48a564f77b6ee223dcd3ba181 Mon Sep 17 00:00:00 2001 From: valorun Date: Thu, 7 May 2020 12:11:28 +0200 Subject: [PATCH] fix color picking segmentation + compilation error --- ColorimetricSegmenter.cpp | 8 +++++++- QuantiDialog.cpp | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ColorimetricSegmenter.cpp b/ColorimetricSegmenter.cpp index 6e51f01..9947416 100644 --- a/ColorimetricSegmenter.cpp +++ b/ColorimetricSegmenter.cpp @@ -692,8 +692,14 @@ void ColorimetricSegmenter::filterRgbWithSegmentation() return; } + // Retrieve parameters from dialog + if (m_app->pickingHub()) { + m_pickingHub = m_app->pickingHub(); + } + // Retrieve parameters from dialog - rgbDlg = new RgbDialog(m_pickingHub, (QWidget*)m_app->getMainWindow()); + rgbDlg = new RgbDialog(m_pickingHub, (QWidget*)m_app->getMainWindow()); + rgbDlg->show(); auto start = std::chrono::high_resolution_clock::now(); diff --git a/QuantiDialog.cpp b/QuantiDialog.cpp index ecb3a47..f780cbf 100644 --- a/QuantiDialog.cpp +++ b/QuantiDialog.cpp @@ -1,6 +1,6 @@ #include "QuantiDialog.h" - +#include #include QuantiDialog::QuantiDialog(QWidget* parent) : QDialog(parent) @@ -21,5 +21,5 @@ QuantiDialog::QuantiDialog(QWidget* parent) */ void QuantiDialog::updateLabelValues() { - nb_color_label->setText(QString::fromStdString(std::to_string(static_cast(pow(area_quanti->value(), 3))))); + nb_color_label->setText(QString::fromStdString(std::to_string(static_cast(pow(area_quanti->value(), 3))))); }