diff --git a/materialscanner/camera-controller.cpp b/materialscanner/camera-controller.cpp index 339c3317bd3f01cb23cb82833d152c05a65105bd..99129e5f820c755371a2ad1518a00b0b648410da 100644 --- a/materialscanner/camera-controller.cpp +++ b/materialscanner/camera-controller.cpp @@ -1,5 +1,5 @@ #include "camera-controller.h" -#include<qdebug.h> +#include <qdebug.h> #include "camera.h" using namespace std; diff --git a/materialscanner/camera.cpp b/materialscanner/camera.cpp index 877b865d1d5f38e8c83a1738d41294d141b8620b..310816489be9f67475f326ee651c759c9c8e2372 100644 --- a/materialscanner/camera.cpp +++ b/materialscanner/camera.cpp @@ -1,10 +1,4 @@ -#include"GalaxyIncludes.h" -#include<QWidget> -#include<QImage> -#include<QObject> #include "camera.h" -#include "opencv2/opencv.hpp" -#include "opencv2/core/mat.hpp" //#include<CSampleCaptureEventHandler.h> @@ -114,12 +108,14 @@ bool camera::run() if (objImageDataPtr->GetStatus() == GX_FRAME_STATUS_SUCCESS) { + cv::Mat img; cout << "Bild erhalten!" << endl; cout << "ImageInfo: " << objImageDataPtr->GetStatus() << endl; cout << "ImageInfo: " << objImageDataPtr->GetWidth() << endl; cout << "ImageInfo: " << objImageDataPtr->GetHeight() << endl; cout << "ImageInfo: " << objImageDataPtr->GetPayloadSize() << endl; + /* void* pRGB24Buffer = NULL; // Angenommen, die Originaldaten sind ein BayerRG8-Bild pRGB24Buffer = objImageDataPtr->ConvertToRGB24(GX_BIT_0_7, GX_RAW2RGB_NEIGHBOUR, true); @@ -137,12 +133,20 @@ bool camera::run() height, QImage::Format_ARGB32 ); - } - + */ - //cout << "Sleep started!" << endl; - //Sleep(10000); - //cout << "Sleep ended!" << endl; + img.create(objImageDataPtr->GetHeight(), objImageDataPtr->GetWidth(), CV_8UC3); + void* pRGB24Buffer = NULL; + // Angenommen, die Originaldaten sind ein BayerRG8-Bild + //pRGB24Buffer = objImageDataPtr->ConvertToRaw8(GX_BIT_0_7); + pRGB24Buffer = objImageDataPtr->ConvertToRGB24(GX_BIT_0_7, GX_RAW2RGB_NEIGHBOUR, true); + memcpy(img.data, pRGB24Buffer, (objImageDataPtr->GetHeight()) * (objImageDataPtr->GetWidth()) * 3); + cv::flip(img, img, 0); + cv::rotate(img, img, cv::ROTATE_90_COUNTERCLOCKWISE); + //cv::imshow("sss", img); + cv::waitKey(1); + cv::imwrite("03.bmp", img); + } //Befehl "Miningstopp senden" ObjFeatureControlPtr->GetCommandFeature("AcquisitionStop")->Execute(); diff --git a/materialscanner/camera.h b/materialscanner/camera.h index 10ddcb069cd56abfdeffda3e2374b62f99d9642a..6404231ecd3bb580196d864982dd09f56eea175f 100644 --- a/materialscanner/camera.h +++ b/materialscanner/camera.h @@ -1,4 +1,10 @@ #pragma once +#include"GalaxyIncludes.h" +#include<QWidget> +#include<QImage> +#include<QObject> +#include "opencv2/opencv.hpp" +#include "opencv2/core/mat.hpp" class camera : ICaptureEventHandler { diff --git a/materialscanner/x64/Debug/materialscanner.log b/materialscanner/x64/Debug/materialscanner.log index e166472c91e078760844e4bc5aff12fe34d24370..cfd1dfb4fd6c84e3474e911fad55fac6085fbe78 100644 --- a/materialscanner/x64/Debug/materialscanner.log +++ b/materialscanner/x64/Debug/materialscanner.log @@ -1,2 +1,7 @@ Reading Qt configuration (C:/Qt/6.2.4/msvc2019_64/bin/qmake) + camera.cpp +C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x7b3 that is illegal in the current source character set (codepage 65001). +C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x17fd that is illegal in the current source character set (codepage 65001). +C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x191b that is illegal in the current source character set (codepage 65001). +C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x192c that is illegal in the current source character set (codepage 65001). materialscanner.vcxproj -> C:\dev\materialscanner\materialscanner-qt\x64\Debug\materialscanner.exe diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog index e7e0b8dd793757c044b7ece55d997f6ba4ddc1ce..5d8d6371bb4236f83fa14cb59e765b8ae197e94b 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog index f9dbd78fc060201c7d710ef79caa53d97d331b3d..60d177c942b2a7fc6c5f335219e8cdddb75f6b7c 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog index 09b655947cb4ecfd4790096c1134ae0d544b13cd..2205f9d46dd8924c46750a9b7f0b5aa7bca60a9b 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog index 7c0bd1886a746b0c194719ee75ebd7e8d84ce202..4d86e05de6a1ea51efe72089709301f9b390bc05 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog index 4e826e2ac4f98dd282194ce4ae7bd565a8813765..49a5e4d3e3f9056e7c611e661b09b7795e56e375 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog index a65a0dfadcb40842549ad69d18e409b0e1104305..ebb25d8b6908dfdf3a020da6c70318e32b17ccdf 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog differ diff --git a/materialscanner/x64/Debug/vc142.pdb b/materialscanner/x64/Debug/vc142.pdb index 8c14903d33623b142a0aa1e6cdf825683e9012bd..c36b326ca262b4c520f02408fc5d757fa16a95f4 100644 Binary files a/materialscanner/x64/Debug/vc142.pdb and b/materialscanner/x64/Debug/vc142.pdb differ diff --git a/x64/Debug/materialscanner.ilk b/x64/Debug/materialscanner.ilk index 3da648df16a6a7c1250db4208ab2fb61031da1ed..8de0f4a1cf11b7539212c39b3df72b31b8267de3 100644 Binary files a/x64/Debug/materialscanner.ilk and b/x64/Debug/materialscanner.ilk differ diff --git a/x64/Debug/materialscanner.pdb b/x64/Debug/materialscanner.pdb index 584e97fc7544a61cddc811bc37ffbb63a53cf860..97b6274e36a98f812dcb8670b714916baa7946ef 100644 Binary files a/x64/Debug/materialscanner.pdb and b/x64/Debug/materialscanner.pdb differ