Commit d83bc3c5 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fx - fixed bug where cube attributes on files in the fromlist were ignored. Fixes#1926. 

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

isis/src/base/apps/fx/fx.cpp

+2 −2
Changes for isis/src/base/apps/fx/fx.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ void IsisMain() { 


    // Run through file list and set its entries as input cubes

    for (int i = 0; i < list.size(); i++) {

      CubeAttributeInput att(list[i].toString());

      cubes.push_back(p.SetInputCube(list[i].toString(), att, Isis::AllMatchOrOne));

      CubeAttributeInput att(list[i].original());

      cubes.push_back(p.SetInputCube(list[i].original(), att, Isis::AllMatchOrOne));

    }

    outCube = p.SetOutputCube("TO");

  }

isis/src/base/apps/fx/fx.xml

+4 −0
Changes for isis/src/base/apps/fx/fx.xml: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -696,6 +696,10 @@ 
       "Related Objects and Documents" section of the documentation.

       Fixes mantis ticket #1525.

    </change>

    <change name="Tracie Sucharski" date="2013-12-11">

      Fixed bug where the cube attributes on files in the fromlist were

      ignored.  Fixes #1926."

    </change>

  </history>



  <groups>

isis/src/base/apps/fx/tsts/filelistattributes/Makefile

0 → 100644
+9 −0
Changes for isis/src/base/apps/fx/tsts/filelistattributes/Makefile: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line 
APPNAME = fx



include $(ISISROOT)/make/isismake.tsts



commands:

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

	mode=list \

	equation=f1*f2 \

	to=$(OUTPUT)/f1Multf2.cub > /dev/null;