Unverified Commit 38d38914 authored by Tracie Sucharski's avatar Tracie Sucharski Committed by GitHub
Browse files

Merge pull request #155 from kledmundson/ipce 

PROG: resolves Tracie's feedback on #4850 regarding QString::arg: Arg…
parents 138ddd23 88609256

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

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "Directory.h"

#include "BundleObservationView.h"

#include "Project.h"

#include "ProjectItemModel.h"



namespace Isis {

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

+17 −8
Original line number Diff line number Diff line
@@ -599,25 +599,34 @@ namespace Isis { 
    m_bundleObservationViews.append(result);



    QString str = fileItem->fileName();

    FileName fileName = fileItem->fileName();



    // strip out bundle results name from fileName

    QString path = fileName.originalPath();

    int pos = path.lastIndexOf("/");

    QString bundleResultsName = "";

    if (pos != -1) {

      bundleResultsName = path.remove(0,pos+1);

    }



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

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

                              arg( m_bundleObservationViews.count() ) );

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

                              arg( bundleResultsName ) );

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

    }

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

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

                              arg( m_bundleObservationViews.count() ) );

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

                              arg( bundleResultsName ) );

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

    }

    else if (str.contains("points")) {

      result->setWindowTitle( tr("Control Points").

                              arg( m_bundleObservationViews.count() ) );

      result->setWindowTitle( tr("Control Points (%1)").

                              arg( bundleResultsName ) );

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

    }

    else if (str.contains("images")) {

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

                              arg( m_bundleObservationViews.count() ) );

      result->setWindowTitle( tr("Images (%1)").

                              arg( bundleResultsName ) );

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

    }