diff --git a/LiveView.pro b/LiveView.pro index 51e9853..eacab66 100644 --- a/LiveView.pro +++ b/LiveView.pro @@ -26,7 +26,7 @@ TEMPLATE = app # You can compile LiveView with EDTpdv. In order to do so, uncomment the following line and make sure # EDT is in your working directory -# DEFINES += USE_EDT +DEFINES += USE_EDT QMAKE_CXXFLAGS -= -std=gnu++11 QMAKE_CXXFLAGS += -O3 -std=c++0x -Wno-inconsistent-missing-override -Wno-ignored-attributes -Wno-date-time diff --git a/src/frameworker.cpp b/src/frameworker.cpp index 3cae5ed..a6f6bb6 100644 --- a/src/frameworker.cpp +++ b/src/frameworker.cpp @@ -297,6 +297,7 @@ void FrameWorker::saveFrames(save_req_t req) int64_t new_count = 0; std::vector p_frame; std::string hdr_fname; + std::string interleave; save_count.store(0); std::vector frame_accum; @@ -314,12 +315,15 @@ void FrameWorker::saveFrames(save_req_t req) switch(req.bit_org) { case fwBIL: p_getSaveFrame = &FrameWorker::getBILSaveFrame; + interleave = "bil"; break; case fwBIP: p_getSaveFrame = &FrameWorker::getBIPSaveFrame; + interleave = "bip"; break; case fwBSQ: p_getSaveFrame = &FrameWorker::getBILSaveFrame; // BSQ conversion is done at the end. + interleave = "bsq"; } std::ofstream p_file; @@ -360,12 +364,13 @@ void FrameWorker::saveFrames(save_req_t req) } std::string hdr_text = "ENVI\ndescription = {LIVEVIEW raw export file, " + - std::to_string(req.nFrames) + " frame mean per acquisition}\n"; + std::to_string(req.nAvgs) + " frame mean per acquisition}\n"; hdr_text += "samples = " + std::to_string(frWidth) + "\n"; hdr_text += "lines = " + std::to_string(req.nFrames / req.nAvgs) + "\n"; hdr_text += "bands = " + std::to_string(dataHeight) + "\n"; hdr_text += "header offset = 0\nfile type = ENVI Standard\ndata type = 12\n"; - hdr_text += "interleave = " + std::to_string(req.bit_org) + "\n"; + hdr_text += "interleave = " + interleave + "\n"; + //hdr_text += "interleave = " + std::to_string(req.bit_org) + "\n"; hdr_text += "sensor type = Unknown\nbyte order = 0\nwavelength units = Unknown\n"; std::ofstream hdr_out(hdr_fname);