Commit af5e6e9b authored by Adam Goins's avatar Adam Goins
Browse files

changed SerialNumberList::Delete() method name to remove(), changed all... 

changed SerialNumberList::Delete() method name to remove(), changed all references to the new method name. #Fixes 3991

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7969 41f8697f-d340-4b68-9986-7bafba869bb8
parent 62677d39

isis/src/base/objs/SerialNumberList/SerialNumberList.cpp

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

   * @author 2010-09-09 Sharmila Prasad

   */

  void SerialNumberList::Delete(const QString &sn) {

  void SerialNumberList::remove(const QString &sn) {

    int index = serialNumberIndex(sn);

    QString sFileName = fileName(sn);

isis/src/base/objs/SerialNumberList/SerialNumberList.h

+3 −1
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ namespace Isis { 
   *                          serial number and a filename.

   *  @history 2016-06-02 Ian Humphrey - Removed SpacecraftInstrumentId method prototypes

   *                          Fixes #3967.

   *  @history 2017-08-09 Adam Goins - Modified code to be consistent with ISIS coding standards

   *                          Fixes #3991.

   */



  class SerialNumberList {
@@ -86,7 +88,7 @@ namespace Isis { 
      void add(const char *serialNumber, const char *filename);

      bool hasSerialNumber(QString sn);

      

      void Delete(const QString &sn);

      void remove(const QString &sn);



      int size() const;

      QString fileName(const QString &sn);

isis/src/base/objs/SerialNumberList/unitTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ using namespace std; 
 * @internal

 *   @history 2015-12-22 Jeannie Backer - Improved test coverage.

 *   @history 2016-06-02 Ian Humphrey - Improved test coverage.

 *   @history 2017-08-08 Adam Goins - modified snl.Delete() to snl.remove()

 *  

 *   @todo Test error throws from add(const QString &filename, bool def2filename) :

 *         "Invalid serial number [Unknown]"
@@ -50,7 +51,7 @@ int main(int argc, char *argv[]) { 


    cout << endl << endl;

    cout << "Deleting first SerialNumber in the list..." << endl;

    snl.Delete(snl.serialNumber(0));

    snl.remove(snl.serialNumber(0));

    cout << "new list size = " << snl.size() << endl;

    cout << "new list serial numbers: " << endl;

    for(int i = 0; i < snl.size(); i++) {

isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ namespace Isis { 
      double convexHullRatio = imgStats[imgConvexHullRatio];

      if (convexHullRatio < dGreater || convexHullRatio > dLesser){

        FilterOutMeasuresBySerialNum(sSerialNum);

        mSerialNumFilter.Delete(sSerialNum);

        mSerialNumFilter.remove(sSerialNum);

      }

      else if (pbLastFilter) {

        mOstm << mSerialNumFilter.fileName(sSerialNum) << ", " << sSerialNum << ", "
@@ -1197,7 +1197,7 @@ namespace Isis { 
          }

          else {

            FilterOutMeasuresBySerialNum(sSerialNum);

            mSerialNumFilter.Delete(sSerialNum);

            mSerialNumFilter.remove(sSerialNum);

            break;

          }

        }
@@ -1262,7 +1262,7 @@ namespace Isis { 
      double numPoints = imgStats[imgTotalPoints];

      if (numPoints < iGreaterPoints || numPoints > iLessPoints){

        FilterOutMeasuresBySerialNum(sSerialNum);

        mSerialNumFilter.Delete(sSerialNum);

        mSerialNumFilter.remove(sSerialNum);

      }

      else if (pbLastFilter) {

        mOstm << mSerialNumFilter.fileName(sSerialNum) << ", " << sSerialNum << ", "
@@ -1446,7 +1446,7 @@ namespace Isis { 
      } //end Loop Point1

      if (!bMatchDistance) {

        FilterOutMeasuresBySerialNum(sSerialNum);

        mSerialNumFilter.Delete(sSerialNum);

        mSerialNumFilter.remove(sSerialNum);

      }

      else if (pbLastFilter) {

        vector <double> imgStats = GetImageStatsBySerialNum((sSerialNum));

isis/src/control/objs/ControlNetFilter/ControlNetFilter.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ namespace Isis { 
   *  @history 2011-10-05 Sharmila Prasad - Report double values with 10 digit precision

   *  @history 2011-11-03 Sharmila Prasad - Added functionality to filter by Convex Hull Ratio

   *  @history 2011-12-29 Sharmila Prasad - Updated GoodnessOfFit Filter. Fixes Mantis #652

   *  @history 2017-08-08 Adam Goins - Changed references to SerialNumberList::Delete() to 

   *                                     SerialNumberList::remove()

   */

  class ControlNetFilter : public ControlNetStatistics {

    public: