Commit 51d52a99 authored by Marjorie Hahn's avatar Marjorie Hahn
Browse files

Fixed a bug in findimageoverlaps that prevented fully enveloped images from... 

Fixed a bug in findimageoverlaps that prevented fully enveloped images from being recorded as overlaps.

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

isis/src/base/apps/findimageoverlaps/findimageoverlaps.cpp

+15 −15
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ void IsisMain() { 


  FileList images(ui.GetFileName("FROMLIST"));

  // list of sns/filenames sorted by serial number



  vector< pair<QString, QString> > sortedList;



  // We want to sort the input data by serial number so that the same
@@ -39,11 +40,10 @@ void IsisMain() { 
  ImageOverlapSet overlaps(true);



  // Use multi-threading to create the overlaps

  overlaps.FindImageOverlaps(serialNumbers, FileName(ui.GetFileName(

      "OVERLAPLIST")).expanded());



  overlaps.FindImageOverlaps(serialNumbers, 

                             FileName(ui.GetFileName("OVERLAPLIST")).expanded());



  // This will only occur when "CONTINUE" was true, so we can assume "ERRORS" was

  // This will only occur when "CONTINUE" is true, so we can assume "ERRORS" was

  //   an entered parameter.

  if (overlaps.Errors().size() != 0 && ui.WasEntered("ERRORS")) {

    Pvl outFile;

isis/src/base/apps/findimageoverlaps/findimageoverlaps.xml

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ 
      Improved documentation in preparation for the October release. Working

      with me to document findimageoverlaps was Ra'ad Saleh and Bob Sucharski.

    </change>

    <change name="Marjorie Hahn" date="2016-08-05">

      Fixed a bug where ImageOverlapSet was not recording overlaps where 

      one image is fully enveloped within another. Fixes #2199.

    </change>

  </history>



  <groups>

isis/src/base/apps/findimageoverlaps/tsts/default/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,5 +4,5 @@ include $(ISISROOT)/make/isismake.tsts 


commands:

	$(LS) $(INPUT)/*.cub > $(OUTPUT)/cubes.lis;

	$(APPNAME) FROM=$(OUTPUT)/cubes.lis OVERLAPLIST=$(OUTPUT)/overlaps.txt > /dev/null;

	$(APPNAME) FROMLIST=$(OUTPUT)/cubes.lis OVERLAPLIST=$(OUTPUT)/overlaps.txt > /dev/null;

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

isis/src/base/apps/findimageoverlaps/tsts/fulloverlap/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# This test checks to see that overlaps are properly generated 

# when one image is completely inside of another image.

APPNAME = findimageoverlaps



include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) $(INPUT)/*.cub > $(OUTPUT)/cubes.lis;

	$(APPNAME) FROM=$(OUTPUT)/cubes.lis OVERLAPLIST=$(OUTPUT)/overlaps.txt > /dev/null;

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

isis/src/base/apps/findimageoverlaps/tsts/nooverlap/Makefile

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# This tests to make sure that the proper exception is 

# thrown if no overlaps are present in the data set

APPNAME = findimageoverlaps



include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) $(INPUT)/*.cub > $(OUTPUT)/cubes.lis;

	

	if [[ `$(APPNAME) \

	  FROM=$(OUTPUT)/cubes.lis \

	  OVERLAPLIST=$(OUTPUT)/overlaps.txt \

	  2>> $(OUTPUT)/errors.txt \

	  > /dev/null` ]]; \

	then \

	  true; \

	fi;

	

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