Partial merge from v006LibrariesV2 branch to ipce branch. (d5571180) · Commits · aflab / astrogeology / ISIS3

isis/make/config.darwin-MacOSX10_11

+11 −5

Original line number	Diff line number	Diff line
		@@ -63,7 +63,8 @@ ISISDYNAMIC =
		#---------------------------------------------------------------------------
		# Shared library options
		#---------------------------------------------------------------------------
		RANLIB = /usr/bin/ranlib
		#RANLIB = /usr/bin/ranlib
		RANLIB = /usr/bin/true
		SHAREDLIBEXT = dylib
		DYLIBVERSION = -compatibility_version $(ISISMAJOR).$(ISISMINOR) \
		-current_version $(ISISLIBVERSION)
		@@ -338,10 +339,10 @@ HDF5LIB = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp
		#---------------------------------------------------------------------------
		#OPENCVINCDIR = -I$(ISIS3OPT)/include
		#OPENCVLIBDIR = -L$(ISIS3OPT)/lib # Redundant
		OPENCVLIBS = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \
		-lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc \
		-lopencv_legacy -lopencv_ml -lopencv_nonfree -lopencv_objdetect \
		-lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts \
		OPENCVLIBS = -lopencv_calib3d -lopencv_core -lopencv_features2d \
		-lopencv_flann -lopencv_highgui -lopencv_imgproc \
		-lopencv_ml -lopencv_objdetect \
		-lopencv_photo -lopencv_stitching -lopencv_superres \
		-lopencv_video -lopencv_videostab

		#---------------------------------------------------------------------------
		@@ -406,8 +407,11 @@ THIRDPARTYLIBS += "$(QWTFRAMES)/qwt.framework"
		# Qt dependencies
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libpcre16*.dylib"
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libgthread-*.dylib"
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libpcre.*dylib"
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libharfbuzz*.dylib"
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libgraphite2.*dylib"
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libleveldb.dylib"
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libsnappy.*dylib"
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libwebp*.dylib"
		THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libdbus*.dylib"

		@@ -438,6 +442,8 @@ THIRDPARTYLIBS += "$(ISIS3PROP)/lib/libkdu_a63R.dylib"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libamd*.dylib"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libcamd*.dylib"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libcholmod*.dylib"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libsuitesparseconfig*.dylib"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libccolamd*.dylib"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libcolamd*.dylib"
		#THIRDPARTYLIBS += "/System/Library/Frameworks/Accelerate.framework"

isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp

+17 −17

