Commit 4f60c6b1 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG fixed history comments. References #2041. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6027 41f8697f-d340-4b68-9986-7bafba869bb8
parent c26fec11

isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1077,9 +1077,11 @@ namespace Isis { 
   *                           QnetTool::measureSaved to ::saveMeasure.  The error checking now

   *                           forces the edit lock check box to be unchecked before the measure

   *                           can be saved.

   *   @history 2014-01-09 Ian Humphrey - Modified to prevent segmentation fault that arises when

   *                           registering, opening a template file, and saving the measure.

   *                           Fixes #2041.

   *   @history 2015-01-09 Ian Humphrey - Modified to prevent segmentation fault that arises when

   *                           registering, opening a template file, and saving the measure. This

   *                           was caused by not handling the exception thrown by 

   *                           ControlMeasure::SetLogData(), which produces undefined behavior

   *                           within the Qt signal-slot connection mechanism.

   */

  void ControlPointEdit::saveMeasure() {
@@ -1475,7 +1477,7 @@ namespace Isis { 
   *                          registration is successfull, otherwise the

   *                          original template file is kept.

   *   @history 2014-12-11 Ian Humphrey - Modified code so opening a template file will undo 

   *                           registration if a point is already registered. Fixes #2041.

   *                           registration if a point is already registered.

   */

  bool ControlPointEdit::setTemplateFile(QString fn) {

isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ namespace Isis { 
    *   @history 2013-12-30 Kimberly Oyama and Stuart Sides - In saveChips(), added single quotes

    *                           around the file names in case there are spaces or other special

    *                           characters in them. Fixes #1551.

    *   @history 2015-01-13 Ian Humphrey - Modified setTemplateFile() so opening a template file 

    *                           will undo registration if a point is already registered. Modified

    *                           saveMeasure() to handle exception thrown by

    *                           ControlMeasure::SetLogData(). Fixes #2041.

    *  

    *   @todo  Re-think design of the change made on 2012-07-26.  The linking was put into

    *                          ::updateLeftPositionLabel because it was the fastest solution, but