Commit b244c3dc authored by Amy Stamile's avatar Amy Stamile
Browse files

removed QT from ArraySubscriptNotInRange

parent 6078ea45

isis/src/base/objs/Buffer/Buffer.cpp

+5 −5
Original line number Diff line number Diff line
@@ -197,17 +197,17 @@ namespace Isis { 
  int Buffer::Index(const int i_samp, const int i_line, const int i_band)

      const {

    if((i_samp < p_sample) || (i_samp > (p_sample + p_nsamps - 1))) {

      QString message = Message::ArraySubscriptNotInRange(i_samp);

      std::string message = Message::ArraySubscriptNotInRange(i_samp);

      throw IException(IException::Programmer, message, _FILEINFO_);

    }



    if((i_line < p_line) || (i_line > (p_line + p_nlines - 1))) {

      QString message = Message::ArraySubscriptNotInRange(i_line);

      std::string message = Message::ArraySubscriptNotInRange(i_line);

      throw IException(IException::Programmer, message, _FILEINFO_);

    }



    if((i_band < p_band) || (i_band > (p_band + p_nbands - 1))) {

      QString message = Message::ArraySubscriptNotInRange(i_band);

      std::string message = Message::ArraySubscriptNotInRange(i_band);

      throw IException(IException::Programmer, message, _FILEINFO_);

    }
@@ -230,11 +230,11 @@ namespace Isis { 
   */

  double Buffer::at(const int index) const {

    if(index < 0) {

      QString message = Message::ArraySubscriptNotInRange(index);

      std::string message = Message::ArraySubscriptNotInRange(index);

      throw IException(IException::Programmer, message, _FILEINFO_);

    }

    else if(index >= p_npixels) {

      QString message = Message::ArraySubscriptNotInRange(index);

      std::string message = Message::ArraySubscriptNotInRange(index);

      throw IException(IException::Programmer, message, _FILEINFO_);

    }

isis/src/base/objs/Histogram/Histogram.cpp

+3 −3
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ namespace Isis { 


    if ( (index < 0) || (index >= (int)p_bins.size() ) ) {



      QString message = Message::ArraySubscriptNotInRange(index);

      std::string message = Message::ArraySubscriptNotInRange(index);



      throw IException(IException::Programmer, message, _FILEINFO_);

    }
@@ -428,7 +428,7 @@ namespace Isis { 
                           double &low, double &high) const {

    if ( (index < 0) || (index >= (int)p_bins.size() ) ) {



      QString message = Message::ArraySubscriptNotInRange(index);

      std::string message = Message::ArraySubscriptNotInRange(index);

      throw IException(IException::Programmer, message, _FILEINFO_);

    }
@@ -449,7 +449,7 @@ namespace Isis { 
  double Histogram::BinMiddle(const int index) const {

    if ( (index < 0) || (index >= (int)p_bins.size() ) ) {



      QString message = Message::ArraySubscriptNotInRange(index);

      std::string message = Message::ArraySubscriptNotInRange(index);



      throw IException(IException::Programmer, message, _FILEINFO_);

    }

isis/src/base/objs/ImageHistogram/ImageHistogram.cpp

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ namespace Isis { 
                                double &low, double &high) const {

    if ( (index < 0) || (index >= (int)p_bins.size() ) ) {



      QString message = Message::ArraySubscriptNotInRange(index);

      std::string message = Message::ArraySubscriptNotInRange(index);

      throw IException(IException::Programmer, message, _FILEINFO_);

    }

isis/src/core/include/Message.h

+2 −2
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ namespace Isis { 
     *

     * @param index - Array index which is out of bounds

     *

     * @return QString - A standardized Isis error message with the parameter

     * @return std::string - A standardized Isis error message with the parameter

     *                  inserted

     */

    QString ArraySubscriptNotInRange(int index);

    std::string ArraySubscriptNotInRange(int index);



    /**

     * This error should be used when a supplied keyword for an Isis application

isis/src/core/src/ArraySubscriptNotInRange.cpp

+2 −4
Original line number Diff line number Diff line
@@ -22,12 +22,10 @@ 
 */



#include <sstream>



#include "IString.h"

#include "Message.h"



using namespace std;



QString Isis::Message::ArraySubscriptNotInRange(int index) {

  return "Array subscript [" + toString(index) + "] is out of array bounds";

std::string Isis::Message::ArraySubscriptNotInRange(int index) {

  return "Array subscript [" + std::to_string(index) + "] is out of array bounds";

}