Merged remainder of v006LibrariesV2 to ipce. (86d831c2) · Commits · aflab / astrogeology / ISIS3

isis/src/base/objs/Camera/Camera.cpp

+34 −1

Original line number	Diff line number	Diff line
		@@ -1892,6 +1892,7 @@ namespace Isis {
		return ComputeAzimuth(lat, lon);
		}


		/**
		* Return the Spacecraft Azimuth
		*
		@@ -1905,6 +1906,7 @@ namespace Isis {
		return ComputeAzimuth(lat, lon);
		}


		/**
		* Computes the image azimuth value from your current position (origin) to a point of interest
		* specified by the lat/lon input to this method. (NOTE: This azimuth is different from a Ground
		@@ -2154,6 +2156,7 @@ namespace Isis {
		return azimuth;
		}


		/**
		* Return the off nadir angle in degrees.
		*
		@@ -2179,6 +2182,7 @@ namespace Isis {
		return c;
		}


		/**
		* Computes and returns the ground azimuth between the ground point and
		* another point of interest, such as the subspacecraft point or the
		@@ -2306,6 +2310,7 @@ namespace Isis {
		p_distortionMap = map;
		}


		/**
		* Sets the Focal Plane Map. This object will take ownership of the focal plane
		* map pointer.
		@@ -2320,6 +2325,7 @@ namespace Isis {
		p_focalPlaneMap = map;
		}


		/**
		* Sets the Detector Map. This object will take ownership of the detector map
		* pointer.
		@@ -2334,6 +2340,7 @@ namespace Isis {
		p_detectorMap = map;
		}


		/**
		* Sets the Ground Map. This object will take ownership of the ground map
		* pointer.
		@@ -2348,6 +2355,7 @@ namespace Isis {
		p_groundMap = map;
		}


		/**
		* Sets the Sky Map. This object will take ownership of the sky map pointer.
		*
		@@ -2361,6 +2369,7 @@ namespace Isis {
		p_skyMap = map;
		}


		/**
		* This loads the spice cache big enough for this image. The default cache size
		* is the number of lines in the cube if the ephemeris time changes in the
		@@ -2456,6 +2465,7 @@ namespace Isis {
		return ephemerisTimes;
		}


		/**
		* This method calculates the spice cache size. This method finds the number
		* of lines in the beta cube and adds 1, since we need at least 2 points for
		@@ -2540,6 +2550,7 @@ namespace Isis {
		p_geometricTilingEndSize = endSize;
		}


		/**
		* This will get the geometric tiling hint; these values are typically used for
		* ProcessRubberSheet::SetTiling(...).
		@@ -2573,6 +2584,7 @@ namespace Isis {
		return true;
		}


		/**
		* Checks to see if the camera object has a projection
		*
		@@ -2583,6 +2595,7 @@ namespace Isis {
		return p_projection != 0;
		}


		/**
		* Virtual method that checks if the band is independent
		*
		@@ -2593,6 +2606,7 @@ namespace Isis {
		return true;
		}


		/**
		* Returns the reference band
		*
		@@ -2602,6 +2616,7 @@ namespace Isis {
		return p_referenceBand;
		}


		/**
		* Checks to see if the Camera object has a reference band
		*
		@@ -2612,6 +2627,7 @@ namespace Isis {
		return p_referenceBand != 0;
		}


		/**
		* Virtual method that sets the band number
		*
		@@ -2621,6 +2637,7 @@ namespace Isis {
		p_childBand = band;
		}


		/**
		* Returns the current sample number
		*
		@@ -2630,6 +2647,7 @@ namespace Isis {
		return p_childSample;
		}


		/**
		* Returns the current band
		*
		@@ -2639,6 +2657,7 @@ namespace Isis {
		return p_childBand;
		}


		/**
		* Returns the current line number
		*
		@@ -2647,6 +2666,8 @@ namespace Isis {
		double Camera::Line() {
		return p_childLine;
		}


		/**
		* Returns the resolution of the camera
		*
		@@ -2668,6 +2689,7 @@ namespace Isis {
		return p_focalLength;
		}


		/**
		* Returns the pixel pitch
		*
		@@ -2677,6 +2699,7 @@ namespace Isis {
		return p_pixelPitch;
		}


		/**
		* Returns the pixel ifov offsets from center of pixel, which defaults to the
		* (pixel pitch * summing mode ) / 2. If an instrument has a non-square ifov, it must implement
		@@ -2708,6 +2731,7 @@ namespace Isis {
		return p_samples;
		}


		/**
		* Returns the number of lines in the image
		*
		@@ -2717,6 +2741,7 @@ namespace Isis {
		return p_lines;
		}


		/**
		* Returns the number of bands in the image
		*
		@@ -2726,6 +2751,7 @@ namespace Isis {
		return p_bands;
		}


		/**
		* Returns the number of lines in the parent alphacube
		*
		@@ -2735,6 +2761,7 @@ namespace Isis {
		return p_alphaCube->AlphaLines();
		}


		/**
		* Returns the number of samples in the parent alphacube
		*
		@@ -2743,6 +2770,8 @@ namespace Isis {
		int Camera::ParentSamples() const {
		return p_alphaCube->AlphaSamples();
		}


		/**
		* Returns a pointer to the CameraDistortionMap object
		*
		@@ -2752,6 +2781,7 @@ namespace Isis {
		return p_distortionMap;
		}


		/**
		* Returns a pointer to the CameraFocalPlaneMap object
		*
		@@ -2761,6 +2791,7 @@ namespace Isis {
		return p_focalPlaneMap;
		}


		/**
		* Returns a pointer to the CameraDetectorMap object
		*
		@@ -2770,6 +2801,7 @@ namespace Isis {
		return p_detectorMap;
		}


		/**
		* Returns a pointer to the CameraGroundMap object
		*
		@@ -2779,6 +2811,7 @@ namespace Isis {
		return p_groundMap;
		}


		/**
		* Returns a pointer to the CameraSkyMap object
		*

isis/src/base/objs/Camera/Camera.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,13 @@ namespace Isis {
		* which give greatly improved approximations compared to their
		* non-oblique counterpart functions when the Look vector is pointing
		* off nadir and near the limb. Fixes #476. References #4100.
		* @history 2015-10-16 Ian Humphrey - Added protected members for spacecraft and instrument
		* names as well as public member getters. Updated unit test.
		* References #2335.
		* @history 2016-06-27 Kelvin Rodriguez - Added member function to compute celestial north
		* clock angle. References #2365
		* @history 2016-08-01 Curtis Rose - Changed return values of resolutions from -1 to Isis::Null.
		* Fixes #2065.
		*/

		class Camera : public Sensor {
		@@ -296,6 +303,7 @@ namespace Isis {

		bool RaDecRange(double &minra, double &maxra,
		double &mindec, double &maxdec);

		double RaDecResolution();

		CameraDistortionMap *DistortionMap();

isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -798,6 +798,9 @@ namespace Isis {
		}

		// unblock the writing process
		// Check first if the the thread is still locked
		// to avoid undefined behavior
		p_calculatePolygonMutex.tryLock();
		p_calculatePolygonMutex.unlock();
		}

isis/src/base/objs/ImageOverlapSet/unitTest.cpp

+5 −4

Original line number	Diff line number	Diff line
		#include <iostream>
		#include <exception>

		#include <geos/util/GEOSException.h>
		#include <geos/geom/Polygon.h>
		#include <geos/geom/LinearRing.h>
		#include <geos/geom/CoordinateArraySequence.h>

		#include "IException.h"
		#include "SerialNumberList.h"
		#include "PolygonTools.h"
		#include "ImageOverlapSet.h"
		#include "Preference.h"
		#include "geos/util/GEOSException.h"
		#include "geos/geom/Polygon.h"
		#include "geos/geom/LinearRing.h"
		#include "geos/geom/CoordinateArraySequence.h"

		using namespace Isis;
		using namespace std;

isis/src/base/objs/Latitude/Latitude.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -566,6 +566,7 @@ namespace Isis {
		void Latitude::setAngle(const double &angle, const Angle::Units &units) {



		// Check for passing 90 degrees if that error checking is on
		if (!IsSpecial(angle) && (m_errors & AllowPastPole) != AllowPastPole) {
		Angle tmpAngle(angle, units);