Unverified Commit 6e1d727a authored by Makayla Shepherd's avatar Makayla Shepherd Committed by GitHub
Browse files

Merge branch 'ipceDocks' into ipceDocks

parents 3d3a14fd 0044412c

isis/src/qisis/objs/HistoryTreeWidget/HistoryTreeWidget.cpp

+1 −3
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ namespace Isis { 
      newItem->setForeground(1, Qt::gray);



      this->insertTopLevelItem(0, newItem);

//      invisibleRootItem()->addChild(newItem);



      connect(workOrder, SIGNAL(statusChanged(WorkOrder *)),

                this, SLOT(updateStatus(WorkOrder *)));
@@ -151,8 +150,7 @@ namespace Isis { 
      //include those that do not need it.



      if(workOrder->progressBar() )  {

        setItemWidget(newItem, 1, new ProgressBar);

//        this->setItemWidget(newItem, 1, workOrder->progressBar() );

        this->setItemWidget(newItem, 1, workOrder->progressBar() );

      }

      scrollToItem(newItem);

      refit();

isis/src/qisis/objs/HistoryTreeWidget/HistoryTreeWidget.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ namespace Isis { 
   *                            saving a control is turned into a WorkOrder.  This was done for the

   *                            alpha release simply to notify the user that the control was saved.

   *                            However, this history entry is not saved/restored to a project.

   *

   *   @history 2018-06-28 Makayla Shepherd - Restored the ProgressBar. Fixes #5228.

   */

  class HistoryTreeWidget : public QTreeWidget {

      Q_OBJECT

isis/src/qisis/objs/Project/Project.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,7 @@ namespace Isis { 
    }

    m_isOpen = true;



    setClean(true);

    emit projectLoaded(this);

  }

isis/src/qisis/objs/WorkOrder/WorkOrder.cpp

+0 −17
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ namespace Isis { 
    delete m_imageList;

    delete m_shapeList;

    delete m_futureWatcher;

    delete m_progressBar;

    delete m_progressBarDeletionTimer;

    delete m_progressBarUpdateTimer;

    delete m_transparentConstMutex;
@@ -1576,8 +1575,6 @@ namespace Isis { 
      delete m_progressBarDeletionTimer;

      m_progressBarDeletionTimer = new QTimer;

      m_progressBarDeletionTimer->setSingleShot(true);

      connect(m_progressBarDeletionTimer, SIGNAL(timeout()),

              this, SLOT(deleteProgress()));



      m_progressBarDeletionTimer->start(5 * 1000); // 5 seconds
@@ -1650,20 +1647,6 @@ namespace Isis { 
  }





  /**

   * @brief Deletes the progress bar.

   */

  void WorkOrder::deleteProgress() {

    ProgressBar *progress = m_progressBar;



    if (m_progressBar) {

      m_progressBar = NULL;

      emit deletingProgress(this);

      delete progress;

    }

  }





  /**

   * @brief Updates the progress bar.

   */

isis/src/qisis/objs/WorkOrder/WorkOrder.h

+4 −1
Original line number Diff line number Diff line
@@ -314,6 +314,10 @@ namespace Isis { 
   *                           a private QString object called m_data.  References #4492.

   *   @history 2017-12-05 Christopher Combs - Added support for TemplateEditorWidget and

   *                           TemplateEditViewWorkOrder. Fixes #5168.

   *   @history 2018-06-28 Makayla Shepherd - Removed the ProgressBar cleanup because it was 

   *                           causing a seg fault when the ProgressBar was added to the 

   *                           HistoryTreeWidget. The HistoryTreeWidget will now clean up the

   *                           ProgressBar. Fixes #5228.

   */

  class WorkOrder : public QAction, public QUndoCommand {

    Q_OBJECT
@@ -480,7 +484,6 @@ namespace Isis { 
      void executionFinished();

      void clearImageList();

      void clearShapeList();

      void deleteProgress();

      void updateProgress();

      void startRedo();