Commit 5108dfd6 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Updated from trunk 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6315 41f8697f-d340-4b68-9986-7bafba869bb8
parent 2d4be773

isis/src/base/apps/map2map/map2map.cpp

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ void IsisMain() { 
      outMappingGrp.deleteKeyword("PixelResolution");

    }



    if(fromMappingGrp.hasKeyword("Scale"));

    {

    if(fromMappingGrp.hasKeyword("Scale")) {

      fromMappingGrp.deleteKeyword("Scale");

    }

isis/src/base/apps/map2map/map2map.xml

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ 
    <change name="Tracie Sucharski" date="2012-12-06">

      Changed to use TProjection instead of Projection.  References #775

    </change>

    <change name="David L Miller" date="2015-08-10">

      Fixed bug where map2map fails when missing Scale keyword in the MAP file. Fixes #2151

    </change>

  </history>



  <oldName>

isis/src/base/apps/map2map/tsts/keywords/Makefile

0 → 100644
+16 −0
Original line number Diff line number Diff line 
APPNAME = map2map



include $(ISISROOT)/make/isismake.tsts

# testing for when the Scale keyword is missing from the input cube and the map.

commands: 

	# scale keyword missing

	$(APPNAME) FROM=$(INPUT)/dullesSmall.cub \

	MAP=$(INPUT)/noScaleSmall.pvl \

	TO=$(OUTPUT)/dullesNoScaleSmall.cub \

	MATCHMAP=yes > /dev/null;



	#scale keyword is defined

	$(APPNAME) FROM=$(INPUT)/dullesSmallYesScale.cub \

	MAP=$(INPUT)/yesScaleSmall.pvl \

	TO=$(OUTPUT)/dullesYesScaleSmall.cub \

	MATCHMAP=yes > /dev/null;
 
 No newline at end of file

isis/src/control/apps/cnetedit/cnetedit.cpp

+1 −3
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ void IsisMain() { 
              ignorePoint(cnet, point, "Reference measure ignored");

            }

            else {

              // Can't delete the reference without deleting the whole point when ignoreAll is true

              deleteMeasure(point, cm);

            }

          }
@@ -773,8 +772,7 @@ void ignoreMeasures(ControlNet &cnet, 
        }



        //also look for previously ignored control measures

        if (deleteIgnored && measure->IsIgnored() &&

            cm != point->IndexOfRefMeasure()) {

        if (deleteIgnored && measure->IsIgnored()) {

          deleteMeasure(point, cm);

        }

      }

isis/src/control/apps/cnetedit/cnetedit.xml

+16 −18
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ 
    <p>

      Additional options include the ability to preserve points with less than a

      single valid measure, ability to retain the <def link="Reference

        Measure">reference</def> (even if not validated or exists in an ignore

      list), and the ability to print detailed logging results to a text file.

        Measure">reference</def>, and the ability to print detailed logging results to a text file.

    </p>

  </description>
@@ -135,6 +134,7 @@ 
    <change name="Kristin Berry" date="2015-07-30"> 

      Updated so that behavior is consistent with documentation. Now when a reference

      measure is removed, the whole point is only removed if IGNOREALL is true. 

      Fixes #2238.

    </change>

  </history>
@@ -272,8 +272,7 @@ 
          Ignore listed points and measures

        </brief>

        <description>

          Any listed point or measure will be ignored.  Ignoring a point does

          not automatically ignore its measurements, except for the reference.

          Any listed point or measure will be ignored. 

          Ignoring can sometimes fail, for example, if the point or measure is

          edit locked, and the UNLOCK operation is not enabled.

        </description>
@@ -398,38 +397,37 @@ 
        <type>boolean</type>

        <default><item>FALSE</item></default>

        <brief>

          Preserve points with only one remaining measure

          Do not delete points with only one remaining measure

        </brief>

        <description>

          This option will prevent the DELETE operation from removing control

          points that only have one control measure remaining at the end of the

          deletion process.

          PRESERVE is only applied when DELETE=YES. This option will prevent the DELETE operation from removing control

          points that only have one measure remaining at the end of the deletion process.

        </description>

      </parameter>

      <parameter name="RETAIN_REFERENCE">

        <type>boolean</type>

        <default><item>False</item></default>

        <brief>

          Never delete a reference measure unless the entire point is removed

          Never ignore a reference measure unless the entire point is removed

        </brief>

        <description>

          When enabled, the DELETE operation will retain reference measures

          under all circumstances.  Consequently, if a reference measure is

          ignored, in an edit list, or invalidated, it will still show up in the

          output network.

          RETAIN_REFERENCE is only applied when DELETE=YES. This option will prevent reference measures from being ignored 

          when they are included in the MEASURELIST, CUBELIST, or determined to be invalid when CHECKVALID is used. It does 

          not prevent them from being deleted if they are already ignored prior to running cnetedit. Note: After the deletion process, 

          if the RETAIN_REFERENCE=YES and the reference measure is the only remaining single measure of a point and PRESERVE=NO,

          the entire point will be deleted. In order to gurarntee retaining a reference in this case, set both PRESERVE=YES 

          and RETAIN_REFERENCE=YES.

        </description>

      </parameter>

      <parameter name="IGNOREALL">

        <type>boolean</type>

        <default><item>False</item></default>

        <brief>

          Ignore all measures in the point when the reference measure is ignored

          Ignore the whole point when the reference measure is ignored

        </brief>

        <description>

          When enabled, any time a point or the reference measure is ignored the remaining measures

          in a point will also be ignored. Occassionally the reference measure has the highest error

          and we don't want to retain it, but the rest of the measures are also unreliable so it's

          helpful to ignore them also.

          If a reference measure is ignored, the whole point is ignored. If DELETE=yes, 

          then the whole point will be deleted. 

        </description>

      </parameter>

    </group>