Commit 75fec6e7 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

PROG: fixed error in addCnetEditorView where destroyed signal was conneced to the wrong object

parent c3247d8c

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

+5 −3
Original line number Diff line number Diff line
@@ -673,7 +673,9 @@ namespace Isis { 
      mainWidget->pointTableView()->content()->setActiveControlNet(true);

      mainWidget->measureTableView()->content()->setActiveControlNet(true);

    }

    connect( result, SIGNAL( destroyed(QObject *) ),



    // connect destroyed signal for mainWidget to cleanupCnetEditorViewWidgets slot

    connect(mainWidget, SIGNAL( destroyed(QObject *) ),

            this, SLOT( cleanupCnetEditorViewWidgets(QObject *) ) );



    // Connections for control point editing between views

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

+5 −0
Original line number Diff line number Diff line
@@ -206,6 +206,11 @@ namespace Isis { 
   *                           projects. Fixes #5216.

   *   @history 2017-12-05 Christopher Combs - Added support for TemplateEditorWidget and

   *                           TemplateEditViewWorkOrder. Fixes #5168.

   *   @history 2018-03-14 Ken Edmundson - Modified addCnetEditorView method to connect the

   *                           destroyed signal for the CnetEditorWidget "mainWidget" to the

   *                           cleanupCnetEditorViewWidgets signal cleanupCnetEditorViewWidgets.

   *                           Previously the destroyed signal was connected to the QMainWidget

   *                           "result".

   */

  class Directory : public QObject {

    Q_OBJECT