diff --git a/materialscanner/CaptureEventHandler.cpp b/materialscanner/CaptureEventHandler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..450aa3089f06c9fb1c3b4e0079631668afb7df87
--- /dev/null
+++ b/materialscanner/CaptureEventHandler.cpp
@@ -0,0 +1,55 @@
+#include "CaptureEventHandler.h"
+
+void CaptureEventHandler::DoOnImageCaptured(CImageDataPointer& objImageDataPointer, void* pUserParam)
+{
+ std::cout << "CaptureEventHandler" << std::endl;
+ if (objImageDataPointer->GetStatus() == GX_FRAME_STATUS_SUCCESS)
+ //if (objImageDataPointer->GetStatus() == GX_FRAME_STATUS_SUCCESS)
+ {
+
+ /*
+
+ If the image acquisition is a full frame, then you can read the image width,height,data
+
+ format and etc.
+
+ */
+
+ uint64_t nWidth = objImageDataPointer->GetWidth();
+
+ uint64_t nHeight = objImageDataPointer->GetHeight();
+
+ GX_PIXEL_FORMAT_ENTRY emPixelFormat = objImageDataPointer->GetPixelFormat();
+
+ /* More images information please refer the IImageData interface define.*/
+
+ std::cout << "Bild erhalten" << std::endl;
+ std::cout << "ImageInfo: " << objImageDataPointer->GetStatus() << std::endl;
+ std::cout << "ImageInfo: " << nWidth << std::endl;
+ std::cout << "ImageInfo: " << nHeight << std::endl;
+ std::cout << "ImageInfo: " << objImageDataPointer->GetPayloadSize() << std::endl;
+ cv::Mat img;
+
+ img.create(nHeight, nWidth, CV_8UC3);
+ void* pRGB24Buffer = NULL;
+ // Angenommen, die Originaldaten sind ein BayerRG8-Bild
+ //pRGB24Buffer = objImageDataPtr->ConvertToRaw8(GX_BIT_0_7);
+ pRGB24Buffer = objImageDataPointer->ConvertToRGB24(GX_BIT_0_7, GX_RAW2RGB_NEIGHBOUR, true);
+ memcpy(img.data, pRGB24Buffer, (nHeight) * (nWidth) * 3);
+ cv::flip(img, img, 0);
+ cv::rotate(img, img, cv::ROTATE_90_COUNTERCLOCKWISE);
+ cv::imshow("sss", img);
+ cv::waitKey(1);
+
+ QImage imgIn = QImage((uchar*)img.data, img.cols, img.rows, img.step, QImage::Format_RGB888);
+ // TODO imgIn in GUI anzeigen
+ bool imageSaved = false;
+ if (!imageSaved) {
+ imgIn.save(QString("01.bmp"), "bmp");
+ imageSaved = true;
+ }
+
+ }
+
+}
+
diff --git a/materialscanner/CaptureEventHandler.h b/materialscanner/CaptureEventHandler.h
new file mode 100644
index 0000000000000000000000000000000000000000..bea44b876ec6da3d0d3ae4fa5c73ac99d446cf21
--- /dev/null
+++ b/materialscanner/CaptureEventHandler.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "ICaptureEventHandler.h"
+#include"GalaxyIncludes.h"
+#include<QWidget>
+#include<QImage>
+#include<QObject>
+#include "opencv2/opencv.hpp"
+#include "opencv2/core/mat.hpp"
+
+class CaptureEventHandler :
+ public ICaptureEventHandler
+{
+public:
+ void DoOnImageCaptured(CImageDataPointer& objImageDataPointer, void* pUserParam);
+
+};
+
diff --git a/materialscanner/camera-controller.cpp b/materialscanner/camera-controller.cpp
index 99129e5f820c755371a2ad1518a00b0b648410da..64d2d17ef6a5cc77a8703047a910d5d97a49d62c 100644
--- a/materialscanner/camera-controller.cpp
+++ b/materialscanner/camera-controller.cpp
@@ -31,7 +31,13 @@ bool cameraController::initCamera()
try {
cout << "Init camera..." << endl;
camera cameraInstance = camera(); //create instance, assuming it has default constructor!
- cameraInstance.run();
+ if (cameraInstance.initDevice()) {
+ if (cameraInstance.initStream())
+ {
+ cameraInstance.takePictureEvent();
+ }
+ }
+ cameraInstance.unInit();
}
catch (CGalaxyException& e)
{
diff --git a/materialscanner/camera.cpp b/materialscanner/camera.cpp
index 310816489be9f67475f326ee651c759c9c8e2372..976443a67d2fcbce35e394fe9fe2f0f186e6cb72 100644
--- a/materialscanner/camera.cpp
+++ b/materialscanner/camera.cpp
@@ -1,9 +1,6 @@
#include "camera.h"
//#include<CSampleCaptureEventHandler.h>
-
-using namespace std;
-
camera::camera() {
}
@@ -12,88 +9,130 @@ camera::~camera() {
}
-void camera::DoOnImageCaptured(CImageDataPointer& objImageDataPointer, void* pUserParam) // Callback function processing
+
+bool camera::initDevice()
{
- cout << "Bild erhalten" << endl;
- cout << "ImageInfo: " << objImageDataPointer->GetStatus() << endl;
- cout << "ImageInfo: " << objImageDataPointer->GetWidth() << endl;
- cout << "ImageInfo: " << objImageDataPointer->GetHeight() << endl;
- cout << "ImageInfo: " << objImageDataPointer->GetPayloadSize() << endl;
-}
+ std::cout << "Initialize camera..." << std::endl;
+ try
+ {
+ // Declare event callback object pointer
+ IDeviceOfflineEventHandler* pDeviceOfflineEventHandler = NULL;/// Callback object for offline event
+ IFeatureEventHandler* pFeatureEventHandler = NULL;/// remote device event callback object
+ ICaptureEventHandler* pCaptureEventHandler = NULL;/// fetch callback object
+ // Inicializar
+ IGXFactory::GetInstance().Init();
+ // Enumerar dispositivos
+ gxdeviceinfo_vector vectorDeviceInfo;
+ IGXFactory::GetInstance().UpdateDeviceList(1000, vectorDeviceInfo);
-bool camera::run()
-{
- cout << "Run code reached..." << endl;
- // Declare event callback object pointer
- IDeviceOfflineEventHandler* pDeviceOfflineEventHandler = NULL;/// Callback object for offline event
- IFeatureEventHandler* pFeatureEventHandler = NULL;/// remote device event callback object
- ICaptureEventHandler* pCaptureEventHandler = NULL;/// fetch callback object
+ int a = 0;
+ if (0 == vectorDeviceInfo.size())
+ {
+ IGXFactory::GetInstance().Uninit();
+ throw std::exception("No device available!");
+ }
- // Inicializar
- IGXFactory::GetInstance().Init();
+ GxIAPICPP::gxstring strSN = vectorDeviceInfo[0].GetSN();
- // Enumerar dispositivos
- gxdeviceinfo_vector vectorDeviceInfo;
- IGXFactory::GetInstance().UpdateDeviceList(1000, vectorDeviceInfo);
+ objDevicePtr = IGXFactory::GetInstance().OpenDeviceBySN(strSN, GX_ACCESS_EXCLUSIVE);
- int a = 0;
- if (0 == vectorDeviceInfo.size())
+ std::cout << "Initialize Camera finished!" << std::endl;
+ return true;
+ }
+ catch (const std::exception& e)
{
- cout << "No device available!" << endl;
-
- // Desinicializar la biblioteca
- IGXFactory::GetInstance().Uninit();
+ std::cout << "!!!Initialize Camera failed!!! " << e.what() << std::endl;
return false;
- }
-
- // Abre el primer dispositivo y la primera secuencia debajo del dispositivo
- CGXDevicePointer objDevicePtr;
-
- GxIAPICPP::gxstring strSN = vectorDeviceInfo[0].GetSN();
-
- objDevicePtr = IGXFactory::GetInstance().OpenDeviceBySN(strSN, GX_ACCESS_EXCLUSIVE);
+ }
+}
- uint32_t nStreamNum = objDevicePtr->GetStreamCount();
- if (nStreamNum > 0)
+bool camera::initStream() {
+ try
{
- CGXStreamPointer objStreamPtr = objDevicePtr->OpenStream(0);
- /*Stream object control or acquisition.*/
+ std::cout << "Init Stream and DeviceControl..." << std::endl;
+ uint32_t nStreamNum = objDevicePtr->GetStreamCount();
+ if (nStreamNum > 0)
+ {
+ objStreamPtr = objDevicePtr->OpenStream(0);
+ /*Stream object control or acquisition.*/
- // Abrufen des Remoteger�teattributtreibers
- CGXFeatureControlPointer ObjFeatureControlPtr = objDevicePtr->GetRemoteFeatureControl();
- /*
-
- ObjFeatureControlPtr->GetEnumFeature("TriggerMode")->SetValue("On");
- ObjFeatureControlPtr->GetEnumFeature("TriggerSource")->SetValue("Line0");
- ObjFeatureControlPtr->GetEnumFeature("TriggerActivation")->SetValue("RisingEdge");
- ObjFeatureControlPtr->GetFloatFeature("TriggerDelay")->SetValue(500000);
- ObjFeatureControlPtr->GetFloatFeature("TriggerFilterRaisingEdge")->SetValue(5000);
- */
+ // Abrufen des Remoteger�teattributtreibers
+ ObjFeatureControlPtr = objDevicePtr->GetRemoteFeatureControl();
+ /*
- /*Improve the acquisition performance of the network camera
- [currently only the Gigabit network camera supports the optimal packet length]*/
- GX_DEVICE_CLASS_LIST objDeviceClass = objDevicePtr->GetDeviceInfo().GetDeviceClass();
+ ObjFeatureControlPtr->GetEnumFeature("TriggerMode")->SetValue("On");
+ ObjFeatureControlPtr->GetEnumFeature("TriggerSource")->SetValue("Line0");
+ ObjFeatureControlPtr->GetEnumFeature("TriggerActivation")->SetValue("RisingEdge");
+ ObjFeatureControlPtr->GetFloatFeature("TriggerDelay")->SetValue(500000);
+ ObjFeatureControlPtr->GetFloatFeature("TriggerFilterRaisingEdge")->SetValue(5000);
+ */
- if (GX_DEVICE_CLASS_U3V == objDeviceClass)
- {
- /*Determine whether the device supports the stream channel packet function.*/
- if (true == ObjFeatureControlPtr->IsImplemented("GevSCPSPacketSize"))
+ /*Improve the acquisition performance of the network camera
+ [currently only the Gigabit network camera supports the optimal packet length]*/
+ GX_DEVICE_CLASS_LIST objDeviceClass = objDevicePtr->GetDeviceInfo().GetDeviceClass();
+
+ if (GX_DEVICE_CLASS_U3V == objDeviceClass)
{
- /*Get the optimal packet length value of the current network environment*/
- int nPacketSize = objStreamPtr->GetOptimalPacketSize();
+ /*Determine whether the device supports the stream channel packet function.*/
+ if (true == ObjFeatureControlPtr->IsImplemented("GevSCPSPacketSize"))
+ {
+ /*Get the optimal packet length value of the current network environment*/
+ int nPacketSize = objStreamPtr->GetOptimalPacketSize();
- /*Set the optimal packet length value to the stream channel packet length of
- the current device.*/
+ /*Set the optimal packet length value to the stream channel packet length of
+ the current device.*/
- ObjFeatureControlPtr->GetIntFeature("GevSCPSPacketSize")->SetValue(nPacketSize);
+ ObjFeatureControlPtr->GetIntFeature("GevSCPSPacketSize")->SetValue(nPacketSize);
+ }
}
-
}
+ std::cout << "Init Stream and DeviceControl finished!" << std::endl;
+ return true;
+ }
+ catch (const std::exception&)
+ {
+ std::cout << "Init Stream and DeviceControl failed!" << std::endl;
+ return false;
+ }
+}
+
+bool camera::takePictureEvent() {
+ try
+ {
+ std::cout << "Take Picture Event..." << std::endl;
+ // Callback Collection registrieren
+ ICaptureEventHandler* pCaptureEventHandler = new CaptureEventHandler();
+ objStreamPtr->RegisterCaptureCallback(pCaptureEventHandler, NULL);
+
+ // Senden von Miningbefehlen
+ objStreamPtr->StartGrab();
+ ObjFeatureControlPtr->GetCommandFeature("AcquisitionStart")->Execute();
+
+ std::getchar();
+ //Befehl "Miningstopp senden"
+ ObjFeatureControlPtr->GetCommandFeature("AcquisitionStop")->Execute();
+ ObjFeatureControlPtr->GetEnumFeature("TriggerMode")->SetValue("Off");
+ objStreamPtr->StopGrab();
+
+ std::cout << "Picture event saved!" << std::endl;
+ return true;
+ }
+ catch (const std::exception&)
+ {
+ std::cout << "Take Picture failed!" << std::endl;
+ return false;
+ }
+}
+
+bool camera::takePicture() {
+ try
+ {
+ std::cout << "Take Picture..." << std::endl;
// Callback Collection registrieren
//pCaptureEventHandler = new camera();
//ObjStreamPtr->RegisterCaptureCallback(pCaptureEventHandler, NULL);
@@ -109,31 +148,31 @@ 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);
-
- int width = objImageDataPtr->GetWidth();
- int height = objImageDataPtr->GetHeight();
-
- // Welche konvertierungsmatrix braucht man?
- cv::Mat openCvImage(height, width, CV_16UC1, pRGB24Buffer);
- openCvImage.convertTo(openCvImage, CV_8UC1);
-
- QImage qImage = QImage(
- openCvImage.data,
- width,
- height,
- QImage::Format_ARGB32
- );
- */
+ std::cout << "Bild erhalten!" << std::endl;
+ std::cout << "ImageInfo: " << objImageDataPtr->GetStatus() << std::endl;
+ std::cout << "ImageInfo: " << objImageDataPtr->GetWidth() << std::endl;
+ std::cout << "ImageInfo: " << objImageDataPtr->GetHeight() << std::endl;
+ std::cout << "ImageInfo: " << objImageDataPtr->GetPayloadSize() << std::endl;
+
+ // /*
+ // void* pRGB24Buffer = NULL;
+ // // Angenommen, die Originaldaten sind ein BayerRG8-Bild
+ // pRGB24Buffer = objImageDataPtr->ConvertToRGB24(GX_BIT_0_7, GX_RAW2RGB_NEIGHBOUR, true);
+
+ // int width = objImageDataPtr->GetWidth();
+ // int height = objImageDataPtr->GetHeight();
+
+ // // Welche konvertierungsmatrix braucht man?
+ // cv::Mat openCvImage(height, width, CV_16UC1, pRGB24Buffer);
+ // openCvImage.convertTo(openCvImage, CV_8UC1);
+
+ // QImage qImage = QImage(
+ // openCvImage.data,
+ // width,
+ // height,
+ // QImage::Format_ARGB32
+ // );
+ // */
img.create(objImageDataPtr->GetHeight(), objImageDataPtr->GetWidth(), CV_8UC3);
void* pRGB24Buffer = NULL;
@@ -146,6 +185,9 @@ bool camera::run()
//cv::imshow("sss", img);
cv::waitKey(1);
cv::imwrite("03.bmp", img);
+
+ QImage imgIn = QImage((uchar*)img.data, img.cols, img.rows, img.step, QImage::Format_RGB888);
+ imgIn.save(QString("01.bmp"), "bmp");
}
//Befehl "Miningstopp senden"
@@ -154,24 +196,45 @@ bool camera::run()
objStreamPtr->StopGrab();
+ std::cout << "Picture saved!" << std::endl;
+ return true;
+ }
+ catch (const std::exception&)
+ {
+ std::cout << "Take Picture failed!" << std::endl;
+ return false;
+ }
+}
+
+bool camera::unInit() {
+ try
+ {
+ std::cout << "UnInit..." << std::endl;
+ objDevicePtr->Close();
+
+ //Deinitialisieren der Bibliothek
+ IGXFactory::GetInstance().Uninit();
+
+ /*
+ //Zerst�rt den Ereignisr�ckrufzeiger
+ if (NULL != pCaptureEventHandler)
+ {
+ delete pCaptureEventHandler;
+ pCaptureEventHandler = NULL;
+ }
+ */
+
//R�ckruf beim Abmelden der Sammlung
objStreamPtr->UnregisterCaptureCallback();
//Ressourcen freisetzen
objStreamPtr->Close();
- }
- objDevicePtr->Close();
-
- //Deinitialisieren der Bibliothek
- IGXFactory::GetInstance().Uninit();
-
- //Zerst�rt den Ereignisr�ckrufzeiger
- if (NULL != pCaptureEventHandler)
+ std::cout << "UnInit complete!" << std::endl;
+ return true;
+ }
+ catch (const std::exception&)
{
- delete pCaptureEventHandler;
- pCaptureEventHandler = NULL;
+ std::cout << "UnInit failed!" << std::endl;
}
-
- return true;
}
\ No newline at end of file
diff --git a/materialscanner/camera.h b/materialscanner/camera.h
index 6404231ecd3bb580196d864982dd09f56eea175f..378054ce59583e7056f50e6bbc49a39c52421538 100644
--- a/materialscanner/camera.h
+++ b/materialscanner/camera.h
@@ -5,13 +5,23 @@
#include<QObject>
#include "opencv2/opencv.hpp"
#include "opencv2/core/mat.hpp"
+#include "CaptureEventHandler.h"
-class camera : ICaptureEventHandler
+class camera
{
public:
camera();
~camera();
- void DoOnImageCaptured(CImageDataPointer& objImageDataPointer, void* pUserParam);
- bool run();
+ bool initDevice();
+ bool initStream();
+ bool takePicture();
+ bool unInit();
+
+ bool takePictureEvent();
+
+private:
+ CGXDevicePointer objDevicePtr;
+ CGXStreamPointer objStreamPtr;
+ CGXFeatureControlPointer ObjFeatureControlPtr;
};
\ No newline at end of file
diff --git a/materialscanner/materialscanner.vcxproj b/materialscanner/materialscanner.vcxproj
index 540244bc68f1bc2f505523378050ef5e845d3900..791272db0948c0378711122128c2703844850d65 100644
--- a/materialscanner/materialscanner.vcxproj
+++ b/materialscanner/materialscanner.vcxproj
@@ -122,6 +122,7 @@
<QtMoc Include="materialscanner.h" />
<ClCompile Include="camera-controller.cpp" />
<ClCompile Include="camera.cpp" />
+ <ClCompile Include="CaptureEventHandler.cpp" />
<ClCompile Include="lights-controller.cpp" />
<ClCompile Include="materialscanner.cpp" />
<ClCompile Include="main.cpp" />
@@ -129,6 +130,7 @@
<ResourceCompile Include="materialscanner.rc" />
<ClInclude Include="camera-controller.h" />
<ClInclude Include="camera.h" />
+ <ClInclude Include="CaptureEventHandler.h" />
<ClInclude Include="lights-controller.h" />
<ClInclude Include="stdafx.h" />
<ClCompile Include="stdafx.cpp">
diff --git a/materialscanner/materialscanner.vcxproj.filters b/materialscanner/materialscanner.vcxproj.filters
index ca5567729397587e0f1c11e0e28b113a88b82c70..863d09d4f48f99e651d69ebfcdaba8257969cfbc 100644
--- a/materialscanner/materialscanner.vcxproj.filters
+++ b/materialscanner/materialscanner.vcxproj.filters
@@ -61,6 +61,9 @@
<ClCompile Include="camera.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="CaptureEventHandler.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="camera-controller.h">
@@ -72,5 +75,8 @@
<ClInclude Include="camera.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="CaptureEventHandler.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/materialscanner/materialscanner.vcxproj.user b/materialscanner/materialscanner.vcxproj.user
index 70e3e3832ef73975de27d59a341854d775173ad1..1c82eb69b466fa4142a98f42028977930e606f0d 100644
--- a/materialscanner/materialscanner.vcxproj.user
+++ b/materialscanner/materialscanner.vcxproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <QtLastBackgroundBuild>2022-04-20T18:48:58.7305378Z</QtLastBackgroundBuild>
+ <QtLastBackgroundBuild>2022-04-27T09:16:06.3657519Z</QtLastBackgroundBuild>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <QtLastBackgroundBuild>2022-04-20T18:49:05.7243391Z</QtLastBackgroundBuild>
+ <QtLastBackgroundBuild>2022-04-27T09:16:10.4865445Z</QtLastBackgroundBuild>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/materialscanner/x64/Debug/materialscanner.log b/materialscanner/x64/Debug/materialscanner.log
index cfd1dfb4fd6c84e3474e911fad55fac6085fbe78..37065426531566654c6caee333785fb7ca8a0efc 100644
--- a/materialscanner/x64/Debug/materialscanner.log
+++ b/materialscanner/x64/Debug/materialscanner.log
@@ -1,7 +1,3 @@
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).
+ CaptureEventHandler.cpp
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 5d8d6371bb4236f83fa14cb59e765b8ae197e94b..84b0b39bff22007508d5c78f2af6efbf70b33132 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 60d177c942b2a7fc6c5f335219e8cdddb75f6b7c..4cf65a10d57622a1fcd0b3852c726f2f9ca1db71 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 2205f9d46dd8924c46750a9b7f0b5aa7bca60a9b..32725e3ce1089f2a8006ccb3225b39a39b6cf6d6 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.command.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog
index 5a58cedb02ebe818fc7d7ef38b867fc532427808..531f1d9cc7545777d3600088f3021a5da1ef6784 100644
Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.command.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 4d86e05de6a1ea51efe72089709301f9b390bc05..f549981b458f42c2f402d52ffb73f83fe5cea398 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 49a5e4d3e3f9056e7c611e661b09b7795e56e375..aa94b2c870b6943219a1fe278956daf1b66ca786 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 ebb25d8b6908dfdf3a020da6c70318e32b17ccdf..6cde3acb8daee521b30a744b11ba189ee6d53935 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 c36b326ca262b4c520f02408fc5d757fa16a95f4..0348f398dab6822e6c82855ee2002d0a11284c82 100644
Binary files a/materialscanner/x64/Debug/vc142.pdb and b/materialscanner/x64/Debug/vc142.pdb differ
diff --git a/materialscanner/x64/Release/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx b/materialscanner/x64/Release/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx
index 04b1cdc261acd7145567d62efbb45ed045f405dd..54717a028237ddd52ea4ee979ddd461b99a01436 100644
--- a/materialscanner/x64/Release/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx
+++ b/materialscanner/x64/Release/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx
@@ -1 +1 @@
-C:\Users\Jan\AppData\Local\Temp\5sgfscbt.2d5.designtime.props
+C:\Users\Jan\AppData\Local\Temp\ctmduq0r.vqz.designtime.props
diff --git a/materialscanner/x64/Release/qt_work.log b/materialscanner/x64/Release/qt_work.log
index 22007a295b20d1605185c0ffb4d9145d797ba415..226faaaeed57a7ff3c965f00380821df672b7619 100644
Binary files a/materialscanner/x64/Release/qt_work.log and b/materialscanner/x64/Release/qt_work.log differ
diff --git a/x64/Debug/materialscanner.ilk b/x64/Debug/materialscanner.ilk
index 8de0f4a1cf11b7539212c39b3df72b31b8267de3..09b7b1b0d47e568cd7d08c0f3414496411d9a7ee 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 97b6274e36a98f812dcb8670b714916baa7946ef..13f48036e01e482c1ec4e43db66a0961eea54a1e 100644
Binary files a/x64/Debug/materialscanner.pdb and b/x64/Debug/materialscanner.pdb differ