Commit 5c03d714 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

PROG: Cleaned-up namespace references. Sorry guys! References #5054 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7916 41f8697f-d340-4b68-9986-7bafba869bb8
parent b46221ee

isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace Isis { 
    protected:

      void createWidget(QStringList options);

      QString const &getCurrentChoice() const;

      using Isis::CnetViz::AbstractFilter::evaluate;

      using Isis::AbstractFilter::evaluate;



    private:

      void nullify();

isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace Isis { 




    protected:

      using Isis::CnetViz::AbstractFilter::evaluate;

      using Isis::AbstractFilter::evaluate;

      bool evaluate(double) const;

      QString descriptionSuffix() const;

      bool lessThan() const;

isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace Isis { 




    protected:

      using Isis::CnetViz::AbstractFilter::evaluate;

      using Isis::AbstractFilter::evaluate;

      bool evaluate(QString) const;

      QString descriptionSuffix() const;

isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h

+108 −108
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ namespace Isis { 
  class PointTableModel;

  class TableView;

  class TreeView;

}



  /**

  * This widget provides full editing, filtering and viewing capabilities for
@@ -72,8 +71,8 @@ class CnetEditorWidget : public QWidget { 
      QWidget *serialFilterWidget();

      QWidget *connectionFilterWidget();



    CnetViz::AbstractTableModel *measureTableModel();

    CnetViz::AbstractTableModel *pointTableModel();

      AbstractTableModel *measureTableModel();

      AbstractTableModel *pointTableModel();



      QMap< QAction *, QList< QString > > menuActions();

      QMap< QString, QList< QAction * > > toolBarActions();
@@ -119,7 +118,7 @@ class CnetEditorWidget : public QWidget { 




    private slots:

    void rebuildModels(QList< CnetViz::AbstractTreeItem * > itemsToDelete);

      void rebuildModels(QList< AbstractTreeItem * > itemsToDelete);



      void pointColToggled();

      void measureColToggled();
@@ -137,12 +136,12 @@ class CnetEditorWidget : public QWidget { 




    private: // widgets

    CnetViz::TreeView *m_pointTreeView;

    CnetViz::TreeView *m_imageTreeView;

    CnetViz::TreeView *m_connectionTreeView;

      TreeView *m_pointTreeView;

      TreeView *m_imageTreeView;

      TreeView *m_connectionTreeView;



    CnetViz::TableView *m_pointTableView;

    CnetViz::TableView *m_measureTableView;

      TableView *m_pointTableView;

      TableView *m_measureTableView;



      QGroupBox *m_pointTableBox;

      QGroupBox *m_measureTableBox;
@@ -153,12 +152,12 @@ class CnetEditorWidget : public QWidget { 
      QWidget *m_serialFilterWidget;

      QWidget *m_connectionFilterWidget;



    CnetViz::PointMeasureTreeModel *m_pointModel;

    CnetViz::ImagePointTreeModel *m_imageModel;

    CnetViz::ImageImageTreeModel *m_connectionModel;

      PointMeasureTreeModel *m_pointModel;

      ImagePointTreeModel *m_imageModel;

      ImageImageTreeModel *m_connectionModel;



    CnetViz::PointTableModel *m_pointTableModel;

    CnetViz::MeasureTableModel *m_measureTableModel;

      PointTableModel *m_pointTableModel;

      MeasureTableModel *m_measureTableModel;



      QSplitter *m_mainSplitter;
@@ -166,6 +165,7 @@ class CnetEditorWidget : public QWidget { 
      QMap< QString, QList< QAction * > > * m_toolBarActions;



      QString *m_settingsPath;

  };

}



#endif

isis/src/qisis/objs/CnetEditorWidget/TableView.cpp

+2 −2
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ namespace Isis { 
    connect(m_content, SIGNAL(tableSelectionChanged()),

        this, SIGNAL(selectionChanged()));

    connect(m_content,

        SIGNAL(rebuildModels(QList< CnetViz::AbstractTreeItem * >)),

        SIGNAL(rebuildModels(QList< AbstractTreeItem * >)),

        this,

        SIGNAL(rebuildModels(QList< CnetViz::AbstractTreeItem * >)));

        SIGNAL(rebuildModels(QList< AbstractTreeItem * >)));

    connect(m_content, SIGNAL(horizontalScrollBarValueChanged(int)),

        m_header, SLOT(updateHeaderOffset(int)));

    connect(m_content, SIGNAL(modelDataChanged()),