[writer] mdata fixes, manual setting of nix libs and includes

This commit is contained in:
Jan Grewe 2020-06-15 11:29:57 +02:00
parent 4c9e8e38ff
commit 5edc6b2f49
2 changed files with 8 additions and 5 deletions

View File

@ -22,12 +22,15 @@ SOURCES = \
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer
INSTALLS += target INSTALLS += target
unix:!macx: LIBS += -L$$/opt/pylon5/lib64/ -Wl,-E -lpylonbase -lpylonutility -lGenApi_gcc_v3_1_Basler_pylon -lGCBase_gcc_v3_1_Basler_pylon -lnix unix:!macx: LIBS += -L$$/opt/pylon5/lib64/ -Wl,-E -lpylonbase -lpylonutility -lGenApi_gcc_v3_1_Basler_pylon -lGCBase_gcc_v3_1_Basler_pylon
# pylon includes # pylon includes
INCLUDEPATH += $$/opt/pylon5/include INCLUDEPATH += $$/opt/pylon5/include
DEPENDPATH += $$/opt/pylon5/include DEPENDPATH += $$/opt/pylon5/include
# nix includes
INCLUDEPATH += /usr/include/nix
LIBS += -L"/usr/lib/" -lnix
RESOURCES += \ RESOURCES += \
resources.qrc resources.qrc

View File

@ -21,8 +21,8 @@ void Writer::run() {
videoWriter.Open(videoSpecs.filename.c_str()); videoWriter.Open(videoSpecs.filename.c_str());
nix::File nix_file =nix::File::open(videoSpecs.filename + ".nix", nix::FileMode::Overwrite, "hdf5", nix::Compression::DeflateNormal); nix::File nix_file =nix::File::open(videoSpecs.filename + ".nix", nix::FileMode::Overwrite, "hdf5", nix::Compression::DeflateNormal);
nix::Block b = nix_file.createBlock("Recording", "nix.recording"); nix::Block b = nix_file.createBlock("Recording", "nix.recording");
nix::Section s = nix_file.createSection("Recroding", "nix.recording"); nix::Section s = nix_file.createSection("Recording", "nix.recording");
b.metadata(s);
nix::Value v(nix::util::timeToStr(std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()))); nix::Value v(nix::util::timeToStr(std::chrono::system_clock::to_time_t(std::chrono::system_clock::now())));
s.createProperty("date", v); s.createProperty("date", v);
@ -31,9 +31,9 @@ void Writer::run() {
nix::Section sw_sec = s.createSection("PylonRecorder", "nix.software"); nix::Section sw_sec = s.createSection("PylonRecorder", "nix.software");
sw_sec.createProperty("version", nix::Value(1)); sw_sec.createProperty("version", nix::Value(1));
nix::Section hw_sec = s.createSection("Basler ACE", "nix.hardware.camera"); nix::Section hw_sec = s.createSection("Basler ACA2040-120um", "nix.hardware.camera");
hw_sec.createProperty("type", nix::Value("monochrome")); hw_sec.createProperty("type", nix::Value("monochrome"));
hw_sec.createProperty("manufacturer", nix::Value("Basler AG"));
nix::Property p = hw_sec.createProperty("framerate", nix::Value(static_cast<int>(videoSpecs.fps))); nix::Property p = hw_sec.createProperty("framerate", nix::Value(static_cast<int>(videoSpecs.fps)));
p.unit("Hz"); p.unit("Hz");