Commit 69ff467a authored Jul 17, 2018 by dcookastrog

More modifications to change from using the equatorial radius to using the...

More modifications to change from using the equatorial radius to using the local radius of a point to convert point sigmas to/from angle measures to length measures.

parents 42baf705 c902bf9c

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,3 +42,4 @@ print.prt
		/tsts//input/*
		/tsts//truth/*
		/tsts//output/*
		data/

isis/make/config.linux-x86_32

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ endif
		#---------------------------------------------------------------------------
		QTINCDIR = -I$(ISIS3LOCAL)/include/qt/qt4.6.2
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/Qt
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/QtChrats
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/QtCore
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/QtAssistant
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/QtGui

isis/make/config.linux-x86_64

+4 −5

Original line number	Diff line number	Diff line
		@@ -115,7 +115,6 @@ QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.7.1/QtXml
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.7.1/QtXmlPatterns
		QTLIBDIR = -L$(ISIS3LOCAL)/lib
		QTLIB = -lQt5Core -lQt5Concurrent -lQt5XmlPatterns -lQt5Xml -lQt5Network -lQt5Sql -lQt5Gui -lQt5PrintSupport -lQt5Positioning -lQt5Qml -lQt5Quick -lQt5Sensors -lQt5Svg -lQt5Test -lQt5OpenGL -lQt5Widgets -lQt5Multimedia -lQt5MultimediaWidgets -lQt5WebChannel -lQt5WebEngine -lQt5WebEngineWidgets -lQt5DBus

		UIC = $(ISIS3LOCAL)/bin/uic
		MOC = $(ISIS3LOCAL)/bin/moc
		RCC = $(ISIS3LOCAL)/bin/rcc

isis/make/config.linux-x86_64_Debian8

+3 −3

Original line number	Diff line number	Diff line
		@@ -115,7 +115,6 @@ QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.7.1/QtXml
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.7.1/QtXmlPatterns
		QTLIBDIR = -L$(ISIS3LOCAL)/lib
		QTLIB = -lQt5Core -lQt5Concurrent -lQt5XmlPatterns -lQt5Xml -lQt5Network -lQt5Sql -lQt5Gui -lQt5PrintSupport -lQt5Positioning -lQt5Qml -lQt5Quick -lQt5Sensors -lQt5Svg -lQt5Test -lQt5OpenGL -lQt5Widgets -lQt5Multimedia -lQt5MultimediaWidgets -lQt5WebChannel -lQt5WebEngine -lQt5WebEngineWidgets -lQt5DBus

		UIC = $(ISIS3LOCAL)/bin/uic
		MOC = $(ISIS3LOCAL)/bin/moc
		RCC = $(ISIS3LOCAL)/bin/rcc
		@@ -359,6 +358,7 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include
		#---------------------------------------------------------------------------

		# Qt Libraries

		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.7.*[^g]"

isis/make/config.linux-x86_64_Fedora21

+5 −4

Original line number	Diff line number	Diff line
		@@ -368,6 +368,7 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include
		#---------------------------------------------------------------------------

		# Qt Libraries

		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.7.*[^g]"