Original line number	Diff line number	Diff line
		@@ -17,12 +17,14 @@
		* http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
		* http://www.usgs.gov/privacy.html.
		*/

		#include <iomanip>
		#include <iostream>

		#include <QList>
		#include <QString>

		#include "CubeManager.h"
		#include "ApolloMetricCamera.h"
		#include "Camera.h"
		#include "CameraFactory.h"
		@@ -38,9 +40,8 @@ using namespace Isis;

		void TestLineSamp(Camera *cam, double samp, double line);

		int main(void) {
		int main(int argc, char **argv) {
		Preference::Preferences(true);

		cout << "Unit Test for ApolloCamera..." << endl;
		try {
		// These should be lat/lon at center of image. To obtain these numbers for a new cube/camera,
		@@ -56,7 +57,7 @@ int main(void) {
		cout.setf(std::ios::fixed);
		cout << setprecision(9);

		// Test kernel IDs
		// Test kernel IDsq
		cout << "Kernel IDs: " << endl;
		cout << "CK Frame ID = " << cam->CkFrameId() << endl;
		cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
		@@ -68,7 +69,7 @@ int main(void) {
		QString stime = inst["StartTime"];
		double et; // StartTime keyword is the center exposure time
		str2et_c(stime.toLatin1().data(), &et);
		// approximate 1 tenth of a second since Apollo did not provide
		// approximate 1 tenth of a second since Apollo did not
		double exposureDuration = .1;
		pair <iTime, iTime> shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration);
		cout << "Shutter open = " << shuttertimes.first.Et() << endl;
		@@ -156,4 +157,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
		cout << "DeltaLine = ERROR" << endl << endl;
		}
		}

isis/src/cassini/apps/cisscal/DarkCurrent.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ namespace Isis {
		* Fixed instrument data rate value in the
		* constructor.
		* @history 2010-07-19 Jeannie Walldren - Fixed formatting.
		* @history 2016-08-28 Kelvin Rodriguez - Removed usused private member variables to
		* eliminate unused member variables warnings in clang. Part of porting to OS X 10.11.
		*/
		class DarkCurrent {
		public:
		@@ -87,7 +89,6 @@ namespace Isis {
		double p_expDur; //!< Value of <b>PvlKeyword</b> ExposureDuration from the labels of the image. Called "exposure" or "time" in IDL code.
		QString p_flightSoftware; //!< Value of <b>PvlKeyword</b> FlightSoftwareVersion from the labels of the image. Called "fsw" in IDL code.
		int p_gainMode; //!< Value of <b>PvlKeyword</b> GainModeId from the labels of the image.
		double p_instDataRate; //!< Value of <b>PvlKeyword</b> InstrumentDataRate from the labels of the image.
		bool p_narrow; //!< Indicates whether the image is from a narrow-angle camera
		int p_readoutIndex; //!< Value of <b>PvlKeyword</b> InstrumentDataRate from the labels of the image. Called "rdind" or "roindex" in IDL code.
		int p_readoutOrder; //!< Value of <b>PvlKeyword</b> ReadoutOrder from the labels of the image. Valid values are: NAC first = 0, WAC first = 1. Called "roo" in IDL code.
		@@ -100,4 +101,3 @@ namespace Isis {
		};
		};
		#endif

isis/src/cassini/objs/VimsCamera/VimsGroundMap.h

+11 −14

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ namespace Isis {

		SpiceDouble p_etStart; //!< Start ephemeris time

		double p_exposureDuration; //!< Exposure duration
		double p_interlineDelay; /**< InterlineDelayDuration keyword value from
		the instrument group of the labels, divided by 1000 */

		@@ -126,8 +125,6 @@ namespace Isis {
		Possible values are IR or VIS */
		double p_visExp; //!< VIS exposure duration, divided by 1000
		double p_irExp; //!< IR exposure duration, divided by 1000
		int p_nsUv; //!< Normal or high resolution sample uv
		int p_nlUv; //!< Normal or high resolution line uv
		int p_swathWidth; /**< SwathWidth keyword value from the instrument group of the labels.
		This will be image size unless occultation image */
		int p_swathLength; /**< SwathLength keyword value from the instrument group of the labels.

isis/src/cassini/objs/VimsCamera/VimsSkyMap.h

+9 −10

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@ namespace Isis {
		* coding standards. References #972.
		* @history 2013-11-18 Tracie Sucharski - Added LookDirection method to calculate unit vectors
		* so that old unit vector files are no longer needed.
		* @history 2016-08-28 Kelvin Rodriguez - Removed unused member variables to squash warnings
		* in clang. Part of porting to OS X 10.11
		*/
		class VimsSkyMap : public CameraSkyMap {
		public:
		@@ -76,7 +78,6 @@ namespace Isis {

		SpiceDouble p_etStart; //!< Start ephemeris time

		double p_exposureDuration; //!< Exposure duration
		double p_interlineDelay; /**< InterlineDelayDuration keyword value from
		the instrument group of the labels, divided by 1000 */
		double p_ux; //!< Distorted focal plane x, in millimeters
		@@ -92,8 +93,6 @@ namespace Isis {
		Possible values are IR or VIS */
		double p_visExp; //!< VIS exposure duration, divided by 1000
		double p_irExp; //!< IR exposure duration, divided by 1000
		int p_nsUv; //!< Normal or high resolution sample uv
		int p_nlUv; //!< Normal or high resolution line uv
		int p_swathWidth; /**< SwathWidth keyword value from the instrument group of the labels.
		This will be image size unless occultation image */
		int p_swathLength; /**< SwathLength keyword value from the instrument group of the labels.