Some merge issues happened with my last commit this fixes it #5026

#ifndef IpceTool_h

#define IpceTool_h

#ifndef ControlNetTool_h

#define ControlNetTool_h

#include "Tool.h"

#include "ControlPoint.h"

   *   @history 2017-08-09 Cole Neubauer - Added loadNetwork() for changing inbetween active

   *                           networks Fixes #4567

   */

  class IpceTool : public Tool {

  class ControlNetTool : public Tool {

    Q_OBJECT

    public:

      IpceTool (Directory *directory, QWidget *parent);

      virtual ~IpceTool ();

      ControlNetTool (Directory *directory, QWidget *parent);

      virtual ~ControlNetTool ();

      void setControlNet(ControlNet *controlNet);

      void paintViewport (MdiCubeViewport *cvp, QPainter *painter);

      void createMenus();

      void drawAllMeasurements(MdiCubeViewport *vp, QPainter *painter);

      QPointer<MainWindow> m_ipceTool;

      QPointer<MainWindow> m_ControlNetTool;

      Directory *m_directory;

      CubeDnView *m_view;