Commit 9f6fccf4 authored by chrisryancombs's avatar chrisryancombs
Browse files

Added history comments, fixed variable name in JigsawWorkOrder

parent a5add0dd

isis/src/control/objs/BundleAdjust/BundleAdjust.h

+2 −0
Original line number Diff line number Diff line
@@ -285,6 +285,8 @@ namespace Isis { 
   *   @history 2017-08-09 Summer Stapleton - Added a try/catch around the m_controlNet assignment

   *                           in each of the constructors to verify valid control net input.

   *                           Fixes #5068.

   *   @history 2018-06-14 Christopher Combs - Added getter method to tell if a bundle adjust was

   *                           aborted. Added emits for status updates to the run widget.

   */

  class BundleAdjust : public QObject {

      Q_OBJECT

isis/src/qisis/apps/ipce/IpceMainWindow.h

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ namespace Isis { 
   *                           Fixes #5412.

   *   @history 2018-05-31 Christopher Combs - Added support for JigsawRunWidget to be created as a 

   *                           dockable widget in addView(). Fixes #5428.

   *   @history 2018-06-14 Christopher Combs - Changed addView method to take in JigsawRunWidget as

   *                           a QDockWidget object instead of wrapping it in one.

   *  

   */

  class IpceMainWindow : public QMainWindow {

isis/src/qisis/objs/Directory/JigsawWorkOrder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ namespace Isis { 
   * @see WorkOrder::execute()

   */

  void JigsawWorkOrder::execute() {

    JigsawRunWidget *runDialog = project()->directory()->addJigsawRunWidget();

    if (!runDialog) {

    JigsawRunWidget *runWidget = project()->directory()->addJigsawRunWidget();

    if (!runWidget) {

      QString msg = "Unable to open Jigsaw Run Widget";

      throw IException(IException::Programmer, msg, _FILEINFO_);

    }

isis/src/qisis/objs/JigsawRunWidget/JigsawRunWidget.h

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ namespace Isis { 
   *                           Now inherits from QFrame instead of QDialog. Added support for new

   *                           workflow in which JigsawSetupDialog is only ever called from a

   *                           button on this widget. Fixes #5428. 

   *   @history 2018-06-14 Christopher Combs - Made changes according to new design mockup. Added 

   *                           status bar, control net info, and rms adj point sigmas sections. 

   *                           Removed buttons for close and reject. Now inherits from QDockWidget

   *                           instead of QFrame, and handles close event if a bundle is running. 

   */

  class JigsawRunWidget : public QDockWidget {

    Q_OBJECT