Commit 4ef2222a authored by Adam Goins's avatar Adam Goins
Browse files

Merge branch 'Goins_Adam_M05361' of github.com:AgoinsUSGS/ISIS3 into Goins_Adam_M05361

parents bac68d02 29131e4e

isis/src/control/objs/ControlNet/ControlNet.truth

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ Object = ControlNetwork 
  Created      = 2010-07-10T12:50:15

  LastModified = 2010-07-10T12:50:55

  Description  = "UnitTest of ControlNetwork"

  TargetRadii  = (3396190.0, 3396190.0, 3376200.0)

  Version      = 5



  Object = ControlPoint

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ namespace Isis { 
   *   @history 2018-03-28 Adam Goins - Added targetRadii groups to the header. Changed the

   *                           versioner to write these values out in a targetRadii group for

   *                           both binary V0005 and PvlV0005 networks. Fixes #5361.

   *   @history 2018-04-05 Adam Goins - Added hastargetRadii() and targetRadii() to the versioner

   *   @history 2018-04-05 Adam Goins - Added hasTargetRadii() and targetRadii() to the versioner

   *                           so that these values can be grabbed from a ControlNet on read.

   *                           Also Fixes #5361.

   */