Commit 6fb7bc11 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG: Updated documentation and removed unnecessary include files from... 

PROG: Updated documentation and removed unnecessary include files from cnet2dem's directory. References #3869.

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

isis/src/control/apps/cnet2dem/ControlPointCloudPt.h

+12 −3
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 


#include <QExplicitlySharedDataPointer>

#include <QSharedData>

#include <QVector>

#include <QtGlobal>

#include <QVector>



#include "ControlPoint.h"

#include "ControlMeasure.h"
@@ -42,8 +42,10 @@ namespace Isis { 
 *  The ControlPoint container is required to not change its content for the

 *  duration of use of the nanoflann kd-tree built from the points.

 *  

 * @author 2015-10-11 Kris Becker

 *  

 * @internal 

 * @history 2015-10-11 Kris Becker Original Version 

 *   @history 2015-10-11 Kris Becker - Original Version 

 */



class ControlPointCloudPt {
@@ -196,7 +198,14 @@ class ControlPointCloudPt { 
    }



  private:

    /** Shared ControlPoint data pointer */

    /** 

     * @brief Shared ControlPoint data pointer 

     * 

     * @author 2015-10-11 Kris Becker

     *  

     * @internal 

     *   @history 2015-10-11 Kris Becker - Original Version

     */

    class ControlPointData : public QSharedData {

      typedef ControlPointCloudPt::Ownership Ownership;

      public:

isis/src/control/apps/cnet2dem/DatumFunctoid.h

+63 −16
Original line number Diff line number Diff line
@@ -47,8 +47,10 @@ namespace Isis { 
   * This class will collect ControlPoint candidates that are within 

   * a tolerance generation of an output radius map pixel

   *  

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

 * @history 2015-11-16 Kris Becker Original Version 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  

  class DatumFunctoid {
@@ -82,7 +84,10 @@ class DatumFunctoid { 
  /**

   * @brief Return the average radius for the point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class AverageRadius : public DatumFunctoid {

    public:
@@ -103,7 +108,10 @@ class AverageRadius : public DatumFunctoid { 
  /**

   * @brief Return the median radius

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class MedianRadius : public DatumFunctoid {

    public:
@@ -143,7 +151,10 @@ class MedianRadius : public DatumFunctoid { 
  /**

   * @brief Return the standard deviation radius for the point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class StandardDeviationRadius : public DatumFunctoid {

    public:
@@ -168,7 +179,10 @@ class StandardDeviationRadius : public DatumFunctoid { 
  /**

   * @brief Return the maximum radius for the point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class MaximumRadius : public DatumFunctoid {

    public:
@@ -190,7 +204,10 @@ class MaximumRadius : public DatumFunctoid { 
  /**

   * @brief Return the minimum radius for the point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version

   */

  class MinimumRadius : public DatumFunctoid {

    public:
@@ -212,7 +229,10 @@ class MinimumRadius : public DatumFunctoid { 
  /**

   * @brief Return the average L2 distance from the reference point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class AverageDistance : public DatumFunctoid {

    public:
@@ -234,7 +254,10 @@ class AverageDistance : public DatumFunctoid { 
  /**

   * @brief Return the median L2 distance from the reference point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class MedianDistance : public DatumFunctoid {

    public:
@@ -274,7 +297,10 @@ class MedianDistance : public DatumFunctoid { 
  /**

   * @brief Return the standard deviation distance for the point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class StandardDeviationDistance : public DatumFunctoid {

    public:
@@ -297,7 +323,10 @@ class StandardDeviationDistance : public DatumFunctoid { 
  /**

   * @brief Return the maximum distance for the point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class MaximumDistance : public DatumFunctoid {

    public:
@@ -319,7 +348,10 @@ class MaximumDistance : public DatumFunctoid { 
  /**

   * @brief Return the minimum distance for the point

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version

   */

  class MinimumDistance : public DatumFunctoid {

    public:
@@ -346,7 +378,10 @@ class MinimumDistance : public DatumFunctoid { 
   * additionally applies a signed (+-1) to indicate if the FLANN search type was 

   * nearest neighbor (-1) or radius (+1). 

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class TypeCount : public DatumFunctoid {

    public:
@@ -377,7 +412,10 @@ class TypeCount : public DatumFunctoid { 
  /**

   * @brief Return the radius computed using Shepards weighted algorithm

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version

   */

  class ShepardsRadius : public DatumFunctoid {

    public:
@@ -432,7 +470,10 @@ class ShepardsRadius : public DatumFunctoid { 
  /**

   * @brief Return the radius computed using Shepards weighted algorithm

   * 

 * @author 2015-11-18 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class FrankeNelsonRadius : public DatumFunctoid {

    public:
@@ -490,7 +531,10 @@ class FrankeNelsonRadius : public DatumFunctoid { 
  /**

   * @brief Natural Neighbor interpolation method

   * 

 * @author 2015-12-09 Kris Becker 

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version 

   */

  class NaturalNeighborRadius : public DatumFunctoid {

    public:
@@ -563,7 +607,10 @@ typedef QList<SharedDatumFunctoid> DatumFunctoidList; 
  /**

   * @brief Create DatumFunctoids as provided in parameter form

   * 

 * @author 2015-11-20 Kris Becker

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

   *   @history 2015-11-16 Kris Becker - Original Version

   */

  class DatumFunctoidFactory {

    public:

isis/src/control/apps/cnet2dem/Makefile

+5 −10
Original line number Diff line number Diff line 
include $(ISISROOT)/make/isismake.apps



ifeq ($(HOST_ARCH),Darwin)

ALLINCDIRS += -I/work/users/kbecker/NaturalNeighbors/include

ALLLIBDIRS += -L/work/users/kbecker/NaturalNeighbors/lib

ifeq ($(ISISROOT), $(BLANK))

.SILENT:

error:

	echo "Please set ISISROOT";

else

ALLINCDIRS += -I$(ISISROOT)/3rdParty/extras/include

ALLLIBDIRS += -L$(ISISROOT)/3rdParty/extras/lib

	include $(ISISROOT)/make/isismake.apps

endif
 
 No newline at end of file
 


ALLLIBS += -lnn

isis/src/control/apps/cnet2dem/MapPointCollector.h

+3 −1
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ namespace Isis { 
   * This class will collect ControlPoint candidates that are within 

   * a tolerance generation of an output radius map pixel

   *  

   * @author 2015-11-16 Kris Becker 

   *  

   * @internal 

 * @history 2015-11-16 Kris Becker Original Version 

   *   @history 2015-11-16 Kris Becker - Original Version

   */

  

  class MapPointCollector {

isis/src/control/apps/cnet2dem/PointCloudSearchResult.h

+3 −1
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ template <typename T, typename D> class PointCloud; 
   * isValid() method. Well I suppose the only other required is a default 

   * constructor as well. 

   *  

   * @author 2015-10-11 Kris Becker 

   *  

   * @internal 

 * @history 2015-10-11 Kris Becker Original Version 

   *   @history 2015-10-11 Kris Becker - Original Version

   */

  

  template <class T, class D>