Commit aca22153 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev

parents bcffd0e1 5369faa9
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -369,9 +369,10 @@ namespace Isis {
               "dimensions were (S,L,B) [" + toString(m_samples) + ", " +
               toString(m_lines) + ", " + toString(m_bands) + "] with [" +
               toString(SizeOf(m_pixelType)) + "] bytes per pixel. If you still "
               "wish to create this cube, the maximum value can be changed in the"
               " file [~/.Isis/IsisPreferences] within the group "
               "CubeCustomization, keyword MaximumSize.";
               "wish to create this cube, the maximum value can be changed in your personal "
               "preference file located in [~/.Isis/IsisPreferences] within the group "
               "CubeCustomization, keyword MaximumSize. If you do not have an ISISPreference file, "
               "please refer to the documentation \"Environment and Preference Setup\". Error ";
        throw IException(IException::User, msg, _FILEINFO_);
      }
    }
+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ namespace Isis {
   *   @history 2017-06-08 Chris Combs - Made "Failed to create" error messages more descriptive.
   *                           Fixes #833.
   *   @history 2017-09-22 Cole Neubauer - Fixed documentation. References #4807
   *   @history 2018-01-18 Summer Stapleton - Updated error message in ::create() to address when
   *                           an IsisPreference file cannot be found. Fixes #5145.
   */
  class Cube {
    public:
+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ Testing errors ...
**PROGRAMMER ERROR** Tried to write to a cube before opening/creating it.
**PROGRAMMER ERROR** Number of samples [0], lines [0], or bands [0] cannot be less than 1.
**I/O ERROR** Label space is full in [IsisCube_04.cub] unable to write labels.
**USER ERROR** The cube you are attempting to create [IsisCube_05] is [33527GB]. This is larger than the current allowed size of [12GB]. The cube dimensions were (S,L,B) [1000000, 1000000, 9] with [4] bytes per pixel. If you still wish to create this cube, the maximum value can be changed in the file [~/.Isis/IsisPreferences] within the group CubeCustomization, keyword MaximumSize.
**USER ERROR** The cube you are attempting to create [IsisCube_05] is [33527GB]. This is larger than the current allowed size of [12GB]. The cube dimensions were (S,L,B) [1000000, 1000000, 9] with [4] bytes per pixel. If you still wish to create this cube, the maximum value can be changed in your personal preference file located in [~/.Isis/IsisPreferences] within the group CubeCustomization, keyword MaximumSize. If you do not have an ISISPreference file, please refer to the documentation "Environment and Preference Setup". Error.
**PROGRAMMER ERROR** Unknown value for access [a]. Expected 'r'  or 'rw'.
**PROGRAMMER ERROR** SetDimensions:  Invalid number of sample, lines or bands.
**PROGRAMMER ERROR** SetDimensions:  Invalid number of sample, lines or bands.
+5 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ namespace Isis {
    // needs changing...

    #ifdef Q_OS_LINUX
    if (!XOpenDisplay(NULL)) {
    Display *xDisplay = XOpenDisplay(NULL);
    if (!xDisplay) {
      std::cerr << "cannot connect to X server...\n\n"
          "Do you have an X server running?\n\n"
          "If yes then...\n\n"
@@ -68,6 +69,9 @@ namespace Isis {

      abort();
    }
    else {
      XCloseDisplay(xDisplay);
    }
    #endif
  }

+55 −12
Original line number Diff line number Diff line
@@ -386,12 +386,11 @@ you must <em>not</em> upgrade the ISIS Data Files!!!
        </p>

        <span style="font-size:120%; color:red; font-weight:bold">
          WARNING: Some missions do not currently support calibration when using the SPICE Web
          Service exclusively: these include LRO, MRO, Viking, MGS, and MER. These calibration
          programs are lronaccal, lrowaccal, mical, moccal, ctxcal, hical, vikcal, mocevenodd, and
          mocnoise50. Some programs designed to run an image from ingestion through the mapping
          phase do not have an option to use the SPICE Web Service. Known programs are thmproc,
          mocproc, hicalproc, and mdisproc.
          WARNING: Some instruments require mission data to be present for calibration, which may
          not be supported by the SPICE Web Server exclusively, and some programs that are designed
          to run an image from ingestion through the mapping phase do not have an option to use the
          SPICE Web Service. For information specific to an instrument, see the documentation for
          radiometric callobration programs.
        </span>

          <A NAME="ApolloMission"> </A>
@@ -410,7 +409,7 @@ you must <em>not</em> upgrade the ISIS Data Files!!!
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/cassini data/
        </pre>
<p>
  Chan1 Mission (kernels can be excluded):
  Chandrayaan Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/chan1 data/
@@ -427,18 +426,43 @@ you must <em>not</em> upgrade the ISIS Data Files!!!
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/dawn data/
        </pre>
<p>
  ExoMars Trace Gas Orbiter Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/tgo data/
        </pre>
<p>
  Galileo Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/galileo data/
        </pre>
<p>
  Hayabusa Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/hayabusa data/
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/hayabusa2 data/
        </pre>
<p>
  Ideal Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/ideal data/
        </pre>
<p>
  Juno Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/juno data/
        </pre>
<p>
  Kaguya Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/kaguya data/
        </pre>
<p>
  Lunar Orbiter Mission (kernels can be excluded):
</p>
@@ -493,18 +517,36 @@ you must <em>not</em> upgrade the ISIS Data Files!!!
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/odyssey data/
        </pre>
<p>
  Near Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/near data/
        </pre>
<p>
  New Horizons Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/newhorizons data/
        </pre>
<p>
  Odyssey Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/odyssey data/
        </pre>
<p>
  Rolo Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/rolo data/
        </pre>
<p>
  Rosetta Mission (kernels can be excluded):
</p>
        <pre>
        rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/rosetta data/
        </pre>
<p>
  Smart1 Mission (kernels can be excluded):
</p>
@@ -639,6 +681,7 @@ you must <em>not</em> upgrade the ISIS Data Files!!!
    <change name="Ian Humphrey" date="2016-02-26">Updated for latest Fedora version (Fedora21).</change>
    <change name="Adam Paquette" date="2016-06-24">Updated links to the support center.</change>
    <change name="Ian Humphrey" date="2017-01-25">Updated instructions for new supported systems.</change>
    <change name="Summer Stapleton" date="2017-12-29">Updated SPICE Web Service mission information to include newer missions.</change>
  </history>

  <bibliography>