Loading isis/src/qisis/objs/Workspace/Workspace.cpp +13 −4 Original line number Diff line number Diff line Loading @@ -330,6 +330,11 @@ namespace Isis { * @history 2017-10-12 Kristin Berry - Reverted to using relative instead of full file paths, * as this caused errors when working with cubelists that contained * relative paths. Fixes # 5177 * @history 2018-09-12 Adam Goins - Modified logic to attempt to open the file as a cube or * detached label first, if that fails attempt to open it as a cube list * and if that fails, throw an error to the user. This allows cubes and * cube lists to be saved under any extension and opened. Fixes #5439, * Fixes #5476. */ void Workspace::addCubeViewport(QString filename) { Loading Loading @@ -376,9 +381,13 @@ namespace Isis { } } } /** * @history 2018-09-12 Adam Goins - Added this method to attempt to open a file as a cube list. * It's called by addCubeViewport() when that method attempts to open a * file as a cube. Fixes #5439, Fixes #5476. */ void Workspace::addCubeViewportFromList(QString cubelist) { QFileInfo cubeFileName(cubelist); Loading isis/src/qisis/objs/Workspace/Workspace.h +5 −0 Original line number Diff line number Diff line Loading @@ -81,6 +81,11 @@ namespace Isis { * Fixes #5099. * @history 2018-04-13 Christopher Combs - Added .lbl files to the list of single-cube file-extensions * to check before reading a cube list in addCubeViewport. Fixes #5350. * @history 2018-09-12 Adam Goins - Modified logic to attempt to open the file as a cube or * detached label first, if that fails attempt to open it as a cube list * and if that fails, throw an error to the user. This allows cubes and * cube lists to be saved under any extension and opened. Fixes #5439, * Fixes #5476. */ class Workspace : public QWidget { Q_OBJECT Loading Loading
isis/src/qisis/objs/Workspace/Workspace.cpp +13 −4 Original line number Diff line number Diff line Loading @@ -330,6 +330,11 @@ namespace Isis { * @history 2017-10-12 Kristin Berry - Reverted to using relative instead of full file paths, * as this caused errors when working with cubelists that contained * relative paths. Fixes # 5177 * @history 2018-09-12 Adam Goins - Modified logic to attempt to open the file as a cube or * detached label first, if that fails attempt to open it as a cube list * and if that fails, throw an error to the user. This allows cubes and * cube lists to be saved under any extension and opened. Fixes #5439, * Fixes #5476. */ void Workspace::addCubeViewport(QString filename) { Loading Loading @@ -376,9 +381,13 @@ namespace Isis { } } } /** * @history 2018-09-12 Adam Goins - Added this method to attempt to open a file as a cube list. * It's called by addCubeViewport() when that method attempts to open a * file as a cube. Fixes #5439, Fixes #5476. */ void Workspace::addCubeViewportFromList(QString cubelist) { QFileInfo cubeFileName(cubelist); Loading
isis/src/qisis/objs/Workspace/Workspace.h +5 −0 Original line number Diff line number Diff line Loading @@ -81,6 +81,11 @@ namespace Isis { * Fixes #5099. * @history 2018-04-13 Christopher Combs - Added .lbl files to the list of single-cube file-extensions * to check before reading a cube list in addCubeViewport. Fixes #5350. * @history 2018-09-12 Adam Goins - Modified logic to attempt to open the file as a cube or * detached label first, if that fails attempt to open it as a cube list * and if that fails, throw an error to the user. This allows cubes and * cube lists to be saved under any extension and opened. Fixes #5439, * Fixes #5476. */ class Workspace : public QWidget { Q_OBJECT Loading