HIT-PAT/HITDAQ
HIT-PAT/HITDAQ
4
1
Fork 0
Code Issues Pull Requests repo.project_board Releases Wiki Activity

fixed type specify in evenbuilder c++17 again

Browse Source
This commit is contained in:
Blake Leverington 2023-09-16 15:32:24 +02:00
parent d99cd33de6
commit a02bb75984
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hit2023v2/eventbuilder.cpp
View File

@ -1,14 +1,14 @@
#include "eventbuilder.h" #include "eventbuilder.h"
#include "hit_analyse_v2.h" #include "hit_analyse_v2.h"
#include <QTime>; #include <QTime>
EventBuilder::EventBuilder( QObject *parent) : QObject(parent) EventBuilder::EventBuilder( QObject *parent) : QObject(parent)
{ {
connect(this, EventBuilder::sigInit, this, EventBuilder::onInit); connect(this, &EventBuilder::sigInit, this, &EventBuilder::onInit);
connect(this, EventBuilder::sigDeinit, this, EventBuilder::onDeinit); connect(this, &EventBuilder::sigDeinit, this, &EventBuilder::onDeinit);
connect(this, EventBuilder::sigStartLogging, this, EventBuilder::onStartLogging); connect(this, &EventBuilder::sigStartLogging, this, &EventBuilder::onStartLogging);
connect(this, EventBuilder::sigStopLogging, this, EventBuilder::onStopLogging); connect(this, &EventBuilder::sigStopLogging, this, &EventBuilder::onStopLogging);
connect(this, EventBuilder::sigStartTakingHistos, this, EventBuilder::onStartTakingHistos); connect(this, &EventBuilder::sigStartTakingHistos, this, &EventBuilder::onStartTakingHistos);
connect(this, EventBuilder::sigStopTakingHistos, this, EventBuilder::onStopTakingHistos); connect(this, &EventBuilder::sigStopTakingHistos, this, &EventBuilder::onStopTakingHistos);
moveToThread(&thread); moveToThread(&thread);
thread.start(); thread.start();
@ -292,13 +292,13 @@ void EventBuilder::addSource(DataReceiver* source)
nrReceivers = receivers.length(); nrReceivers = receivers.length();
currentFrame.resize(nrReceivers); currentFrame.resize(nrReceivers);
backgroundFrame.resize(nrReceivers); backgroundFrame.resize(nrReceivers);
connect(source, DataReceiver::sigDataReady, this, EventBuilder::onNewData); connect(source, &DataReceiver::sigDataReady, this, &EventBuilder::onNewData);
} }
void EventBuilder::deleteSources() void EventBuilder::deleteSources()
{ {
for (int i = 0; i < receivers.length(); i++) for (int i = 0; i < receivers.length(); i++)
disconnect(receivers[i], DataReceiver::sigDataReady, this, EventBuilder::onNewData); disconnect(receivers[i], &DataReceiver::sigDataReady, this, &EventBuilder::onNewData);
receivers.clear(); receivers.clear();
nrReceivers = receivers.length(); nrReceivers = receivers.length();

BIN
hit2023v2/release/hit2023v2.exe
View File

Binary file not shown.