Commit f58ef0ad authored by Kris Becker's avatar Kris Becker
Browse files

Change test for valid geometry at a line/sample in phocube to check return... 

Change test for valid geometry at a line/sample in phocube to check return result of Camera method rather than state of the shape model. Fixes #2252.

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

isis/src/base/apps/phocube/phocube.cpp

+3 −12
Original line number Diff line number Diff line
@@ -267,24 +267,15 @@ void phocube(Buffer &out) { 
      int index = i * 64 + j + skipDN;

      double samp = out.Sample(index);

      double line = out.Line(index);

      if (noCamera) {

        proj->SetWorld(samp, line);

      }

      else {

        cam->SetImage(samp, line);

      }



      bool isGood=false;

      if (noCamera) {

        if (proj->IsGood()) {

          isGood = true;

        }

        isGood = proj->SetWorld(samp, line);

      }

      else {

        if (cam->HasSurfaceIntersection()) {

          isGood = true;

        }

        isGood = cam->SetImage(samp, line);

      }



      if (isGood) {

        if(phase) {

          out[index] = cam->PhaseAngle();

isis/src/base/apps/phocube/phocube.xml

+6 −0
Original line number Diff line number Diff line
@@ -270,6 +270,12 @@ 
      The error thrown when the input is a projected image was misleading. It has been fixed to 

      be more helpful for the user. Fixes #923.

    </change>

    <change name="Kris Becker" date="2015-05-15">

      Corrected tests for valid line/sample geometry for a given pixel. Rather

      than test the state of the DEM, test the result of the initial attempt

      to intersect body. Camera class was also changed to set initial state of

      DEM properly. Fixes #2252.

    </change>

  </history>



  <category>