Updated locked and free to darkGreen and ignored to dark yellow. (a28f54b9) · Commits · aflab / astrogeology / ISIS3

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

+5 −8

Original line number	Diff line number	Diff line
		@@ -49,18 +49,15 @@ namespace Isis {
		m_origPoint = new QPointF(apriori);

		// Providing a width of 0 makes pens cosmetic (i.e. always appear as 1 pixel on screen)
		if (cp->IsIgnored()) { // Was red
		setPen(QPen(QColor(255, 255, 0), 0.0)); // set point marker yellow
		}
		else if (cp->IsEditLocked()) { // was magenta
		setPen(QPen(Qt::red, 0.0));
		if (cp->IsIgnored()) {
		setPen(QPen(Qt::darkYellow, 0.0));
		}
		else if ( (cp->GetType() == ControlPoint::Fixed)
		\|\| (cp->GetType() == ControlPoint::Constrained) ) {
		setPen(QPen(Qt::magenta, 0.0)); // Was green
		setPen(QPen(Qt::magenta, 0.0));
		}
		else {// Free
		setPen(QPen(Qt::green, 0.0)); //was blue
		else { // Free and editLocked
		setPen(QPen(Qt::darkGreen, 0.0));
		}

		setBrush(Qt::NoBrush);

+4 −3

Original line number	Diff line number	Diff line
		@@ -36,9 +36,10 @@ namespace Isis {
		* @history 2017-08-02 Tracie Sucharski - Draw the current edit Control Point as a circle with
		* center crosshair in red. Fixes #5007, #5008.
		* @history 2018-05-01 Kaitlyn Lee - Changed colors of control points to match qnet.
		* Colors Changed: free from blue to green, ignored from red to yellow,
		* locked from magenta to red, and constrained (was dark green) and
		* fixed (was green) are now both represented with magenta. Fixes #5401.
		* Colors Changed: free from blue to darkGreen, locked from magenta
		* to darkGreen, ignored from red to darkYellow,
		* and constrained (was dark green) and fixed (was green)
		* are now both represented with magenta. Fixes #5401.
		*
		*/
		class ControlPointGraphicsItem : public QGraphicsRectItem {