[writer] remove cam number, simplify writing done signal

This commit is contained in:
Jan Grewe 2024-03-14 15:13:29 +01:00
parent fe20326953
commit 23b0a9afcd
2 changed files with 12 additions and 8 deletions

View File

@ -37,7 +37,7 @@ void Writer::run() {
// Releases all pylon resources.
// PylonTerminate();
// Return with error code 1.
emit writingDone(this->cam_number);
emit writingDone();
return;
}
qDebug() << "checks done!";
@ -114,7 +114,12 @@ void Writer::run() {
}
}
if (count < chunksize) {
stamps_buffer[count] = nix::util::timeToStr(img->timestamp());
try {
stamps_buffer[count] = nix::util::timeToStr(img->timestamp());
} catch (...) {
std::cerr << "Bad time to string conversion " << img->timestamp() << std::endl;
stamps_buffer[count] = "invalid";
}
ids_buffer[count] = img->index();
count ++;
} else {
@ -138,11 +143,11 @@ void Writer::run() {
frametimes.setData(nix::DataType::String, stamps_buffer.data(), chunk_shape, offset);
frameindices.setData(nix::DataType::Int64, ids_buffer.data(), chunk_shape, offset);
}
// videoWriter.Close();
videoWriter.Close();
myFile.close();
nix_file.close();
} else {
std::cerr << "Got no video specifications, not writing!" << std::endl;
}
emit writingDone(cam_number);
emit writingDone();
}

View File

@ -15,8 +15,8 @@ class Writer : public QThread
{
Q_OBJECT
public:
explicit Writer(ImageBuffer*buffer, int number, QObject *parent = nullptr) :
QThread(parent), buffer(buffer), cam_number(number) {}
explicit Writer(ImageBuffer*buffer, QObject *parent = nullptr) :
QThread(parent), buffer(buffer) {}
void setVideoSpecs(VideoSpecs specs);
void setProjectMetadata(ProjectMetadata mdata);
@ -25,10 +25,9 @@ public:
signals:
void terminated();
void writingDone(int cam);
void writingDone();
private:
int cam_number;
ImageBuffer *buffer;
VideoSpecs videoSpecs;
ProjectMetadata metadata;