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

jigsaw dialog 

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

isis/src/qisis/objs/JigsawDialog/JigsawDialog.cpp

+18 −4
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ 
#include "BundleResults.h"

#include "BundleSettings.h"

#include "Control.h"

#include "iTime.h"

#include "JigsawSetupDialog.h"

#include "ui_JigsawDialog.h"

#include "ui_jigsawdialog.h"

#include "Project.h"



namespace Isis {
@@ -20,6 +21,7 @@ namespace Isis { 
    m_selectedControl = NULL;

    m_bundleSettings = NULL;



    setWindowFlags(Qt::WindowStaysOnTopHint);

  }



  JigsawDialog::~JigsawDialog() {
@@ -42,7 +44,6 @@ namespace Isis { 
      m_selectedControl = setupdlg.selectedControl();

      m_bundleSettings = setupdlg.bundleSettings();

    }



  }
@@ -59,6 +60,7 @@ namespace Isis { 
    // assume defaults or send warning???

    if (m_bundleSettings == NULL) {

    }



    SerialNumberList snlist;



    QList<ImageList *> imagelists = m_project->images();
@@ -74,10 +76,22 @@ namespace Isis { 


    ControlNet *cnet = m_selectedControl->controlNet();



    BundleAdjust ba(*m_bundleSettings, *cnet, snlist, false);

//    BundleAdjust ba(*m_bundleSettings, *cnet, snlist, false);

// run bundle (thread with BundleThread::QThread) - pump output to modeless dialog

    // BundleResults results = ba.solveCholesky();

    ba.solveCholesky();

//    ba.solveCholesky();



    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    // create dummy bundle results and add to project

    BundleSettings *settings = new BundleSettings();

    QString fname = m_selectedControl->fileName();

//    BundleResults *bundleResults = new BundleResults(*settings,*cnet, fname);

    BundleResults *bundleResults = new BundleResults(*settings, fname);

    bundleResults->setRunTime(Isis::iTime::CurrentLocalTime().toAscii().data());

    m_project->addBundleResults(bundleResults);





    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



  }

}