Commit fb6c1ebb authored by Adam Paquette's avatar Adam Paquette
Browse files

Updated cnetref to work when selecting a High Resolution on some images. Fixes #2149. 

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

isis/src/control/apps/cnetref/tsts/resolutionHigh/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -15,3 +15,9 @@ commands: 
	  networkid=DefaultTruth \

	  Description=RefByResolutionHigh > /dev/null;

	  $(RM) $(OUTPUT)/cube.lis;

	$(APPNAME) fromlist=$(INPUT)/apolloList.lis \

	  cnet=$(INPUT)/apolloSeed.net \

	  criteria=resolution \

	  type=high \

	  onet=$(OUTPUT)/apolloTruth.net > /dev/null;

# cnetref fromlist=/home/acpaquette/REV71.lis cnet=/home/acpaquette/AS15-REV71_Add-SPLT10.net onet=/home/acpaquette/temp.net criteria=resolution
 
 No newline at end of file

isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp

+6 −4
Original line number Diff line number Diff line
@@ -208,11 +208,13 @@ namespace Isis { 


    if (measureCamera != NULL) {

      measureCamera->SetImage(pSample, pLine);



      bool success = measureCamera->SetImage(pSample, pLine);

      if (success) {

        mdEmissionAngle     = measureCamera->EmissionAngle();

        mdIncidenceAngle    = measureCamera->IncidenceAngle();

        mdResolution        = measureCamera->PixelResolution();

      }

    }



    if (pMeasure != NULL) {

      double temp = pMeasure->GetSampleResidual();

isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ namespace Isis { 
    *                          Fixes #1436. 

    *  @history 2014-03-03 Janet Barrett - Initialize the mdDnValue variable in

    *                          the ValidStandardOptions method. Fixes #2040.

    *  @history 2016-07-13 Adam Paquette - Updated ValidStandardOptions to only

    *                          get the EmissionAngle, IncidenceAngle, and PixelResolution

    *                          if an image was properly set.

    */



  class ControlNetValidMeasure {