Commit fca7243c authored by Ken Edmundson's avatar Ken Edmundson
Browse files

PROG: Modified m_controlMap value from QWidget to CnetEditorWidget. Added... 

PROG: Modified m_controlMap value from QWidget to CnetEditorWidget. Added ability to view bundleout.txt file in method addBundleObservationView. Changed connection  to take signal from a CnetEditorWidget instead of a QWidget for destruction of a CnetEditorWidget.
parent b418ca2d

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

+9 −3
Original line number Diff line number Diff line
@@ -568,6 +568,11 @@ namespace Isis { 


    QString str = fileItem->fileName();



    if (str.contains("bundleout")) {

      result->setWindowTitle( tr("Summary").

                              arg( m_bundleObservationViews.count() ) );

      result->setObjectName( result->windowTitle() );

    }

    if (str.contains("residuals")) {

      result->setWindowTitle( tr("Measure Residuals").

                              arg( m_bundleObservationViews.count() ) );
@@ -673,7 +678,8 @@ namespace Isis { 
      mainWidget->pointTableView()->content()->setActiveControlNet(true);

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

    }

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



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

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



    //  Connections for control point editing between views
@@ -692,7 +698,7 @@ namespace Isis { 
    connect(this, SIGNAL(cnetModified()), mainWidget, SLOT(rebuildModels()));



    m_cnetEditorViewWidgets.append(mainWidget);

    m_controlMap.insertMulti(network, result);

    m_controlMap.insertMulti(network, mainWidget);



    result->setWindowTitle(title);

    result->setObjectName(title);

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

+6 −1
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-22 Ken Edmundson - Modified m_controlMap value from QWidget to

   *                           CnetEditorWidget. Added ability to view bundleout.txt file in method

   *                           addBundleObservationView. Changed connection  to take signal from

   *                           a CnetEditorWidget instead of a QWidget for destruction of a

   *                           CnetEditorWidget.

   */

  class Directory : public QObject {

    Q_OBJECT
@@ -458,7 +463,7 @@ namespace Isis { 
      QList<QAction *> m_activeToolBarActions; //!< List of active ToolBar actions

      QList<QAction *> m_toolPadActions; //!< List of ToolPad actions



      QMultiMap<Control*, QWidget*> m_controlMap; //!< Map to hold every view with an open Control

      QMultiMap<Control*, CnetEditorWidget*> m_controlMap; //!< Map to hold every view with an open Control



      QString m_editPointId; //!< Current control point that is in the ControlPointEditWidget