Commit 348acf88 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

output of isis2ascii increased significant figures from 6 digits to 7. Fixes #2098 

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

isis/src/base/apps/isis2ascii/isis2ascii.cpp

+6 −1
Original line number Diff line number Diff line 
#include "Isis.h"



#include <iomanip>



#include "FileName.h"

#include "ProcessByLine.h"

#include "SpecialPixel.h"

#include "FileName.h"



using namespace std;

using namespace Isis;
@@ -29,6 +32,8 @@ void IsisMain() { 
         icube->lineCount() << ":" << icube->bandCount() << endl;

  }

  

  fout << std::setprecision(7);

  

  // List the cube

  p.StartProcess(isis2ascii);

  p.EndProcess();

isis/src/base/apps/isis2ascii/isis2ascii.xml

+13 −6
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ 
    <change name="Steven Lambright" date="2008-05-12">

      Removed references to CubeInfo 

    </change>

    <change name="Makayla Shepherd" date="2015-01-30">

      Increased precision of the DNs in the output text file from 6 to 7

    </change>

  </history>
@@ -100,7 +103,6 @@ 
        </default>

      </parameter>

    </group>



  </groups>



  <liens>
@@ -111,17 +113,20 @@ 


    <example>

      <brief> Header default </brief>

      <description> Demonstrate the isis2ascii application with header

      <description> 

	Demonstrate the isis2ascii application with header

      </description>

      <terminalInterface>

        <commandLine> f=../IN/f332s28.cub t=OUT/isis2ascii.txt </commandLine>

        <description> Convert Viking ISIS image to ascii file.  Let header default to yes.

        <description> 

	  Convert Viking ISIS image to ascii file.  Let header default to yes.

        </description>

      </terminalInterface>

      <inputImages>

        <image src="assets/image/f332s28.jpg" width="500" height="439">

          <brief> Input image for isis2ascii</brief>

          <description>This is the input image f332s28.cub to be converted to ascii.

          <description>

	    This is the input image f332s28.cub to be converted to ascii.

          </description>

          <thumbnail caption=" Input image" src="assets/thumb/f332s28.jpg" width="200" height="175"/>

          <parameterName>FROM</parameterName>
@@ -130,7 +135,8 @@ 
      <outputImages>

        <image src="assets/image/isis2asciiTxt.jpg" width="500" height="523">

          <brief> Example output ascii text from isis2ascii run</brief>

          <description> This is the output ascii text file isis2ascii.txt with the header.

          <description> 

	    This is the output ascii text file isis2ascii.txt with the header.

          </description>

          <thumbnail caption="Output image showing results of the isis2ascii application." src="assets/thumb/isis2asciiTxt.jpg" width="200" height="209"/>

          <parameterName>TO</parameterName>
@@ -141,7 +147,8 @@ 
        <guiInterface>

          <image width="455" height="247" src="assets/image/isis2asciiGui.jpg">

            <brief>Example GUI</brief>

            <description>Screenshot of GUI with parameters filled in to perform

            <description>

	      Screenshot of GUI with parameters filled in to perform

	      the isis2ascii application</description>

            <thumbnail width="200" height="109" caption="isis2ascii GUI" src="assets/thumb/isis2asciiGui.jpg"/>

          </image>

isis/src/base/apps/isis2ascii/tsts/caselarge/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
APPNAME = isis2ascii



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from = $(INPUT)/vesta64_dtm_top.cub \

	  to = $(OUTPUT)/vesta64ascii.txt > /dev/null;

isis/src/base/apps/isis2ascii/tsts/casesmall/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
APPNAME = isis2ascii



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from = $(INPUT)/vikcalTruth.cub \

	  to = $(OUTPUT)/vikcalascii.txt > /dev/null;