Commit 635d4270 authored by Adam Goins's avatar Adam Goins
Browse files

Added progresssbar visualations for point free,fixed,constrained, added...

Added progresssbar visualations for point free,fixed,constrained, added history commentablility, added ability for the imag eand point tables to be double clicked to open a respective view.
parent 55930658
Loading
Loading
Loading
Loading
+63 −15
Original line number Diff line number Diff line
#include "ControlNetVitals.h"

#include <QDateTime>
#include <QList>
#include <QPair>
#include <QVariant>

#include "IException.h"
#include "IString.h"
@@ -80,6 +83,11 @@ namespace Isis {
  }


  void ControlNetVitals::emitHistoryEntry(QString entry, QString id, QVariant oldValue, QVariant newValue) {
    emit historyEntry(entry, id, oldValue, newValue, QDateTime::currentDateTime().toString());
  }


  /**
   *  This SLOT is designed to intercept the newPoint() signal emitted from a ControlNetwork
   *  whenever a new point has been added. It observes the Control Point and increments the
@@ -95,6 +103,8 @@ namespace Isis {
   *  @param point The ControlPoint being added to the network.
   */
  void ControlNetVitals::addPoint(ControlPoint *point) {
    emitHistoryEntry("Control Point Added", point->GetId(), "", "");

    if (point->IsIgnored()) {
      m_numPointsIgnored++;
      return;
@@ -137,9 +147,14 @@ namespace Isis {
   */
  void ControlNetVitals::pointModified(ControlPoint *point, ControlPoint::ModType type,
                                       QVariant oldValue, QVariant newValue) {

    QString historyEntry;

    switch(type) {
      case ControlPoint::EditLockModified:

        historyEntry = "Point Edit Lock Modified";

        if (oldValue.toBool()) {
          m_numPointsLocked--;
        }
@@ -148,10 +163,15 @@ namespace Isis {
          m_numPointsLocked++;
        }

        emitHistoryEntry( historyEntry, point->GetId(),
                          oldValue, newValue );

        break;

      case ControlPoint::IgnoredModified:

        historyEntry = "Point Ignored Modified";

        if (oldValue.toBool()) {
          m_numPointsIgnored--;
          if (point->IsEditLocked()) {
@@ -179,23 +199,37 @@ namespace Isis {
          }
        }

        emitHistoryEntry( historyEntry, point->GetId(),
                          oldValue, newValue );

        break;

      case ControlPoint::TypeModified:

        historyEntry = "Point Type Modified";

        m_pointTypeCounts[ControlPoint::PointType(oldValue.toInt())]--;
        m_pointTypeCounts[ControlPoint::PointType(newValue.toInt())]++;

        emitHistoryEntry( historyEntry, point->GetId(),
                          ControlPoint::PointTypeToString(ControlPoint::PointType(oldValue.toInt())),
                          ControlPoint::PointTypeToString(ControlPoint::PointType(newValue.toInt())) );

        break;

      default:
        // no operation
        break;
    }

    validate();

  }

  ControlPoint* ControlNetVitals::getPoint(QString id) {
    return m_controlNet->GetPoint(id);
  }


  /**
   *  This SLOT is designed to intercept the removePoint() signal emitted by a Control Network
@@ -213,6 +247,9 @@ namespace Isis {
   *  @param point The Control Point being deleted from the Control Network.
   */
  void ControlNetVitals::deletePoint(ControlPoint *point) {

    emitHistoryEntry("Control Point Deleted", point->GetId(), "", "");

    if (point->IsIgnored()) {
      m_numPointsIgnored--;
      validate();
@@ -245,6 +282,8 @@ namespace Isis {
   *  @param measure The Control Measure being added to a Control Point in the network.
   */
  void ControlNetVitals::addMeasure(ControlMeasure *measure) {
    emitHistoryEntry("Control Measure Added", measure->GetCubeSerialNumber(), "", "");

    ControlPoint *point = measure->Parent();
    if (point) {
      // By this time, the measure has been added to its parent point, so the
@@ -291,9 +330,13 @@ namespace Isis {
   */
  void ControlNetVitals::measureModified(ControlMeasure *measure, ControlMeasure::ModType type, QVariant oldValue, QVariant newValue) {

    QString historyEntry;

    switch (type) {
      case ControlMeasure::IgnoredModified:

        historyEntry = "Measure Ignored Modified";

        if ( !oldValue.toBool() && newValue.toBool() ) {
          return addMeasure(measure);
        }
@@ -307,6 +350,9 @@ namespace Isis {
        break;

    }

    emitHistoryEntry(historyEntry, measure->GetCubeSerialNumber(), "", "");

    validate();
  }

@@ -323,6 +369,9 @@ namespace Isis {
   */
  void ControlNetVitals::deleteMeasure(ControlMeasure *measure) {

    emitHistoryEntry("Control Measure Deleted", measure->GetCubeSerialNumber(), "", "");


    ControlPoint *point = measure->Parent();
    if (point) {
      // By this time, the measure is still a valid measure in the parent control point.
@@ -352,13 +401,6 @@ namespace Isis {
    else {
      m_imageMeasureCounts[numValidMeasures - 1]++;
    }

    // std::cout << "MEasure deleted" << std::endl;
    // foreach(int key, m_pointMeasureCounts) {
    //   std::cout << "Key: " << key << "   value: " << m_pointMeasureCounts[key];
    // }


    validate();
  }

@@ -375,11 +417,16 @@ namespace Isis {
   *  @param point The type of modification that was made to the observed Control Network.
   */
  void ControlNetVitals::validateNetwork(ControlNet::ModType type) {

    QString historyEntry;

    switch (type) {
      case ControlNet::Swapped:
        emitHistoryEntry("Control Net Swapped", m_controlNet->GetNetworkId(), "", "");
        initializeVitals();
        break;
      case ControlNet::GraphModified:
        emitHistoryEntry("Control Net Graph Modified", m_controlNet->GetNetworkId(), "", "");
        m_islandList = m_controlNet->GetSerialConnections();
        break;
      default:
@@ -501,14 +548,15 @@ namespace Isis {
   *  @return The number of points with number of measures less than the threshold.
   */
  int ControlNetVitals::numPointsBelowMeasureThreshold(int num) {
    int count = 0;
    foreach(int measureCount, m_pointMeasureCounts) {
      if (measureCount > num) {
        break;
      }
      count += m_pointMeasureCounts[measureCount];
    }
    return count;
    // int count = 0;
    // foreach(int measureCount, m_pointMeasureCounts) {
    //   if (measureCount >= num) {
    //     continue;
    //   }
    //   count += m_pointMeasureCounts[measureCount];
    // }
    // return count;
    return getPointsBelowMeasureThreshold(num).size();
  }


+9 −6
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@
 *   http://www.usgs.gov/privacy.html.
 */

#include <unordered_set>

#include <QStringList>

#include "ControlMeasure.h"
@@ -43,12 +41,12 @@ namespace Isis {
  *  It utilizes signals and slots to listen for changes in an observed Control Network and
  *  re-evaluates the health of a network whenever a change is made.
  *  It tracks several statistics, and is intended to be the back-end for the ControlHealthMonitorWidget
  *  that is located in IPCE
  *  that is located in IPCE.
  *
  *  The ControlNetVitals class keeps track of several member variables that are a running counter
  *  for network statistics in regard to the observed network. It creates these variables upon
  *  intialization and references these internal variables when returning certain statistics
  *  about a Control Network that can't be accessed by wrapper methods for the network itself.
  *  for network statistics in regard to the health of the observed network. It creates these
  *  variables upon intialization and references these internal variables when returning certain
  *  statistics about a Control Network that can't be accessed by wrapper methods for the network itself.
  *  It then listens for specific signals to be emitted whenever a change is made to the network
  *  to update it's internal counters with respect to that change.
  *
@@ -72,6 +70,8 @@ namespace Isis {
      int numIslands();
      const QList< QList<QString> > &getIslands();

      ControlPoint *getPoint(QString id);

      int numPoints();
      int numIgnoredPoints();
      int numLockedPoints();
@@ -101,8 +101,11 @@ namespace Isis {
      QString getStatus();
      QString getStatusDetails();

      void emitHistoryEntry(QString entry, QString id, QVariant oldValue, QVariant newValue);

    signals:
      void networkChanged();
      void historyEntry(QString, QString, QVariant, QVariant, QString);

    public slots:
      void validate();
+34 −7
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@
#include <QWidgetAction>

#include "ControlHealthMonitorWidget.h"
#include "ControlPointEditView.h"
#include "ControlPointEditWidget.h"
#include "CnetEditorView.h"

#include "ControlNet.h"
#include "ControlPoint.h"
#include "Directory.h"
@@ -44,16 +48,24 @@ namespace Isis {
  /**
   * Constructor.
   */
  ControlHealthMonitorView::ControlHealthMonitorView(ControlNet *controlNet, QWidget *parent) :
  ControlHealthMonitorView::ControlHealthMonitorView(Directory *directory, QWidget *parent) :
                        AbstractProjectItemView(parent) {
    m_directory = directory;
    ControlNet *net = m_directory->project()->activeControl()->controlNet();

    ControlNetVitals *vitals = new ControlNetVitals(net);
    m_controlHealthMonitorWidget = new ControlHealthMonitorWidget(vitals, parent);

    connect(m_controlHealthMonitorWidget, SIGNAL(openPointEditor(ControlPoint *)),
            this, SLOT(openPointEditor(ControlPoint *)));

    ControlNetVitals *vitals = new ControlNetVitals(controlNet);
    m_ControlHealthMonitorWidget = new ControlHealthMonitorWidget(vitals, parent);
    connect(m_controlHealthMonitorWidget, SIGNAL(openImageEditor()),
            this, SLOT(openImageEditor()));

    QVBoxLayout *layout = new QVBoxLayout;
    setLayout(layout);

    layout->addWidget(m_ControlHealthMonitorWidget);
    layout->addWidget(m_controlHealthMonitorWidget);

    m_permToolBar = new QToolBar("Standard Tools", 0);
    m_permToolBar->setObjectName("permToolBar");
@@ -86,12 +98,27 @@ namespace Isis {

  }

  void ControlHealthMonitorView::openPointEditor(ControlPoint *point) {
    ControlPointEditWidget* widget = m_directory->addControlPointEditView()->controlPointEditWidget();

    if (point && point != widget->editPoint()) {
      widget->setEditPoint(point);
    }

    // m_directory->addCnetEditorView(m_directory->project()->activeControl());
  }


  void ControlHealthMonitorView::openImageEditor() {
    m_directory->addCubeDnView();
  }


  /**
   * Destructor
   */
  ControlHealthMonitorView::~ControlHealthMonitorView() {
    delete m_ControlHealthMonitorWidget;
    delete m_controlHealthMonitorWidget;
    delete m_permToolBar;
    delete m_activeToolBar;
    delete m_toolPad;
@@ -108,7 +135,7 @@ namespace Isis {
   * @return (ControlHealthMonitorWidget *) The currently active ControlHealthMonitorWidget.
   */
  ControlHealthMonitorWidget *ControlHealthMonitorView::controlHealthMonitorWidget() {
    return m_ControlHealthMonitorWidget;
    return m_controlHealthMonitorWidget;
  }


+7 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ namespace Isis {
  class ProjectItem;
  class ControlHealthMonitorWidget;
  class ControlNet;
  class ControlPoint;
  class ToolPad;

  /**
@@ -51,7 +52,7 @@ class ControlHealthMonitorView : public AbstractProjectItemView {
  Q_OBJECT

  public:
    ControlHealthMonitorView(ControlNet *controlNet, QWidget *parent = 0);
    ControlHealthMonitorView(Directory *directory, QWidget *parent = 0);
    ~ControlHealthMonitorView();

    virtual QList<QAction *> permToolBarActions();
@@ -65,9 +66,13 @@ class ControlHealthMonitorView : public AbstractProjectItemView {
  public slots:

  private slots:
    void openPointEditor(ControlPoint *point);
    void openImageEditor();

  private:
    QPointer<ControlHealthMonitorWidget> m_ControlHealthMonitorWidget;
    Directory *m_directory;

    QPointer<ControlHealthMonitorWidget> m_controlHealthMonitorWidget;

    ToolPad *m_toolPad;        //!< The tool pad
    QToolBar *m_permToolBar;   //!< The permanent tool bar
+127 −27
Original line number Diff line number Diff line
@@ -70,8 +70,12 @@ namespace Isis {
  ControlHealthMonitorWidget::ControlHealthMonitorWidget(ControlNetVitals *vitals, QWidget *parent) : QWidget(parent) {
    createGui();
    m_vitals = vitals;

    connect (m_vitals, SIGNAL(networkChanged()),
            this,      SLOT(update()));

    connect (m_vitals, SIGNAL(historyEntry(QString, QString, QVariant, QVariant, QString)),
             this,     SLOT  (historyEntry(QString, QString, QVariant, QVariant, QString)));
    update();
  }

@@ -99,6 +103,26 @@ namespace Isis {
    m_pointsEditLockedLabel->setText(toString(m_vitals->numLockedPoints()));
    m_pointsFewMeasuresLabel->setText(toString(m_vitals->numPointsBelowMeasureThreshold()));

    double freePercent = ( (double) m_vitals->numFreePoints() ) / ( (double) m_vitals->numPoints() ) * 100;
    freePercent = ( (int) (freePercent * 100) ) / 100.0;
    QString freeFormat = toString(m_vitals->numFreePoints()) + " (" + toString(freePercent) + ")%";
    m_pointsFreeProgressbar->setValue(freePercent);
    m_pointsFreeProgressbar->setFormat(freeFormat);

    double constrainedPercent = ( (double) m_vitals->numConstrainedPoints() ) /
                                ( (double) m_vitals->numPoints() ) * 100;
    constrainedPercent = ( (int) (constrainedPercent * 100) ) / 100.0;
    QString constrainedFormat = toString(m_vitals->numConstrainedPoints()) + " (" + toString(constrainedPercent) + ")%";
    m_pointsConstrainedProgressbar->setValue(constrainedPercent);
    m_pointsConstrainedProgressbar->setFormat(constrainedFormat);

    double fixedPercent = ( (double) m_vitals->numFixedPoints() ) / ( (double) m_vitals->numPoints() ) * 100;
    fixedPercent = ( (int) (fixedPercent * 100) ) / 100.0;
    QString fixedFormat = toString(m_vitals->numFixedPoints()) + " (" + toString(fixedPercent) + ")%";
    m_pointsFixedProgressbar->setValue(fixedPercent);
    m_pointsFixedProgressbar->setFormat(fixedFormat);


    // We should enumerate the network state and do a comparison on enums here, not strings.
    if (m_vitals->getStatus() == "Broken!") updateStatus(0);
    else if (m_vitals->getStatus() == "Weak!") updateStatus(1);
@@ -225,12 +249,10 @@ namespace Isis {
    QHBoxLayout *netStatsLayout = new QHBoxLayout;
    netStatsLayout->setAlignment(Qt::AlignLeft);
    netStatsLayout->setSpacing(25);
    m_sizeLabel   = new QLabel("Size: 253M");
    m_numImagesLabel   = new QLabel("Images:");
    m_numPointsLabel   = new QLabel("Points:");
    m_numMeasuresLabel = new QLabel("Measures:");

    netStatsLayout->addWidget(m_sizeLabel);
    netStatsLayout->addWidget(m_numImagesLabel);
    netStatsLayout->addWidget(m_numPointsLabel);
    netStatsLayout->addWidget(m_numMeasuresLabel);
@@ -249,9 +271,8 @@ namespace Isis {
    m_statusBar->setFormat("Loading...");
    gridLayout->addWidget(m_statusBar);

    // We need to connect this properly.
    QLabel *modificationLabel = new QLabel("Last Modification:");
    gridLayout->addWidget(modificationLabel);
    m_lastModLabel = new QLabel("Last Modification:");
    gridLayout->addWidget(m_lastModLabel);

    QFrame* line = new QFrame();
    line->setFrameShape(QFrame::HLine);
@@ -267,12 +288,12 @@ namespace Isis {
    QWidget *overviewTab = createOverviewTab();
    QWidget *imagesTab = createImagesTab();
    QWidget *pointsTab = createPointsTab();
    QWidget *graphTab = createGraphTab();
    // QWidget *graphTab = createGraphTab();

    tabs->insertTab(0, overviewTab, "Overview");
    tabs->insertTab(1, imagesTab,   "Images");
    tabs->insertTab(2, pointsTab,   "Points");
    tabs->insertTab(3, graphTab,    "Graph");
    // tabs->insertTab(3, graphTab,    "Graph");

    gridLayout->addWidget(tabs);
  }
@@ -298,7 +319,6 @@ namespace Isis {
    m_pointsIgnoredLabel     = NULL;
    m_pointsShowingLabel     = NULL;
    m_pointsTable            = NULL;
    m_sizeLabel              = NULL;
    m_statusBar              = NULL;
    m_statusDetails          = NULL;
    m_statusLabel            = NULL;
@@ -342,12 +362,15 @@ namespace Isis {
    overviewLayout->addWidget(modLabel);

    QStringList headers;
    headers.append("#");
    headers.append("Action");
    headers.append("Id");
    headers.append("Old Value");
    headers.append("New Value");
    headers.append("Timestamp");


    m_historyTable = new QTableWidget();
    m_historyTable->setColumnCount(3);
    m_historyTable->setColumnCount(5);
    m_historyTable->setHorizontalHeaderLabels(headers);
    m_historyTable->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
    m_historyTable->horizontalHeader()->setStretchLastSection(true);
@@ -437,6 +460,9 @@ namespace Isis {
    // Create the table.
    m_imagesTable = new QTableWidget();

    connect(m_imagesTable, SIGNAL(itemDoubleClicked(QTableWidgetItem *)),
            this, SLOT(emitOpenImageEditor()));

    QStringList headers;
    headers.append("#");
    headers.append("Cube Serial");
@@ -457,7 +483,18 @@ namespace Isis {
    m_imagesShowingLabel = new QLabel("");
    m_imagesShowingLabel->setFont(fontMedium);

    imagesLayout->addWidget(m_imagesShowingLabel);
    QPushButton *viewAllButton = new QPushButton("View All");
    connect(viewAllButton, SIGNAL(clicked()),
            this, SLOT(viewImageAll()));

    QGridLayout *showingLayout = new QGridLayout;
    QWidget *showingWidget = new QWidget;

    showingLayout->addWidget(m_imagesShowingLabel, 0, 0, 1, 2);
    showingLayout->addWidget(viewAllButton, 0, 2);
    showingWidget->setLayout(showingLayout);

    imagesLayout->addWidget(showingWidget);
    imagesLayout->addWidget(m_imagesTable);

    imagesTab->setLayout(imagesLayout);
@@ -489,20 +526,32 @@ namespace Isis {
    QLabel *pointsIgnored = new QLabel("Points Ignored:");
    m_pointsIgnoredLabel = new QLabel("");

    QLabel *pointsLocked = new QLabel("Points Edit Locked:");
    m_pointsEditLockedLabel = new QLabel("");

    QLabel *pointsMeasure = new QLabel("Less than 3 valid Measures:");
    m_pointsFewMeasuresLabel = new QLabel("");

    QLabel *freePoints = new QLabel("Points Free:");
    m_pointsFreeLabel = new QLabel("");
    m_pointsFreeProgressbar = new QProgressBar();
    QPalette p = m_pointsFreeProgressbar->palette();
    p.setColor(QPalette::Highlight, Qt::blue);
    p.setColor(QPalette::Text, Qt::white);
    m_pointsFreeProgressbar->setPalette(p);
    m_pointsFreeProgressbar->setRange(0, 100);

    QLabel *constrainedPoints = new QLabel("Points Constrained:");
    m_pointsConstrainedLabel = new QLabel("");
    m_pointsConstrainedProgressbar = new QProgressBar();
    m_pointsConstrainedProgressbar->setPalette(p);
    m_pointsConstrainedProgressbar->setRange(0, 100);

    QLabel *fixedPoints = new QLabel("Points Fixed:");
    m_pointsFixedLabel = new QLabel("");
    m_pointsFixedProgressbar = new QProgressBar();
    m_pointsFixedProgressbar->setPalette(p);
    m_pointsFixedProgressbar->setRange(0, 100);

    QLabel *constrainedPoints = new QLabel("Points Constrained:");
    m_pointsConstrainedLabel = new QLabel("");
    QLabel *pointsLocked = new QLabel("Points Edit Locked:");
    m_pointsEditLockedLabel = new QLabel("");

    QLabel *pointsMeasure = new QLabel("Less than 3 valid Measures:");
    m_pointsFewMeasuresLabel = new QLabel("");

    // Set the font for the labels.
    pointsLocked->setFont(fontSmall);
@@ -536,15 +585,15 @@ namespace Isis {

    // Add the widgets in the proper place.
    viewLayout->addWidget(freePoints, 0, 0);
    viewLayout->addWidget(m_pointsFreeLabel, 0, 1);
    viewLayout->addWidget(m_pointsFreeProgressbar, 0, 1);
    viewLayout->addWidget(viewFreePoints, 0, 2);

    viewLayout->addWidget(fixedPoints, 1, 0);
    viewLayout->addWidget(m_pointsFixedLabel, 1, 1);
    viewLayout->addWidget(m_pointsFixedProgressbar, 1, 1);
    viewLayout->addWidget(viewFixedPoints, 1, 2);

    viewLayout->addWidget(constrainedPoints, 2, 0);
    viewLayout->addWidget(m_pointsConstrainedLabel, 2, 1);
    viewLayout->addWidget(m_pointsConstrainedProgressbar, 2, 1);
    viewLayout->addWidget(viewConstrainedPoints, 2, 2);

    viewLayout->addWidget(pointsIgnored, 3, 0);
@@ -583,12 +632,25 @@ namespace Isis {
    m_pointsTable->setGeometry(QApplication::desktop()->screenGeometry());
    m_pointsTable->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);

    pointsLayout->addSpacing(30);
    connect(m_pointsTable, SIGNAL(itemDoubleClicked(QTableWidgetItem *)),
            this, SLOT(emitOpenPointEditor()));

    m_pointsShowingLabel = new QLabel("");
    m_pointsShowingLabel->setFont(fontMedium);
    QPushButton *showAllButton = new QPushButton("View All");

    pointsLayout->addWidget(m_pointsShowingLabel);
    QGridLayout *showLayout = new QGridLayout;
    QWidget *showWidget = new QWidget;

    connect(showAllButton, SIGNAL(clicked()),
            this, SLOT(viewPointAll()));

    showLayout->addWidget(m_pointsShowingLabel, 0, 0, 1, 2);
    showLayout->addWidget(showAllButton, 0, 2);
    showWidget->setLayout(showLayout);

    pointsLayout->addSpacing(30);
    pointsLayout->addWidget(showWidget);
    pointsLayout->addWidget(m_pointsTable);

    pointsTab->setLayout(pointsLayout);
@@ -596,6 +658,46 @@ namespace Isis {
  }


  void ControlHealthMonitorWidget::emitOpenImageEditor() {
    emit openImageEditor();
  }


  void ControlHealthMonitorWidget::emitOpenPointEditor() {
    // Get the point
    QModelIndex pointId = m_pointsTable->selectionModel()->selectedIndexes()[1];
    ControlPoint *point = m_vitals->getPoint(pointId.data().toString());
    emit openPointEditor(point);
  }


  /**
   *  This SLOT is designed to intercept the historyEntry() signal emitted from the
   *  ControlNetVitals class whenever a modification is made to the network. The
   *  signal emits several details pertaining to the history entry.
   *
   *  @param entry     The history comment to be displayed.
   *  @param id        The id of the Control Point, Measure, or Network that was modified.
   *  @param oldValue  The old value before the modification was made.
   *  @param newValue  The new value after the modification was made.
   *  @param timeStamp The timestamp of when the modification was made.
   *
   */
  void ControlHealthMonitorWidget::historyEntry(QString entry, QString id,
                                                QVariant oldValue, QVariant newValue,
                                                QString timeStamp) {

    m_lastModLabel->setText("Last Modification: " + timeStamp);

    m_historyTable->insertRow(0);
    m_historyTable->setItem(0, 0, new QTableWidgetItem(entry));
    m_historyTable->setItem(0, 1, new QTableWidgetItem(id));
    m_historyTable->setItem(0, 2, new QTableWidgetItem(oldValue.toString()));
    m_historyTable->setItem(0, 3, new QTableWidgetItem(newValue.toString()));
    m_historyTable->setItem(0, 4, new QTableWidgetItem(timeStamp));
  }


  /*
  *  This method creates the Graph tab.
  *
@@ -798,7 +900,6 @@ namespace Isis {
    delete m_pointsIgnoredLabel;
    delete m_pointsShowingLabel;
    delete m_pointsTable;
    delete m_sizeLabel;
    delete m_statusBar;
    delete m_statusDetails;
    delete m_statusLabel;
@@ -819,7 +920,6 @@ namespace Isis {
    m_pointsIgnoredLabel     = NULL;
    m_pointsShowingLabel     = NULL;
    m_pointsTable            = NULL;
    m_sizeLabel              = NULL;
    m_statusBar              = NULL;
    m_statusDetails          = NULL;
    m_statusLabel            = NULL;
Loading