MasterArbeit/MAClient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change stiching method

Browse source 
add camera temperature readout
This commit is contained in:
uvos 2021-07-05 11:27:38 +02:00
parent ea3b870c0a
commit 48a04fdf79
10 changed files with 128 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/imagepipeline.cpp
View file

@ -6,6 +6,7 @@
#include <QFuture>
#include <QDebug>
#include <algorithm>
#include <opencv2/highgui.hpp>
ImagePipeline::ImagePipeline(Cameras* cameras, QObject *parent): QObject(parent), cameras_(cameras)
{
@ -14,7 +15,7 @@ ImagePipeline::ImagePipeline(Cameras* cameras, QObject *parent): QObject(parent)
cv::Mat ImagePipeline::process(const Profile profile, std::vector<Camera::Image> images)
{
qDebug()<<__FUNCTION__<<"got"<<images.size()<<"images";
qDebug()<<__func__<<"got"<<images.size()<<"images";
std::vector<RemapedImage> remapedImages;
remapedImages.reserve(images.size());
@ -80,7 +81,13 @@ cv::Mat ImagePipeline::process(const Profile profile, std::vector<Camera::Image>
if(remapedImages.size() > 0)
{
std::sort(remapedImages.begin(), remapedImages.end(), [](const RemapedImage& imgA, const RemapedImage& imgB) -> bool {return imgA.origin.x < imgB.origin.x;});
cv::Mat output = simpleStich(remapedImages);
cv::Mat output = stich(remapedImages);
if(output.depth() != CV_8U)
output.convertTo(output, CV_8U);
if(output.channels() == 3)
cv::cvtColor(output, output, cv::COLOR_BGR2GRAY);
output.convertTo(output, CV_32FC1, 1.0/255.0, 0);
if(profile.lightmap.data)