Commit b570de8c authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fixed crash when creating a new control point which occured when a constrained... 

Fixed crash when creating a new control point which occured when a constrained or fixed point was previously edited. Fixes #5399.
parent 269800e1

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

+1 −4
Original line number Diff line number Diff line
@@ -710,7 +710,6 @@ namespace Isis { 
  FileName ControlPointEditWidget::findGroundFile() {



    FileName groundFile(m_editPoint->GetAprioriSurfacePointSourceFile());



    if (m_changeAllGroundLocation) {

      QFileInfo oldFile(groundFile.expanded());

      QFileInfo newFile(m_newGroundDir, oldFile.fileName());
@@ -1028,7 +1027,7 @@ namespace Isis { 


    Camera *cam;

    for (int i = 0; i < m_serialNumberList->size(); i++) {

//    if (m_serialNumberList->serialNumber(i) == m_groundSN) continue;

      if (m_serialNumberList->serialNumber(i) == m_groundSN) continue;

      cam = m_controlNet->Camera(i);

      if (cam->SetUniversalGround(latitude, longitude)) {

        //  Make sure point is within image boundary
@@ -1246,9 +1245,7 @@ namespace Isis { 
      }



      // emit a signal to alert user to save when exiting

      qDebug()<<"ControlPointEditWidget before cnetModified signal";

      emit cnetModified();

      qDebug()<<"ControlPointEditWidget after cnetModified signal";

      emit saveControlNet();



      if (m_editPoint != NULL) {

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

+4 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ namespace Isis { 
  class UniversalGroundMap;



  /**

   * @brief Gui for editing ControlPoint

   * @brief Gui for editing ControlPoints in ipce application

   *

   * @ingroup Visualization Tools

   *
@@ -85,6 +85,9 @@ namespace Isis { 
   *   @history 2018-03-30 Tracie Sucharski - Save Control in addition to the control net and use

   *                           Control to write the control net so Control can keep track of the

   *                           modification state of the control net.

   *   @history 2018-04-25 Tracie Sucharski - Fix bug when creating a control point from CubeDnView

   *                           or FootprintView if a ground source exists in the serial number list.

   *                           Fixes #5399.

   */

  class ControlPointEditWidget : public QWidget {

    Q_OBJECT