Commit 222ef0a0 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Deleted the progress bar clean up in WorkOrder because the HistoryTreeWidget... 

Deleted the progress bar clean up in WorkOrder because the HistoryTreeWidget takes ownership of the progress bar.
parent 4ddc8311

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

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ namespace Isis { 
      //include those that do not need it.



      if(workOrder->progressBar() )  {

        setItemWidget(newItem, 1, new ProgressBar);

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

        //setItemWidget(newItem, 1, new ProgressBar);

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

      }

      scrollToItem(newItem);

      refit();

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

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

    delete m_shapeList;

    delete m_futureWatcher;

    delete m_progressBar;

//     delete m_progressBar;

    delete m_progressBarDeletionTimer;

    delete m_progressBarUpdateTimer;

    delete m_transparentConstMutex;
@@ -1654,13 +1654,13 @@ 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;

    }

//     ProgressBar *progress = m_progressBar;

// 

//     if (m_progressBar) {

//       delete progress;

//       m_progressBar = NULL;

//       emit deletingProgress(this);

//     }

  }