Unverified Commit 7a016b2c authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Merge pull request #38 from jessemapel/cnet

Merged dev into CNetImprovements branch
parents 4a78ed2a aba6bb7c
Loading
Loading
Loading
Loading
+9 −11
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@
# Unignore all dirs
!*/

# Unignore Makefiles, and TestPreferences
!Makefile
!TestPreferences
!*/3rdParty/Makefile

*.cub
*.o
@@ -18,27 +21,22 @@ moc_*
*.pb.*
*.lbl
*.img

!TestPreferences

print.prt

*.kate-swp
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
*.moc
ui_*.h

*/3rdParty/*
!*/3rdParty/Makefile
# ignore all files created by squish coco
*csmes

*/inc/*
print.prt

*/3rdParty/*
*/inc/*
*/bin/*

*/lib/*

*/tsts/*/input/*
*/tsts/*/truth/*
*/tsts/*/output/*
+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
  }

Loading