Added a check to the versionedReader targetRadii group to set radii values to... (39393271) · Commits · aflab / astrogeology / ISIS3

isis/src/control/objs/ControlNet/ControlNet.cpp

+11 −5

Original line number	Diff line number	Diff line
		@@ -237,14 +237,20 @@ namespace Isis {
		* parent prematurely to be able to set the radii
		* in ControlPoint.
		* @history 2017-12-21 Jesse Mapel - Modified to use the ControlNetVersioner.
		*
		* @history 2018-04-05 Adam Goins - Added a check to the versionedReader targetRadii
		* group to set radii values to those ingested from the versioner
		* if they exist. Otherwise, we call SetTarget with the targetname.
		*/
		void ControlNet::ReadControl(const QString &filename, Progress *progress) {

		FileName cnetFileName(filename);
		ControlNetVersioner versionedReader(cnetFileName, progress);

		if ( versionedReader.hasTargetRadii() ) {
		p_targetRadii = versionedReader.targetRadii();
		}
		else {
		SetTarget( versionedReader.targetName() );
		}
		p_networkId = versionedReader.netId();
		p_userName = versionedReader.userName();
		p_created = versionedReader.creationDate();

+5 −1

Original line number	Diff line number	Diff line
		@@ -213,6 +213,10 @@ namespace Isis {
		* image. Previously, this had to be done throug the graph.
		* @history 2018-01-26 Kristin Berry - Added pointAdded() function to eliminate redundant measure
		* adds to the control network.
		* @history 2018-04-05 Adam Goins - Added a check to the versionedReader targetRadii
		* group to set radii values to those ingested from the versioner
		* if they exist. Otherwise, we call SetTarget with the targetname.
		* Fixes #5361.
		*/
		class ControlNet : public QObject {
		Q_OBJECT