Cleaned up coding standards in ControlPointv0002 (9afa2e39) · Commits · aflab / astrogeology / ISIS3

isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp

+37 −22

Original line number	Diff line number	Diff line
		@@ -93,16 +93,19 @@ namespace Isis {
		m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::User);
		}
		else if (source == "AverageOfMeasures") {
		m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);
		m_pointData->set_apriorisurfpointsource(
		ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);
		}
		else if (source == "Reference") {
		m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::Reference);
		m_pointData->set_apriorisurfpointsource(
		ControlNetFileProtoV0001_PBControlPoint::Reference);
		}
		else if (source == "Basemap") {
		m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::Basemap);
		}
		else if (source == "BundleSolution") {
		m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::BundleSolution);
		m_pointData->set_apriorisurfpointsource(
		ControlNetFileProtoV0001_PBControlPoint::BundleSolution);
		}
		else {
		QString msg = "Invalid AprioriXYZSource [" + source + "]";
		@@ -120,7 +123,8 @@ namespace Isis {
		m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::User);
		}
		else if (source == "AverageOfMeasures") {
		m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);
		m_pointData->set_aprioriradiussource(
		ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);
		}
		else if (source == "Ellipsoid") {
		m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::Ellipsoid);
		@@ -129,7 +133,8 @@ namespace Isis {
		m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::DEM);
		}
		else if (source == "BundleSolution") {
		m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::BundleSolution);
		m_pointData->set_aprioriradiussource(
		ControlNetFileProtoV0001_PBControlPoint::BundleSolution);
		}
		else {
		QString msg = "Invalid AprioriRadiusSource, [" + source + "]";
		@@ -224,10 +229,12 @@ namespace Isis {
		measure.set_type(ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::Manual);
		}
		else if (type == "registeredpixel") {
		measure.set_type(ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::RegisteredPixel);
		measure.set_type(
		ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::RegisteredPixel);
		}
		else if (type == "registeredsubpixel") {
		measure.set_type(ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::RegisteredSubPixel);
		measure.set_type(
		ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::RegisteredSubPixel);
		}
		else {
		throw IException(IException::Io,
		@@ -368,16 +375,18 @@ namespace Isis {
		QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> point,
		void (ControlNetFileProtoV0001_PBControlPoint::*setter)(bool)) {

		if (!container.hasKeyword(keyName))
		if (!container.hasKeyword(keyName)) {
		return;
		}

		QString value = container[keyName][0];
		container.deleteKeyword(keyName);
		value = value.toLower();

		if (value == "true" \|\| value == "yes")
		if (value == "true" \|\| value == "yes") {
		(point.data()->*setter)(true);
		}
		}


		/**
		@@ -399,8 +408,9 @@ namespace Isis {
		QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> point,
		void (ControlNetFileProtoV0001_PBControlPoint::*setter)(double)) {

		if (!container.hasKeyword(keyName))
		if (!container.hasKeyword(keyName)) {
		return;
		}

		double value = toDouble(container[keyName][0]);
		container.deleteKeyword(keyName);
		@@ -427,8 +437,9 @@ namespace Isis {
		QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> point,
		void (ControlNetFileProtoV0001_PBControlPoint::*setter)(const std::string&)) {

		if (!container.hasKeyword(keyName))
		if (!container.hasKeyword(keyName)) {
		return;
		}

		QString value = container[keyName][0];
		container.deleteKeyword(keyName);
		@@ -455,16 +466,18 @@ namespace Isis {
		ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure &measure,
		void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)(bool)) {

		if (!container.hasKeyword(keyName))
		if (!container.hasKeyword(keyName)) {
		return;
		}

		QString value = container[keyName][0];
		container.deleteKeyword(keyName);
		value = value.toLower();

		if (value == "true" \|\| value == "yes")
		if (value == "true" \|\| value == "yes") {
		(measure.*setter)(true);
		}
		}


		/**
		@@ -486,8 +499,9 @@ namespace Isis {
		ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure &measure,
		void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)(double)) {

		if (!container.hasKeyword(keyName))
		if (!container.hasKeyword(keyName)) {
		return;
		}

		double value = toDouble(container[keyName][0]);
		container.deleteKeyword(keyName);
		@@ -515,8 +529,9 @@ namespace Isis {
		void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)
		(const std::string &)) {

		if (!container.hasKeyword(keyName))
		if (!container.hasKeyword(keyName)) {
		return;
		}

		QString value = container[keyName][0];
		container.deleteKeyword(keyName);

isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,8 @@ namespace Isis {
		void copy(PvlContainer &container,
		QString keyName,
		ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure &measure,
		void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)(const std::string &));
		void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)(
		const std::string &));

		QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> m_pointData;
		/*< protobuf container that holds information used to create a control point./