Commit b163e3fb authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fixed some extraneous code in Directory::addFootprint2DView which happened in... 

Fixed some extraneous code in Directory::addFootprint2DView which happened in an svn merge.  Removed unused signal, controlPointAdded.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@8024 41f8697f-d340-4b68-9986-7bafba869bb8
parent 9903773b

isis/src/qisis/objs/Directory/Directory.cpp

+0 −8
Original line number Diff line number Diff line
@@ -715,14 +715,6 @@ namespace Isis { 
    //  to be drawn with different color/shape.

    connect(this, SIGNAL(redrawMeasures()), result, SIGNAL(redrawMeasures()));



    //  Control Net tool will only be active if the project has an active Control.  Note:  This

    //  assumes the Control Net tool is the 4th in the toolpad.

    connect(this, SIGNAL(controlPointAdded(QString)), result, SIGNAL(controlPointAdded(QString)));



    //  This signal is connected to the MosaicGraphicsScene::update(), which eventually calls

    //  ControlNetGraphicsItem::paint(), then ControlPointGraphicsItem::paint().

    connect(this, SIGNAL(redrawMeasures()), result, SIGNAL(redrawMeasures()));



    //  Control Net tool will only be active if the project has an active Control.  Note:  This

    //  assumes the Control Net tool is the 4th in the toolpad.

    if (!project()->activeControl()) {

isis/src/qisis/objs/Directory/Directory.h

+3 −1
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ namespace Isis { 
   *                           editing actions between views.

   *   @history 2017-08-18 Tracie Sucharski - Removed deletion of control net from

   *                           ::makeBackupActiveControl, don't know why it was being deleted.

   *   @history 2017-08-23 Tracie Sucharski - Fixed some code involving connections in

   *                           in ::addFootprint2DView which got messed up in a svn merge.  Removed

   *                           unused signal, controlPointAdded.

   */

  class Directory : public QObject {

    Q_OBJECT
@@ -301,7 +304,6 @@ namespace Isis { 
      void newWidgetAvailable(QWidget *newWidget);



      void cnetModified();

      void controlPointAdded(QString newPointId);

      void redrawMeasures();



    public slots: