Commit a28f54b9 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Updated locked and free to darkGreen and ignored to dark yellow.

parent 9b61036d

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

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

    m_origPoint = new QPointF(apriori);





    // Providing a width of 0 makes pens cosmetic (i.e. always appear as 1 pixel on screen)

    // Providing a width of 0 makes pens cosmetic (i.e. always appear as 1 pixel on screen)

    if (cp->IsIgnored()) {  // Was red

    if (cp->IsIgnored()) {

      setPen(QPen(QColor(255, 255, 0), 0.0)); // set point marker yellow

      setPen(QPen(Qt::darkYellow, 0.0));

    }

    else if (cp->IsEditLocked()) {  // was magenta

      setPen(QPen(Qt::red, 0.0));

    }

    }

    else if ( (cp->GetType() == ControlPoint::Fixed)

    else if ( (cp->GetType() == ControlPoint::Fixed)

      || (cp->GetType() == ControlPoint::Constrained) ) {

      || (cp->GetType() == ControlPoint::Constrained) ) {

      setPen(QPen(Qt::magenta, 0.0)); // Was green

      setPen(QPen(Qt::magenta, 0.0));

    }

    }

    else {// Free

    else { // Free and editLocked

      setPen(QPen(Qt::green, 0.0)); //was blue

      setPen(QPen(Qt::darkGreen, 0.0));

    }

    }





    setBrush(Qt::NoBrush);

    setBrush(Qt::NoBrush);

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

+4 −3
Original line number Original line 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

   *   @history 2017-08-02 Tracie Sucharski - Draw the current edit Control Point as a circle with

   *                           center crosshair in red.  Fixes #5007, #5008.

   *                           center crosshair in red.  Fixes #5007, #5008.

   *   @history 2018-05-01 Kaitlyn Lee - Changed colors of control points to match qnet.

   *   @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,

   *                           Colors Changed: free from blue to darkGreen, locked from magenta

   *                           locked from magenta to red, and constrained (was dark green) and

   *                           to darkGreen, ignored from red to darkYellow,

   *                           fixed (was green) are now both represented with magenta. Fixes #5401.

   *                           and constrained (was dark green) and fixed (was green)

   *                           are now both represented with magenta. Fixes #5401.

   *

   *

   */

   */

  class ControlPointGraphicsItem : public QGraphicsRectItem {

  class ControlPointGraphicsItem : public QGraphicsRectItem {