Commit 13b556e6 authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Fixed error message typo in cnetdiff. Fixes #3871 

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

isis/src/control/apps/cnetdiff/cnetdiff.cpp

+6 −6
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void Compare(LatestControlNetFile *net1, LatestControlNetFile *net2) { 
  if(net1NumPts != net2NumPts) {

    differenceReason = "The number of control points in the networks, [" +

                       toString(net1NumPts) + "] and [" +

                       toString(net2NumPts) + ", differ";

                       toString(net2NumPts) + "], differ.";

    filesMatch = false;

    return;

  }
@@ -139,7 +139,7 @@ void Compare(LatestControlNetFile *net1, LatestControlNetFile *net2) { 
  if(id1 != id2) {

    differenceReason = "The network IDs [" +

                       id1 + "] and [" +

                       id2 + " differ";

                       id2 + "] differ.";

    filesMatch = false;

    return;

  }
@@ -150,7 +150,7 @@ void Compare(LatestControlNetFile *net1, LatestControlNetFile *net2) { 
  if(target1 != target2) {

    differenceReason = "The targets [" +

                       target1 + "] and [" +

                       target2 + " differ";

                       target2 + "] differ.";

    filesMatch = false;

    return;

  }
@@ -176,7 +176,7 @@ void Compare(const PvlObject &point1Pvl, const PvlObject &point2Pvl) { 
  // both names must be at least equal, should be named ControlPoint

  if(point1Pvl.name() != point2Pvl.name()) {

    QString msg = "The control points' CreatePvlOject method returned an "

                  "unexpected result";

                  "unexpected result.";

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

  }
@@ -184,7 +184,7 @@ void Compare(const PvlObject &point1Pvl, const PvlObject &point2Pvl) { 
    filesMatch = false;

    differenceReason = "The number of control measures, [" +

                       toString(point1Pvl.groups()) + "] and [" +

                       toString(point2Pvl.groups()) + "] does not match";

                       toString(point2Pvl.groups()) + "] does not match.";

  }



  // Start by comparing top level control point keywords.
@@ -248,7 +248,7 @@ void CompareGroups(const PvlContainer &pvl1, const PvlContainer &pvl2) { 
void CompareKeywords(const PvlKeyword &pvl1, const PvlKeyword &pvl2) {

  if(pvl1.name().compare(pvl2.name()) != 0) {

    QString msg = "CompareKeywords should always be called with keywords that "

                  "have the same name";

                  "have the same name.";

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

  }

isis/src/control/apps/cnetdiff/cnetdiff.xml

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
      Added REPORT radio button allowing users to select the FULL option and get

      a complete PVL report of all differences between two networks.

    </change>

    <change name="Jesse Mapel" date="2016-03-29">

      Added missing "]" in results message.  Error messages are now complete sentences. Fixes #3871.

    </change>

  </history>



  <category>