Commit 277c4684 authored by Christopher Combs's avatar Christopher Combs
Browse files

Added Control Point info to ControlPointEditWidget. Fixes #5066 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7965 41f8697f-d340-4b68-9986-7bafba869bb8
parent 10e3dfef

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp

+39 −0
Original line number Diff line number Diff line
@@ -305,6 +305,10 @@ namespace Isis { 
//  pointInfoLayout->addWidget(m_ptIdValue);

//  pointInfoLayout->addWidget(m_numMeasures);



    m_aprioriLatitude = new QLabel;

    m_aprioriLongitude = new QLabel;

    m_aprioriRadius = new QLabel;



    // create right vertical layout's top layout

    m_lockPoint = new QCheckBox("Edit Lock Point");

    connect(m_lockPoint, SIGNAL(clicked(bool)), this, SLOT(setLockPoint(bool)));
@@ -332,6 +336,9 @@ namespace Isis { 
    QVBoxLayout * mainLayout = new QVBoxLayout;

    mainLayout->addWidget(m_ptIdValue);

    mainLayout->addWidget(m_numMeasures);

    mainLayout->addWidget(m_aprioriLatitude);

    mainLayout->addWidget(m_aprioriLongitude);

    mainLayout->addWidget(m_aprioriRadius);

    mainLayout->addWidget(m_lockPoint);

    mainLayout->addWidget(m_ignorePoint);

    mainLayout->addLayout(pointTypeLayout);
@@ -800,6 +807,38 @@ namespace Isis { 
                   QString::number(m_editPoint->GetNumMeasures());

    m_numMeasures->setText(ptsize);





    SurfacePoint surfPoint = m_editPoint->GetAprioriSurfacePoint();

    QString lat, lon, rad;



    //  Write apriori latitude

    if (surfPoint.GetLatitude().degrees() == Null) {

      lat = "Apriori Latitude:  Null";

    }

    else {

      lat = "Apriori Latitude:  " + QString::number(surfPoint.GetLatitude().degrees());

    }

    m_aprioriLatitude->setText(lat);



    //  Write apriori longitude

    if (surfPoint.GetLongitude().degrees() == Null) {

      lon = "Apriori Longitude:  Null";

    }

    else {

      lon = "Apriori Longitude:  " + QString::number(surfPoint.GetLongitude().degrees());



    }

    m_aprioriLongitude->setText(lon);



    //  Write apriori radius

    if (surfPoint.GetLocalRadius().meters() == Null) {

      rad = "Apriori Radius:  Null";

    }

    else {

      rad = "Apriori Radius:  " + QString::number(surfPoint.GetLocalRadius().meters(), 'f', 2);

    }

    m_aprioriRadius->setText(rad);



    //  Set EditLock box correctly

    m_lockPoint->setChecked(m_editPoint->IsEditLocked());

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ namespace Isis { 
   *                           #5008.

   *   @history 2017-08-09 Christopher Combs - Added QPushButton and slot for reloading a point's

   *                           measures in the ChipViewports. Fixes #5070.

   *   @history 2017-08-09 Christopher Combs - Added Apriori Latitude, Longitude, and Radius to

   *                           the dialog. Fixes #5066.

   */

  class ControlPointEditWidget : public QWidget {

    Q_OBJECT
@@ -200,6 +202,9 @@ namespace Isis { 
      QPointer<QLabel> m_ptIdValue; //!< Label for the point id of the current point

      QPointer<QComboBox> m_pointType; //!< Combobox to change the type of the current point

      QPointer<QLabel> m_numMeasures;

      QPointer<QLabel> m_aprioriLatitude;

      QPointer<QLabel> m_aprioriLongitude;

      QPointer<QLabel> m_aprioriRadius;



      QPointer<QCheckBox> m_lockPoint; //!< Checkbox that locks/unlocks the current point

      QPointer<QCheckBox> m_ignorePoint; //!< Checkbox to ignore the current point