PROG: Coding standards updates. (92c89c01) · Commits · aflab / astrogeology / ISIS3

isis/src/base/objs/SpiceRotation/SpiceRotation.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -248,6 +248,7 @@ namespace Isis {
		// linear trignometric terms
		};


		/**
		* This enumeration indicates whether the partial derivative is taken with
		* respect to Right Ascension, Declination, or Twist (or Rotation).
		@@ -257,6 +258,7 @@ namespace Isis {
		WRT_Twist //!< With respect to Twist or Prime Meridian Rotation
		};


		/**
		*
		*/
		@@ -265,6 +267,7 @@ namespace Isis {
		No //!<
		};


		/**
		*
		*/
		@@ -436,7 +439,10 @@ namespace Isis {
		bool m_tOrientationAvailable; //!< Target orientation constants are available


		FrameType m_frameType; //!< The type of rotation frame
		FrameType m_frameType;
		//!
		//!
		//!< The type of rotation frame
		Source p_source; //!< The source of the rotation data
		int p_axisP; /**< The axis defined by the spacecraft
		vector for defining a nadir rotation*/

isis/src/base/objs/Target/Target.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -66,8 +66,9 @@ namespace Isis {

		m_systemName = new QString;

		if (kernels.hasKeyword("NaifFrameCode"))
		if (kernels.hasKeyword("NaifFrameCode")) {
		trykey = "NaifFrameCode";
		}

		if (name().toUpper() == "SKY") {
		m_radii[0] = m_radii[1] = m_radii[2] = Distance(1000.0, Distance::Meters);
		@@ -75,8 +76,9 @@ namespace Isis {
		int ikCode = toInt(kernels[trykey][0]);
		*m_bodyCode = ikCode / 1000;
		// Check for override in kernel group
		if (kernels.hasKeyword("NaifSpkCode"))
		if (kernels.hasKeyword("NaifSpkCode")) {
		*m_bodyCode = (int) kernels["NaifSpkCode"];
		}

		*m_systemCode = -1;
		(*m_systemName).append("THE COSMOS");

isis/src/qisis/objs/Image/Image.cpp

+3 −0

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


		/**
		* TODO
		*/
		void Image::initCamStats() {
		bool hasCamStats = false;

isis/src/qisis/objs/MosaicSceneWidget/ControlPointGraphicsItem.cpp

+33 −7

Original line number	Diff line number	Diff line
		@@ -44,16 +44,21 @@ namespace Isis {

		m_origPoint = new QPointF(apriori);

		if (cp->IsIgnored())
		if (cp->IsIgnored()) {
		setPen(QPen(Qt::red));
		else if (cp->IsEditLocked())
		}
		else if (cp->IsEditLocked()) {
		setPen(QPen(Qt::magenta));
		else if (cp->GetType() == ControlPoint::Fixed)
		}
		else if (cp->GetType() == ControlPoint::Fixed) {
		setPen(QPen(Qt::green));
		else if (cp->GetType() == ControlPoint::Constrained)
		}
		else if (cp->GetType() == ControlPoint::Constrained) {
		setPen(QPen(Qt::darkGreen));
		else // Free
		}
		else {// Free
		setPen(QPen(Qt::blue));
		}

		setBrush(Qt::NoBrush);

		@@ -89,8 +94,9 @@ namespace Isis {
		QRectF fullRect = calcRect();
		QRectF crosshairRect = calcCrosshairRect();

		if (crosshairRect.isNull())
		if (crosshairRect.isNull()) {
		return;
		}

		if (rect() != fullRect) {
		setRect(fullRect);
		@@ -164,6 +170,25 @@ namespace Isis {
		}


		ControlPoint *ControlPointGraphicsItem::controlPoint() {
		return m_controlPoint;
		}

		void ControlPointGraphicsItem::setArrowVisible(bool visible,
		bool colorByMeasureCount,
		int measureCount,
		bool colorByResidualMagnitude,
		double residualMagnitude) {
		m_showArrow = visible;
		m_colorByMeasureCount = colorByMeasureCount;
		m_measureCount = measureCount;
		m_colorByResidualMagnitude = colorByResidualMagnitude;
		m_residualMagnitude = residualMagnitude;
		setRect(calcRect());
		update();
		}


		void ControlPointGraphicsItem::contextMenuEvent(
		QGraphicsSceneContextMenuEvent * event) {
		QMenu menu;
		@@ -294,8 +319,9 @@ namespace Isis {
		for(int snIndex = 0; snIndex < serialNums.size(); snIndex ++) {
		QString serialNum = serialNums[snIndex];

		if (snIndex > 0)
		if (snIndex > 0) {
		toolTip += "<br />";
		}

		if (snList->HasSerialNumber(serialNum)) {
		toolTip +=

isis/src/qisis/objs/MosaicSceneWidget/ControlPointGraphicsItem.h

+2 −11

Original line number	Diff line number	Diff line
		@@ -42,19 +42,10 @@ namespace Isis {
		void paint(QPainter , const QStyleOptionGraphicsItem ,
		QWidget * widget = 0);

		ControlPoint *controlPoint() { return m_controlPoint; }
		ControlPoint *controlPoint();

		void setArrowVisible(bool visible, bool colorByMeasureCount, int measureCount,
		bool colorByResidualMagnitude, double residualMagnitude) {
		m_showArrow = visible;
		m_colorByMeasureCount = colorByMeasureCount;
		m_measureCount = measureCount;
		m_colorByResidualMagnitude = colorByResidualMagnitude;
		m_residualMagnitude = residualMagnitude;
		setRect(calcRect());
		update();
		}

		bool colorByResidualMagnitude, double residualMagnitude);
		// signals:
		// void newControlPointSelected(ControlPoint *controlPoint);

isis/src/control/apps/jigsaw/tsts/apollo/Makefile

+1 −1

File changed.

Contains only whitespace changes.

isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp

+1 −1

File changed.

Contains only whitespace changes.

isis/src/base/objs/SpiceRotation/SpiceRotation.cpp

+1 −1

File changed.

Contains only whitespace changes.