|
|
@@ -16,6 +16,7 @@
|
|
|
#include <thread>
|
|
|
#include <atomic>
|
|
|
#include <mutex>
|
|
|
+#include <functional>
|
|
|
|
|
|
// 非 free 模块,Felgo Android 已默认 opencv_contrib 之外的子模块编译
|
|
|
#include <opencv2/photo.hpp> // CLAHE
|
|
|
@@ -32,7 +33,7 @@ struct ScopedTimer {
|
|
|
~ScopedTimer() {
|
|
|
qint64 ms = QDateTime::currentMSecsSinceEpoch() - startMs;
|
|
|
LOG("[{}] elapsed = {} ms", label.toStdString(), (long long)ms);
|
|
|
- qDebug().noquote() << "[Timing]" << label << "=" << ms << "ms";
|
|
|
+ DEBUG("[Timing] {} = {}ms", label.toStdString(), (long long)ms);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -81,7 +82,7 @@ static size_t estimateFusionMemoryMBWork(int rows, int cols, int channels, int n
|
|
|
16.0; // Laplacian pyramid
|
|
|
const double fusedBytes = 12.0 * workRows * workCols;
|
|
|
return (size_t)(((origBytes + workBytes * workRows * workCols) * nImages + fusedBytes)
|
|
|
- / (1024.0 * 1024.0));
|
|
|
+ / (1024.0 * 1024.0));
|
|
|
}
|
|
|
|
|
|
// 限制 OpenCV 内部线程数,避免与 std::async 叠加炸线程
|
|
|
@@ -90,7 +91,7 @@ static void capOpenCVThreads() {
|
|
|
if (hw <= 0) hw = 2;
|
|
|
int cap = std::min(hw, 2); // 显微场景硬限 2 线程,避免 OOM
|
|
|
cv::setNumThreads(cap);
|
|
|
- qDebug() << "[Fusion] OpenCV threads capped to" << cap;
|
|
|
+ DEBUG("[Fusion] OpenCV threads capped to {}", cap);
|
|
|
}
|
|
|
|
|
|
// ============== 内部融合算法实现 ==============
|
|
|
@@ -181,7 +182,7 @@ static void buildGaussianPyramid(const cv::Mat& src, std::vector<cv::Mat>& pyr,
|
|
|
|
|
|
// 3) 构建拉普拉斯金字塔(图像金字塔用),对各层做拉普拉斯差分
|
|
|
static void buildLaplacianPyramid(const std::vector<cv::Mat>& gauss,
|
|
|
- std::vector<cv::Mat>& lap, int levels) {
|
|
|
+ std::vector<cv::Mat>& lap, int levels) {
|
|
|
lap.assign(levels, cv::Mat());
|
|
|
// 与 gauss 同深度(保留通道数:3 通道图 → 3 通道 Laplacian)
|
|
|
const int depth = (gauss.empty() ? CV_32F : gauss[0].depth());
|
|
|
@@ -198,7 +199,7 @@ static void buildLaplacianPyramid(const std::vector<cv::Mat>& gauss,
|
|
|
|
|
|
// 4) 拉普拉斯金字塔重构:从顶层向下叠加重构
|
|
|
static void reconstructFromLaplacianPyramid(const std::vector<cv::Mat>& lap,
|
|
|
- cv::Mat& out, int levels) {
|
|
|
+ cv::Mat& out, int levels) {
|
|
|
cv::Mat cur = lap[levels - 1].clone();
|
|
|
for (int i = levels - 2; i >= 0; --i) {
|
|
|
cv::Mat up;
|
|
|
@@ -223,7 +224,7 @@ static cv::Mat pyramidBlendFusion(const std::vector<cv::Mat>& images, int reques
|
|
|
while (std::min(h, w) >= 16) { ++autoMaxLevels; h /= 2; w /= 2; }
|
|
|
}
|
|
|
int levels = std::max(2, std::min(requestedLevels, autoMaxLevels));
|
|
|
- qDebug() << "[Pyramid] Using" << levels << "levels (max" << autoMaxLevels << ")";
|
|
|
+ DEBUG("[Pyramid] Using {} levels (max {})", levels, autoMaxLevels);
|
|
|
|
|
|
capOpenCVThreads();
|
|
|
|
|
|
@@ -421,8 +422,7 @@ static cv::Mat weightedLaplacianFusion(const std::vector<cv::Mat>& images,
|
|
|
const int cols = images[0].cols;
|
|
|
const int ch = images[0].channels();
|
|
|
|
|
|
- qDebug() << "[FlatFusion] N=" << N << "size=" << cols << "x" << rows
|
|
|
- << "wp=" << weightPow << "sigma=" << smoothSigma;
|
|
|
+ DEBUG("[FlatFusion] N={} size={}x{} wp={} sigma={}", N, cols, rows, weightPow, smoothSigma);
|
|
|
|
|
|
capOpenCVThreads();
|
|
|
|
|
|
@@ -519,6 +519,16 @@ static cv::Mat weightedLaplacianFusion(const std::vector<cv::Mat>& images,
|
|
|
|
|
|
// 内部同步融合方法
|
|
|
QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
|
|
|
+ return fuseImages(imagePaths, nullptr);
|
|
|
+}
|
|
|
+
|
|
|
+QString OpencvFunc::fuseImages(const QStringList& imagePaths, std::function<void(const QString&, int)> progressCallback) {
|
|
|
+ auto report = [&progressCallback](const QString &msg, int percent) {
|
|
|
+ if (progressCallback) {
|
|
|
+ progressCallback(msg, percent);
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
QElapsedTimer totalTimer; totalTimer.start();
|
|
|
QElapsedTimer stageTimer;
|
|
|
try {
|
|
|
@@ -541,6 +551,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
|
|
|
qWarning() << "First image invalid:" << firstPath;
|
|
|
return QString();
|
|
|
}
|
|
|
+ report(QString("加载图片 1/%1...").arg(N), 5);
|
|
|
cv::Mat first = cv::imread(firstPath.toStdString(), cv::IMREAD_COLOR);
|
|
|
if (first.empty()) {
|
|
|
qWarning() << "Failed to load first image:" << firstPath;
|
|
|
@@ -556,8 +567,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
|
|
|
const size_t estMB = estimateFusionMemoryMB(rows, cols, channels, N);
|
|
|
LOG("[fuseImages] estimated peak memory (orig-res) = {} MB for {}x{}x{}x{}",
|
|
|
(long long)estMB, N, rows, cols, channels);
|
|
|
- qDebug().noquote() << "[Fusion] estimated memory (orig-res) ~" << estMB << "MB for"
|
|
|
- << N << "x" << rows << "x" << cols;
|
|
|
+ DEBUG("[Fusion] estimated memory (orig-res) ~ {} MB for {}x{}x{}x{}", (long long)estMB, N, rows, cols, channels);
|
|
|
|
|
|
// 工作分辨率(与 fuseAdvanced 内部 WORK_MAX_EDGE 保持一致)
|
|
|
int workRows = rows, workCols = cols;
|
|
|
@@ -573,8 +583,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
|
|
|
estimateFusionMemoryMBWork(rows, cols, channels, N, workRows, workCols);
|
|
|
LOG("[fuseImages] estimated peak memory (work-res {}x{}) = {} MB",
|
|
|
workCols, workRows, (long long)estMBWork);
|
|
|
- qDebug().noquote() << QString("[Fusion] estimated memory (work %1x%2) ~ %3 MB")
|
|
|
- .arg(workCols).arg(workRows).arg(estMBWork);
|
|
|
+ DEBUG("[Fusion] estimated memory (work {}x{}) ~ {} MB", workCols, workRows, (long long)estMBWork);
|
|
|
|
|
|
// 硬上限:使用工作分辨率估算,且区分平台(Android 更严,Linux/嵌入式宽松)
|
|
|
// - Android: 512MB
|
|
|
@@ -595,6 +604,8 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
|
|
|
}
|
|
|
|
|
|
// ---- 阶段 2:加载剩余图(受控并行:最多 4 worker)----
|
|
|
+ report(QString("加载剩余图片..."), 15);
|
|
|
+
|
|
|
std::vector<cv::Mat> loaded;
|
|
|
loaded.reserve(N);
|
|
|
loaded.push_back(std::move(first));
|
|
|
@@ -640,10 +651,12 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
|
|
|
}
|
|
|
qint64 loadMs = stageTimer.elapsed();
|
|
|
LOG("[fuseImages] loaded {} images in {} ms", (int)loaded.size(), (long long)loadMs);
|
|
|
- qDebug().noquote() << "[Fusion]" << "Loaded" << loaded.size() << "images in" << loadMs << "ms";
|
|
|
+ report(QString("加载完成,共%1张图片").arg(loaded.size()), 25);
|
|
|
+ DEBUG("[Fusion] Loaded {} images in {} ms", (int)loaded.size(), (long long)loadMs);
|
|
|
|
|
|
// ---- 阶段 3:尺寸归一化 ----
|
|
|
stageTimer.restart();
|
|
|
+ report("归一化图片尺寸...", 30);
|
|
|
for (size_t i = 1; i < loaded.size(); ++i) {
|
|
|
if (loaded[i].rows != rows || loaded[i].cols != cols || loaded[i].channels() != channels) {
|
|
|
cv::Size gotSize = loaded[i].size();
|
|
|
@@ -672,16 +685,16 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
|
|
|
qint64 totalPixels = (qint64)loaded.size() * rows * cols;
|
|
|
LOG("[fuseImages] images={}, size={}x{}, channels={}, totalPixels={} ({:.2f} MP)",
|
|
|
(int)loaded.size(), rows, cols, channels, totalPixels, totalPixels / 1e6);
|
|
|
- qDebug().noquote() << QString("[Fusion] images=%1, size=%2x%3, channels=%4, MP=%5")
|
|
|
- .arg(loaded.size()).arg(rows).arg(cols).arg(channels)
|
|
|
- .arg(totalPixels / 1e6, 0, 'f', 2);
|
|
|
+ DEBUG("[Fusion] images={}, size={}x{}, channels={}, MP={:.2f}", (int)loaded.size(), rows, cols, channels, totalPixels / 1e6);
|
|
|
|
|
|
// ---- 阶段 4:高级融合流水线(CLAHE + ECC + 3级HaarDWT + 双边后处理)----
|
|
|
stageTimer.restart();
|
|
|
+ report("正在进行图像融合...", 35);
|
|
|
// 使用输入图片所在目录保存融合结果
|
|
|
QFileInfo firstFile(firstPath);
|
|
|
QString outDir = firstFile.absolutePath();
|
|
|
cv::Mat fused = fuseAdvanced(loaded, outDir);
|
|
|
+ report("融合完成", 45);
|
|
|
qint64 fuseMs = stageTimer.elapsed();
|
|
|
if (fused.empty()) {
|
|
|
qWarning() << "Fusion failed!";
|
|
|
@@ -690,28 +703,28 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
|
|
|
|
|
|
// ---- 阶段 5:保存 ----
|
|
|
stageTimer.restart();
|
|
|
+ report("保存融合结果...", 48);
|
|
|
QDir().mkpath(outDir);
|
|
|
QString timestamp = QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss");
|
|
|
- QString fileName = QString("fused_%1.png").arg(timestamp);
|
|
|
+ QString fileName = QString("fused_%1.jpg").arg(timestamp);
|
|
|
QString fullPath = outDir + "/" + fileName;
|
|
|
|
|
|
// 用 PNG 无损保存——JPEG 在 quality=92 仍会引入 8x8 DCT 块伪影,
|
|
|
// 在显微多焦点融合结果(高频细节 + 局部对比拉伸)上会显现为网格阴影。
|
|
|
// PNG 无损,融合结果所见即所得;文件大小对显微图可接受。
|
|
|
- std::vector<int> params = {cv::IMWRITE_PNG_COMPRESSION, 3};
|
|
|
+ std::vector<int> params = {cv::IMWRITE_JPEG_QUALITY, 95};
|
|
|
if (!cv::imwrite(fullPath.toStdString(), fused, params)) {
|
|
|
qWarning() << "Failed to save fused image:" << fullPath;
|
|
|
return QString();
|
|
|
}
|
|
|
+ report("保存完成", 50);
|
|
|
qint64 saveMs = stageTimer.elapsed();
|
|
|
|
|
|
qint64 totalMs = totalTimer.elapsed();
|
|
|
LOG("[fuseImages] total = {} ms (load={} norm={} fuse={} save={})",
|
|
|
(long long)totalMs, (long long)loadMs, (long long)normMs,
|
|
|
(long long)fuseMs, (long long)saveMs);
|
|
|
- qDebug().noquote() << QString("[Fusion] TOTAL=%1ms (load=%2 norm=%3 fuse=%4 save=%5) -> %6")
|
|
|
- .arg(totalMs).arg(loadMs).arg(normMs).arg(fuseMs).arg(saveMs)
|
|
|
- .arg(fullPath);
|
|
|
+ DEBUG("[Fusion] TOTAL={}ms (load={} norm={} fuse={} save={}) -> {}", (long long)totalMs, (long long)loadMs, (long long)normMs, (long long)fuseMs, (long long)saveMs, fullPath.toStdString());
|
|
|
return fullPath;
|
|
|
} catch (const cv::Exception& e) {
|
|
|
qCritical() << "OpenCV exception in fuseImages:" << e.what();
|
|
|
@@ -757,7 +770,7 @@ QString OpencvFunc::brenner(cv::Mat &image)
|
|
|
QString str;
|
|
|
if (image.size==0)
|
|
|
{
|
|
|
- qDebug() <<"空图片!";
|
|
|
+ DEBUG("空图片!");
|
|
|
return "";
|
|
|
}
|
|
|
cv::Mat gray_img;
|
|
|
@@ -766,7 +779,7 @@ QString OpencvFunc::brenner(cv::Mat &image)
|
|
|
}else if(image.channels() == 3){
|
|
|
cv::cvtColor(image, gray_img, COLOR_BGR2GRAY);
|
|
|
}else{
|
|
|
- qDebug() <<"不支持的通道数!";
|
|
|
+ WARN("不支持的通道数!");
|
|
|
}
|
|
|
// 修复点1: parallel_for_ 内累加到 result(double&) 是数据竞争,UB。
|
|
|
// 改用每行局部 double + reduce,OpenCV 的 parallel_for_ 不支持
|
|
|
@@ -844,7 +857,7 @@ QString OpencvFunc::calculateSharpness(const QImage& image){
|
|
|
QString OpencvFunc::Laplacian(cv::Mat &image){
|
|
|
if (image.size==0)
|
|
|
{
|
|
|
- qDebug() <<"空图片!";
|
|
|
+ DEBUG("空图片!");
|
|
|
return "";
|
|
|
}
|
|
|
cv::Mat grayImage;
|
|
|
@@ -910,7 +923,7 @@ int OpencvFunc::CustomSharpening(const QString &path)
|
|
|
// 在显微自动拍照 → 锐化 → 上传 的流程中,一旦代码异常,
|
|
|
// 原始 RAW 数据就丢了。改为写新文件 _sharp.png,原文件保留。
|
|
|
const QString outPath = QFileInfo(path).absolutePath() + "/"
|
|
|
- + QFileInfo(path).completeBaseName() + "_sharp.png";
|
|
|
+ + QFileInfo(path).completeBaseName() + "_sharp.png";
|
|
|
|
|
|
// 转换为浮点型以便进行精确计算
|
|
|
Mat srcFloat;
|
|
|
@@ -962,7 +975,7 @@ Mat OpencvFunc::qim2mat(QImage &qim)
|
|
|
CV_8UC4,(void*)qim.constBits(),qim.bytesPerLine());
|
|
|
break;
|
|
|
default:
|
|
|
- qDebug() <<"QImage to mat failed!";
|
|
|
+ DEBUG("QImage to mat failed!");
|
|
|
break;
|
|
|
}
|
|
|
return mat;
|
|
|
@@ -1551,7 +1564,7 @@ cv::Mat OpencvFunc::fuseAdvanced(const std::vector<cv::Mat>& images,
|
|
|
canon.push_back(ci);
|
|
|
}
|
|
|
const int N = (int)canon.size();
|
|
|
- qDebug() << "[HalconFusion] N=" << N << "size=" << cols << "x" << rows;
|
|
|
+ DEBUG("[HalconFusion] N={} size={}x{}", N, cols, rows);
|
|
|
|
|
|
// ---------- 2) 多尺度 AGD 清晰度图 ----------
|
|
|
//
|
|
|
@@ -1771,8 +1784,7 @@ cv::Mat OpencvFunc::fuseAdvanced(const std::vector<cv::Mat>& images,
|
|
|
}
|
|
|
#endif
|
|
|
//锐化
|
|
|
- qDebug() << "[HalconFusion] done, output" << cols << "x" << rows
|
|
|
- << "sigma=" << sigmaFuse;
|
|
|
+ DEBUG("[HalconFusion] done, output {}x{} sigma={}", cols, rows, sigmaFuse);
|
|
|
cv::Mat fused_sharp = unsharpMask(fused, 2.0, 3.0);
|
|
|
//对比度增强
|
|
|
cv::Mat fused_contrast = enhanceContrast(fused_sharp,0);
|
|
|
@@ -1821,7 +1833,7 @@ cv::Mat OpencvFunc::unsharpMask(const cv::Mat& src, double amount, double sigma)
|
|
|
cv::Mat result;
|
|
|
resultF32.convertTo(result, CV_8U);
|
|
|
|
|
|
- qDebug() << "[unsharpMask] done, amount=" << amount << "sigma=" << sigma;
|
|
|
+ DEBUG("[unsharpMask] done, amount={} sigma={}", amount, sigma);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
@@ -1886,8 +1898,8 @@ OpencvFunc::MicroscopeFocusMetrics OpencvFunc::evaluateFocusScore(const cv::Mat&
|
|
|
}
|
|
|
double cur = brennerSum.load(std::memory_order_relaxed);
|
|
|
while (!brennerSum.compare_exchange_weak(cur, cur + local,
|
|
|
- std::memory_order_relaxed,
|
|
|
- std::memory_order_relaxed)) {}
|
|
|
+ std::memory_order_relaxed,
|
|
|
+ std::memory_order_relaxed)) {}
|
|
|
});
|
|
|
out.brenner = brennerSum.load() / std::max(1, rows * cols);
|
|
|
|
|
|
@@ -1934,8 +1946,8 @@ static cv::Mat toLabLchannel(const cv::Mat& src, cv::Mat& labOut) {
|
|
|
// clipLimit = 2.0~4.0;>5 会过增强(噪声也放大)
|
|
|
// tileGridSize = 8(即 8x8 tiles,约 160x120 像素每块,匹配 20x 物镜视场)
|
|
|
cv::Mat OpencvFunc::enhanceContrastCLAHE(const cv::Mat& src,
|
|
|
- double clipLimit,
|
|
|
- int tileGridSize) {
|
|
|
+ double clipLimit,
|
|
|
+ int tileGridSize) {
|
|
|
if (src.empty()) return cv::Mat();
|
|
|
static cv::Ptr<cv::CLAHE> cachePtr;
|
|
|
static double cachedClip = 0;
|
|
|
@@ -1977,8 +1989,8 @@ cv::Mat OpencvFunc::enhanceContrastCLAHE(const cv::Mat& src,
|
|
|
// 显微相机最容易踩的坑: 极少数高亮点(如气泡反光)把 highPct 顶到 255,
|
|
|
// 一拉伸其它全压暗。改用百分位能彻底规避。
|
|
|
cv::Mat OpencvFunc::enhanceContrastAuto(const cv::Mat& src,
|
|
|
- double lowPct,
|
|
|
- double highPct) {
|
|
|
+ double lowPct,
|
|
|
+ double highPct) {
|
|
|
if (src.empty()) return cv::Mat();
|
|
|
cv::Mat gray;
|
|
|
if (src.channels() == 1) {
|
|
|
@@ -2111,7 +2123,7 @@ cv::Mat OpencvFunc::enhanceContrastGamma(const cv::Mat& src, double gamma, bool
|
|
|
// 显微推荐 sigmas = {15, 80, 250}
|
|
|
// 复杂度: O(N · Σ_i ksize² · HW) → 显微 5MP 比 CLAHE 慢 5~10x,但比 Laplacian 融合快
|
|
|
cv::Mat OpencvFunc::enhanceContrastRetinexMSR(const cv::Mat& src,
|
|
|
- const std::vector<double>& sigmas) {
|
|
|
+ const std::vector<double>& sigmas) {
|
|
|
if (src.empty()) return cv::Mat();
|
|
|
cv::Mat work;
|
|
|
if (src.channels() == 4) cv::cvtColor(src, work, cv::COLOR_BGRA2BGR);
|
|
|
@@ -2194,23 +2206,23 @@ cv::Mat OpencvFunc::enhanceContrast(const cv::Mat& src, int pipeline) {
|
|
|
if (src.empty()) return cv::Mat();
|
|
|
cv::Mat cur = src;
|
|
|
switch (pipeline) {
|
|
|
- case 0: return enhanceContrastCLAHE(cur);
|
|
|
- case 1: return enhanceContrastAuto(cur);
|
|
|
- case 2: return enhanceContrastGamma(cur, 1.0, true);
|
|
|
- case 3: return enhanceContrastRetinexMSR(cur);
|
|
|
- case 4: {
|
|
|
- cv::Mat a = enhanceContrastCLAHE(cur);
|
|
|
- return enhanceContrastAuto(a);
|
|
|
- }
|
|
|
- case 5: {
|
|
|
- cv::Mat a = enhanceContrastAuto(cur);
|
|
|
- return enhanceContrastRetinexMSR(a);
|
|
|
- }
|
|
|
- case 6: {
|
|
|
- cv::Mat g = enhanceContrastGamma(cur, 1.0, true);
|
|
|
- return enhanceContrastCLAHE(g);
|
|
|
- }
|
|
|
- default: return src.clone();
|
|
|
+ case 0: return enhanceContrastCLAHE(cur);
|
|
|
+ case 1: return enhanceContrastAuto(cur);
|
|
|
+ case 2: return enhanceContrastGamma(cur, 1.0, true);
|
|
|
+ case 3: return enhanceContrastRetinexMSR(cur);
|
|
|
+ case 4: {
|
|
|
+ cv::Mat a = enhanceContrastCLAHE(cur);
|
|
|
+ return enhanceContrastAuto(a);
|
|
|
+ }
|
|
|
+ case 5: {
|
|
|
+ cv::Mat a = enhanceContrastAuto(cur);
|
|
|
+ return enhanceContrastRetinexMSR(a);
|
|
|
+ }
|
|
|
+ case 6: {
|
|
|
+ cv::Mat g = enhanceContrastGamma(cur, 1.0, true);
|
|
|
+ return enhanceContrastCLAHE(g);
|
|
|
+ }
|
|
|
+ default: return src.clone();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -2267,9 +2279,9 @@ void OpencvFunc::enhanceContrastPathAsync(const QString& imagePath, int pipeline
|
|
|
// 显微相机在平坦区有 Poisson 噪声,普通 unsharp mask 会放大,
|
|
|
// sharpenMicroscope 不会。
|
|
|
cv::Mat OpencvFunc::sharpenMicroscope(const cv::Mat& src,
|
|
|
- double amount,
|
|
|
- double sigma,
|
|
|
- double noiseFloor) {
|
|
|
+ double amount,
|
|
|
+ double sigma,
|
|
|
+ double noiseFloor) {
|
|
|
TIMER_SCOPE("sharpenMicroscope");
|
|
|
if (src.empty()) return cv::Mat();
|
|
|
if (amount < 0) amount = 0;
|