Commit 01324b1d authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Allow cubeDnView to be created without setting an active control net. Check... 

Allow cubeDnView to be created without setting an active control net.  Check for existence of control net in paintViewport method.

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

isis/src/qisis/objs/IpceTool/IpceTool.cpp

+3 −2
Original line number Diff line number Diff line
@@ -181,9 +181,10 @@ namespace Isis { 


  void IpceTool::paintViewport(MdiCubeViewport *vp, QPainter *painter) {

//  qDebug()<<"IpceTool::paintViewport";



    if (m_controlNet) {

      drawAllMeasurements(vp, painter);

    }

  }





  /**

isis/src/qisis/objs/IpceTool/IpceTool.h

+4 −2
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ namespace Isis { 
   * @internal 

   *   @history 2016-09-30 Tracie Sucharski - Pass in directory to constructor, so that we can

   *                           query for shapes and other data from the project.

   *   @history 2016-10-25 Tracie Sucharski - Check for existence of Control net in the

   *                           paintViewport method.

   *                           

   */

  class IpceTool : public Tool {
@@ -76,7 +78,7 @@ namespace Isis { 
      Directory *m_directory;

      CubeDnView *m_view;



      ControlNet *m_controlNet;

      QPointer<ControlNet> m_controlNet;



      QPointer<Workspace> m_workspace;

  };