Unverified Commit 549b0d20 authored by ihumphrey's avatar ihumphrey Committed by GitHub
Browse files

Merge pull request #430 from kdl222/m05401 

Updated control point colors in qmos to match qnet. Fixes #5401.
parents d6efdd9d 96378503

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

+11 −17
Original line number Original line Diff line number Diff line
@@ -50,20 +50,15 @@ namespace Isis { 




    // 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()) {

    if (cp->IsIgnored()) {

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

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

    }

    }

    else if (cp->IsEditLocked()) {

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

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

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

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

    }

    }

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

    else { // Free and editLocked

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

    }

    else if (cp->GetType() == ControlPoint::Constrained) {

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

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

    }

    }

    else {// Free

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

    }





    setBrush(Qt::NoBrush);

    setBrush(Qt::NoBrush);
@@ -374,4 +369,3 @@ namespace Isis { 








}
 
}

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

+9 −5
Original line number Original line Diff line number Diff line
@@ -35,6 +35,11 @@ namespace Isis { 
   *                           Fixes #4479.

   *                           Fixes #4479.

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

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

   *                           to darkGreen, ignored from red to yellow,

   *                           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 {
@@ -78,4 +83,3 @@ namespace Isis { 
}

}





#endif
 
#endif