Skip to content

interleave string in header bugfix #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NimrodCarmon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

interleave string in header bugfix #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b2605
interleave string in header bugfix
NimrodCarmon Mar 8, 2021
e93ead7
correct n_averaged frames in header file
NimrodCarmon Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LiveView.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions src/frameworker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ void FrameWorker::saveFrames(save_req_t req)
int64_t new_count = 0;
std::vector<uint16_t> p_frame;
std::string hdr_fname;
std::string interleave;
save_count.store(0);

std::vector<float> frame_accum;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down