Commit f768208f authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Updated camstats to include statistical information for the improved... 

Updated camstats to include statistical information for the improved approximations to the Pixel/Line/Sample/Detector resolutions in the Camera class.  References #476

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

isis/src/base/apps/camstats/camstats.cpp

+19 −2
Original line number Diff line number Diff line
@@ -112,7 +112,21 @@ void IsisMain() { 
           "NorthAzimuthMinimum," <<

           "NorthAzimuthMaximum," <<

           "NorthAzimuthAverage," <<

           "NorthAzimuthStandardDeviation," << endl;

           "NorthAzimuthStandardDeviation," <<

           "ObliqueResolutionMinimum," <<

           "ObliqueResolutionMaximum," <<

           "ObliqueResolutionAverage," <<

           "ObliqueResolutionStandardDeviation," <<

           "ObliqueLineResolutionMinimum," <<

           "ObliqueLineResolutionMaximum," <<

           "ObliqueLineResolutionAverage," <<

           "ObliqueLineResolutionStandardDeviation," <<

           "ObliqueSampleResolutionMinimum," <<

           "ObliqueSampleResolutionMaximum," <<

           "ObliqueSampleResolutionAverage," <<

           "ObliqueSampleResolutionStandardDeviation," << endl;





      }

      os << FileName(from).expanded() << ",";

      //call the function to write out the values for each group
@@ -128,6 +142,9 @@ void IsisMain() { 
      writeFlat(os, camStats.getLocalSolarTimeStat());

      writeFlat(os, camStats.getLocalRaduisStat());

      writeFlat(os, camStats.getNorthAzimuthStat());

      writeFlat(os,camStats.getObliqueResStat());

      writeFlat(os,camStats.getObliqueLineResStat());

      writeFlat(os,camStats.getObliqueSampleResStat());

      os << endl;

    }

  }
@@ -137,7 +154,7 @@ void IsisMain() { 
    QString cam_name = "CameraStatistics";



    //Creates new CameraStatistics Table

    TableField fname("Name", Isis::TableField::Text, 20);

    TableField fname("Name", Isis::TableField::Text, 45);

    TableField fmin("Minimum", Isis::TableField::Double);

    TableField fmax("Maximum", Isis::TableField::Double);

    TableField favg("Average", Isis::TableField::Double);

isis/src/base/apps/camstats/camstats.xml

+19 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>



<application name="camstats" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">

<application name="camstats" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">



  <brief>

    Generates and outputs camera statistics for a cube in raw camera geometry
@@ -15,17 +16,20 @@ 
    average, and standard  deviation values.  The output groups are listed below:

    <blockquote>

    <ul>

      <li><def>Latitude</def></li>

      <li><def>Longitude</def></li>

      <li><def>Sample Resolution</def></li>

      <li><def>Line Resolution</def></li>

      <li><def link="Pixel Resolution">Resolution</def></li>

      <li><def link="Latitude">Latitude</def></li>

      <li><def link="Longitude">Longitude</def></li>

      <li><def link="Sample Resolution">Sample Resolution</def></li>

      <li><def link="Line Resolution">Line Resolution</def></li>

      <li><def link="Pixel Resolution">Pixel Resolution</def></li>

      <li><def link="Oblique Line Resolution">Oblique Line Resolution</def></li>

      <li><def link="Oblique Sample Resolution">Oblique Sample Resolution</def></li>

      <li><def link="Oblique Pixel Resolution">Oblique Pixel Resolution</def></li>

      <li><def>Aspect Ratio</def></li>

      <li><def>Phase Angle</def></li>

      <li><def>Emission Angle</def></li>

      <li><def>Incidence Angle</def></li>

      <li><def>Local Solar Time</def></li>

      <li><def>North Azimuth</def></li>

      <li><def link="Phase Angle">Phase Angle</def></li>

      <li><def link="Emission Angle">EmissionAngle</def></li>

      <li><def link="Incidence Angle">Incidence Angle</def></li>

      <li><def link="Local Solar Time">Local Solar Time</def></li>

      <li><def link="North Azimuth">North Azimuth</def></li>

    </ul>

    </blockquote>

    </p>
@@ -96,6 +100,10 @@ 
      documentation to clarify the existence and functioning of a few quirks. Addresses redmine

      ticket #175.

    </change>

    <change name="Tyler Wilson"  date="2016-08-17">

      Added statistics for ObliqueLineResolution/ObliqueSampleResolution,

      and Oblique Pixel Resolution. References #476, #4100.

    </change>

  </history>



  <category>

isis/src/base/apps/camstats/tsts/flat/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
APPNAME = camstats



include $(ISISROOT)/make/isismake.tsts

 

commands:

	$(APPNAME) FROM=$(INPUT)/input.cub TO=$(OUTPUT)/output.csv format=flat > /dev/null;