[writer] remove cam number, simplify writing done signal
This commit is contained in:
parent
fe20326953
commit
23b0a9afcd
13
writer.cpp
13
writer.cpp
@ -37,7 +37,7 @@ void Writer::run() {
|
|||||||
// Releases all pylon resources.
|
// Releases all pylon resources.
|
||||||
// PylonTerminate();
|
// PylonTerminate();
|
||||||
// Return with error code 1.
|
// Return with error code 1.
|
||||||
emit writingDone(this->cam_number);
|
emit writingDone();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
qDebug() << "checks done!";
|
qDebug() << "checks done!";
|
||||||
@ -114,7 +114,12 @@ void Writer::run() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (count < chunksize) {
|
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();
|
ids_buffer[count] = img->index();
|
||||||
count ++;
|
count ++;
|
||||||
} else {
|
} else {
|
||||||
@ -138,11 +143,11 @@ void Writer::run() {
|
|||||||
frametimes.setData(nix::DataType::String, stamps_buffer.data(), chunk_shape, offset);
|
frametimes.setData(nix::DataType::String, stamps_buffer.data(), chunk_shape, offset);
|
||||||
frameindices.setData(nix::DataType::Int64, ids_buffer.data(), chunk_shape, offset);
|
frameindices.setData(nix::DataType::Int64, ids_buffer.data(), chunk_shape, offset);
|
||||||
}
|
}
|
||||||
// videoWriter.Close();
|
videoWriter.Close();
|
||||||
myFile.close();
|
myFile.close();
|
||||||
nix_file.close();
|
nix_file.close();
|
||||||
} else {
|
} else {
|
||||||
std::cerr << "Got no video specifications, not writing!" << std::endl;
|
std::cerr << "Got no video specifications, not writing!" << std::endl;
|
||||||
}
|
}
|
||||||
emit writingDone(cam_number);
|
emit writingDone();
|
||||||
}
|
}
|
||||||
|
7
writer.h
7
writer.h
@ -15,8 +15,8 @@ class Writer : public QThread
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit Writer(ImageBuffer*buffer, int number, QObject *parent = nullptr) :
|
explicit Writer(ImageBuffer*buffer, QObject *parent = nullptr) :
|
||||||
QThread(parent), buffer(buffer), cam_number(number) {}
|
QThread(parent), buffer(buffer) {}
|
||||||
|
|
||||||
void setVideoSpecs(VideoSpecs specs);
|
void setVideoSpecs(VideoSpecs specs);
|
||||||
void setProjectMetadata(ProjectMetadata mdata);
|
void setProjectMetadata(ProjectMetadata mdata);
|
||||||
@ -25,10 +25,9 @@ public:
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void terminated();
|
void terminated();
|
||||||
void writingDone(int cam);
|
void writingDone();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int cam_number;
|
|
||||||
ImageBuffer *buffer;
|
ImageBuffer *buffer;
|
||||||
VideoSpecs videoSpecs;
|
VideoSpecs videoSpecs;
|
||||||
ProjectMetadata metadata;
|
ProjectMetadata metadata;
|
||||||
|
Loading…
Reference in New Issue
Block a user