Unverified Commit 670f49ff authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #269 from jessemapel/ipce 

Cleaned up QChart includes
parents 58f83821 d2070657

isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp

+3 −7
Original line number Diff line number Diff line
@@ -46,10 +46,6 @@ 
#include <QGridLayout>

#include <QWidgetAction>

#include <QMenu>

#include <QChart>

#include <QChartView>

#include <QPieSeries>

#include <QPieSlice>

#include <ControlNet.h>

#include <ControlNetVitals.h>

#include <ControlPoint.h>
@@ -286,7 +282,7 @@ namespace Isis { 
    m_numImagesLabel         = NULL;

    m_numMeasuresLabel       = NULL;

    m_numPointsLabel         = NULL;

    m_pointChartView         = NULL;

    // m_pointChartView         = NULL;

    m_pointsEditLockedLabel  = NULL;

    m_pointsFewMeasuresLabel = NULL;

    m_pointsIgnoredLabel     = NULL;
@@ -775,7 +771,7 @@ namespace Isis { 
    delete m_numImagesLabel;

    delete m_numMeasuresLabel;

    delete m_numPointsLabel;

    delete m_pointChartView;

    // delete m_pointChartView;

    delete m_pointsEditLockedLabel;

    delete m_pointsFewMeasuresLabel;

    delete m_pointsIgnoredLabel;
@@ -796,7 +792,7 @@ namespace Isis { 
    m_numImagesLabel         = NULL;

    m_numMeasuresLabel       = NULL;

    m_numPointsLabel         = NULL;

    m_pointChartView         = NULL;

    // m_pointChartView         = NULL;

    m_pointsEditLockedLabel  = NULL;

    m_pointsFewMeasuresLabel = NULL;

    m_pointsIgnoredLabel     = NULL;

isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#include <QLabel>

#include <QTableWidget>

#include <QChartView>

#include <QProgressBar>

#include <QPointer>

#include <ControlNetVitals.h>
@@ -84,7 +83,7 @@ namespace Isis { 
        void updateImageTable(QList<QString> serials);

        void updatePointTable(QList<ControlPoint*> points);



        QChartView *m_pointChartView;

        // QChartView *m_pointChartView;

        ControlNetVitals *m_vitals;

        QProgressBar *m_statusBar;