Commit 7f9c4861 authored by Kristin Berry's avatar Kristin Berry
Browse files

Fixed string conversion error in apollofindrx and added test. Fixes #2043 

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

isis/src/apollo/apps/apollofindrx/apollofindrx.cpp

+7 −7
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ void IsisMain () 
    // for (int res=0; res<nres; res++)

    for (int res=0; res<nres; res++)

    {

        currentLine = (int)(toDouble(reseaus["Line"][res]+0.5));

        currentSample = (int)(toDouble(reseaus["Sample"][res]+0.5));

      currentLine = (int)(toDouble(reseaus["Line"][res])+0.5);

      currentSample = (int)(toDouble(reseaus["Sample"][res])+0.5);



      // Output chips

      chip.SetSize(patternSize + 2*ds , patternSize + 2*dl);
@@ -110,10 +110,10 @@ void IsisMain () 
        double horizontalShift = currentSample - patternSize/2 - ds + bestSample-1 - toDouble(reseaus["Sample"][res]) - dx,

                    verticalShift = currentLine - patternSize/2 - dl + bestLine-1 - toDouble(reseaus["Line"][res]) - dy;

        for (int i=res; i<nres; i++) {

          reseaus["Sample"][i] = toDouble(reseaus["Sample"][i]) + horizontalShift + ((i/dim) - (res/dim) + 1)*dx;

          reseaus["Line"][i] = toDouble(reseaus["Line"][i]) + verticalShift + ((i%dim) - (res%dim) + 1)*dy;

          reseaus["Sample"][i] = toString(toDouble(reseaus["Sample"][i]) + horizontalShift + ((i/dim) - (res/dim) + 1)*dx);

          reseaus["Line"][i] = toString(toDouble(reseaus["Line"][i]) + verticalShift + ((i%dim) - (res%dim) + 1)*dy);

        }

        reseaus["Valid"][res] = 1;

        reseaus["Valid"][res] = "1";

        validReseaus++;



        std::vector< double > xy;
@@ -142,8 +142,8 @@ void IsisMain () 
        std::vector< double > xy;

        xy.push_back(res%(int)sqrt(nres));

        xy.push_back(res/(int)sqrt(nres));

        reseaus["Sample"][res] = sampFunc.Evaluate(xy);

        reseaus["Line"][res] = lineFunc.Evaluate(xy);

        reseaus["Sample"][res] = toString(sampFunc.Evaluate(xy));

        reseaus["Line"][res] = toString(lineFunc.Evaluate(xy));

      }

    }

isis/src/apollo/apps/apollofindrx/apollofindrx.xml

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
    <change name="Jacob Danton" date="2007-01-24">

      Original version

    </change>

    <change name="Kristin Berry" date="2014-05-23">

      Updated to fix string conversion error. References #2043

    </change>

  </history>



  <groups>

isis/src/apollo/apps/apollofindrx/tsts/default/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -3,4 +3,7 @@ APPNAME = apollofindrx 
include $(ISISROOT)/make/isismake.tsts



commands:

	cp $(INPUT)/deferred.txt $(OUTPUT)/deferred.txt > /dev/null;
 
	cp $(INPUT)/AS15-M-1450.cub $(OUTPUT)/AS15-M-1450.cub > /dev/null; 

	apollofindrx from=$(OUTPUT)/AS15-M-1450.cub > /dev/null;

	catlab from=$(OUTPUT)/AS15-M-1450.cub \

        to=$(OUTPUT)/AS15-M-1450.pvl > /dev/null;

isis/src/apollo/apps/apollowarp/apollowarp.cpp

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ void IsisMain() { 
    outputSample.push_back(toDouble(master["Sample"][i]));



    // Update the cube's reseau information

    reseaus["Line"][i] = outputLine[i];

    reseaus["Sample"][i] = outputSample[i];

    reseaus["Line"][i] = toString(outputLine[i]); //added toString

    reseaus["Sample"][i] = toString(outputSample[i]); //""

  }



  // Get the final output image dimensions

isis/src/apollo/apps/apollowarp/apollowarp.xml

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
    <change name="Jacob Danton" date="2007-01-30">

      Original version

    </change>

    <change name="Kristin Berry" date="2014-05-29"> 

	Updated to fix string conversion error. References #2043. 

    </change>

    </history>



  <category>