Unverified Commit 73be0a51 authored by gsn9's avatar gsn9 Committed by GitHub
Browse files

Spkwriter from fix (#4900) 

* converted from FILENAME to be a Cube

* fixed typo

* adding fix

* fixed spk&ck writer to pass tests

* fixed ckwriter to pass tests
parent d6dbba9c

isis/src/base/apps/ckwriter/ckwriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ namespace Isis { 


    // Get the list of names of input CCD cubes to stitch together

    FileList flist;

    if (ui.WasEntered("FROM")) flist.push_back(FileName(ui.GetFileName("FROM")));

    if (ui.WasEntered("FROM")) flist.push_back(FileName(ui.GetCubeName("FROM")));

    if (ui.WasEntered("FROMLIST")) flist.read(FileName(ui.GetFileName("FROMLIST")));

    if (flist.size() < 1) {

      QString msg = "Files must be specified in FROM and/or FROMLIST - none found!";

isis/src/base/apps/ckwriter/ckwriter.xml

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ spiceinit from=EN0131771668M.cub ck=EN0131771668M.bc extra=$extra 
  <groups>

    <group name="Files">

        <parameter name="FROM">

          <type>filename</type>

          <type>cube</type>

          <fileMode>input</fileMode>

          <internalDefault>None</internalDefault>

          <brief>

isis/src/base/apps/spkwriter/spkwriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ namespace Isis { 


    // Get the list of names of input CCD cubes to stitch together

    FileList flist;

    if (ui.WasEntered("FROM")) flist.push_back(ui.GetFileName("FROM"));

    if (ui.WasEntered("FROM")) flist.push_back(ui.GetCubeName("FROM"));

    if (ui.WasEntered("FROMLIST")) flist.read(ui.GetFileName("FROMLIST"));

    if (flist.size() < 1) {

      QString msg = "Files must be specified in FROM and/or FROMLIST - none found!";

isis/src/base/apps/spkwriter/spkwriter.xml

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ User Comments 
  <groups>

    <group name="Input Files">

        <parameter name="FROM">

          <type>filename</type>

          <type>cube</type>

          <fileMode>input</fileMode>

          <internalDefault>None</internalDefault>

          <brief>