Skip to content

added parquet support or control networks #5905

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

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

added parquet support or control networks #5905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions isis/src/base/objs/Camera/Camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ namespace Isis {
}

if (p_distortionMap) {
delete p_distortionMap;
p_distortionMap = NULL;
// delete p_distortionMap;
// p_distortionMap = NULL;
}

if (p_focalPlaneMap) {
Expand Down
2 changes: 1 addition & 1 deletion isis/src/base/objs/Spice/Spice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ namespace Isis {
* Destroys the Spice object
*/
Spice::~Spice() {
NaifStatus::CheckErrors();
// NaifStatus::CheckErrors();

if (m_solarLongitude != NULL) {
delete m_solarLongitude;
Expand Down
12 changes: 12 additions & 0 deletions isis/src/control/objs/ControlNet/ControlNet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,18 @@ namespace Isis {
void ControlNet::Write(const QString &ptfile, bool pvl) {
ControlNetVersioner versionedWriter(this);

// Check if writing to Parquet format
if (ptfile.endsWith(".parquet", Qt::CaseInsensitive)) {
try {
versionedWriter.write(FileName(ptfile));
}
catch (IException &e) {
QString msg = "Failed writing control network to Parquet file [" + ptfile + "]";
throw IException(e, IException::Io, msg, _FILEINFO_);
}
return;
}

if (pvl) {
Pvl network;
try {
Expand Down
Loading