-
Notifications
You must be signed in to change notification settings - Fork 169
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.
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
gllssi2isis Original Label Fix #3226
Changes from 10 commits
d415371
d90e56a
3a6975f
da361fc
aabdb80
fd7ab53
cc1ba4d
a265340
415e661
3be6073
d648113
7c7a93f
a6ea2c5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,15 +28,14 @@ void translateLabels(Pvl &pdsLabel, Cube *ocube); | |
void fixPvl(QString fileName); | ||
|
||
void IsisMain() { | ||
|
||
//initialize globals | ||
summed = false; | ||
summedOutput = NULL; | ||
// Grab the file to import | ||
ProcessImportPds p; | ||
UserInterface &ui = Application::GetUserInterface(); | ||
FileName inFile = ui.GetFileName("FROM"); | ||
FileName out = ui.GetFileName("TO"); | ||
FileName outFile = ui.GetFileName("TO"); | ||
|
||
|
||
|
||
|
@@ -110,22 +109,15 @@ void IsisMain() { | |
p.StartProcess(); | ||
} | ||
else { | ||
summedOutput = new Cube(); | ||
summedOutput->setDimensions(p.Samples() / 2, p.Lines() / 2, p.Bands()); | ||
summedOutput->setPixelType(p.PixelType()); | ||
summedOutput->create(ui.GetFileName("TO")); | ||
p.StartProcess(translateData); | ||
p.SetDimensions(p.Samples() / 2, p.Lines() / 2, p.Bands()); | ||
summedOutput = p.SetOutputCube("TO"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ocube = p.SetOutputCube("TO"); ? Do we need summedOutput now...? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I just noticed that summedOutput is being used further down. Is that why we still need to instantiate it here? |
||
ocube = summedOutput; | ||
p.StartProcess(translateData); | ||
} | ||
|
||
translateLabels(pdsLabel, ocube); | ||
p.EndProcess(); | ||
|
||
if (summed) { | ||
summedOutput->close(); | ||
delete summedOutput; | ||
} | ||
SgStapleton marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
return; | ||
} | ||
|
||
|
@@ -182,7 +174,7 @@ void fixPvl(QString fileName){ | |
|
||
|
||
|
||
void translateData(Buffer &inData) { | ||
void translateData(Isis::Buffer &inData) { | ||
summedOutput->write(inData); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could this be replaced with ocube to get rid of summedOutput altogether? |
||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this used anywhere?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will make a change to use it