Commit 2db26063 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Remove qDebug statements from ProjectItemModel, CNetSuiteMainWindow. ... 

Remove qDebug statements from ProjectItemModel, CNetSuiteMainWindow.  Save/Restore CubeDnViews (not geometry of individual viewports).  Add more ground point functionality.

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

isis/src/local/apps/cnetsuite/CNetSuiteMainWindow.cpp

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ namespace Isis { 
    // ken testing



    if (args.count() == 2) {

      qDebug() << args.last();

      m_directory->project()->open(args.last());

    }

  }

isis/src/local/apps/cnetsuite/tsts/default/Makefile

+1 −1
Original line number Diff line number Diff line 
APPNAME = a.out

APPNAME = cnetsuite



include $(ISISROOT)/make/isismake.tsts

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp

+304 −146

File changed.

Preview size limit exceeded, changes collapsed.

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h

+2 −2
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ namespace Isis { 
      bool IsMeasureLocked(QString serialNumber);

      bool validateMeasureChange(ControlMeasure *m);



      ControlMeasure *createTemporaryGroundMeasure();





    private:
@@ -231,13 +232,12 @@ namespace Isis { 
      SerialNumberList *m_serialNumberList; //!< Serial number list for the loaded cubes

      QPointer<ControlNet> m_controlNet; //!< Current control net



//    QPointer<NewPointDialog> m_newPointDialog;

      QPointer<ControlPoint> m_newPoint; //!< New control point

      QString m_lastUsedPointId; //!< Point id of the last used control point



      QStringList m_pointFiles; //!< Associated files for current control point



      QString m_leftFile; //<! Filename of left measure

      QString m_leftFile; //!< Filename of left measure

      QPointer<ControlMeasure> m_leftMeasure; //!< Left control measure

      QPointer<ControlMeasure> m_rightMeasure; //!< Right control measure

      QScopedPointer<Cube> m_leftCube; //!< Left cube

isis/src/qisis/objs/ControlPointEditWidget/NewControlPointDialog.cpp

+53 −2
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


#include <algorithm>



#include <QComboBox>



#include <QHBoxLayout>

#include <QLabel>

#include <QLineEdit>
@@ -9,8 +11,10 @@ 
#include <QPushButton>

#include <QRadioButton>

#include <QString>

#include <QtDebug>



#include "ControlNet.h"

#include "ControlPoint.h"

#include "IString.h"

#include "SerialNumberList.h"
@@ -33,8 +37,8 @@ namespace Isis { 
   */

  NewControlPointDialog::NewControlPointDialog(ControlNet *controlNet,

                                               SerialNumberList *serialNumberList,

                                               QString defaultPointId, QWidget *parent)

                       : QDialog(parent) {

                                               QString defaultPointId,

                                               QWidget *parent) : QDialog(parent) {



    m_controlNet = controlNet;

    m_serialNumberList = serialNumberList;
@@ -54,6 +58,25 @@ namespace Isis { 
    connect(m_ptIdEdit, SIGNAL(textChanged(const QString &)),

            this, SLOT(enableOkButton(const QString &)));



    m_pointTypeCombo = new QComboBox;

    for (int i=0; i<ControlPoint::PointTypeCount; i++) {

      m_pointTypeCombo->insertItem(i, ControlPoint::PointTypeToString(

                                   (ControlPoint::PointType) i));

    }

    m_pointTypeCombo->setCurrentIndex(2);

    QHBoxLayout *pointTypeLayout = new QHBoxLayout;

    QLabel *pointTypeLabel = new QLabel("PointType:");

    pointTypeLayout->addWidget(pointTypeLabel);

    pointTypeLayout->addWidget(m_pointTypeCombo);

    connect(m_pointTypeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(pointTypeChanged(int)));



    m_groundSourceCombo = new QComboBox;

    QHBoxLayout *m_groundSourceLayout = new QHBoxLayout;

    QLabel *groundSourceLabel = new QLabel("Ground Source:");

    m_groundSourceLayout->addWidget(groundSourceLabel);

    m_groundSourceLayout->addWidget(m_groundSourceCombo);

    m_groundSourceCombo->setVisible(false);



    m_subpixelRegisterButton = new QRadioButton("Subpixel Register Measures");

    m_subpixelRegisterButton->setChecked(true);

    m_subpixelRegisterButton->setToolTip("Each measure will be subpixel registered to the reference"
@@ -84,6 +107,8 @@ namespace Isis { 


    QVBoxLayout *vLayout = new QVBoxLayout;

    vLayout->addLayout(ptIdLayout);

    vLayout->addLayout(pointTypeLayout);

    vLayout->addLayout(m_groundSourceLayout);

    vLayout->addWidget(m_subpixelRegisterButton);

    vLayout->addWidget(listLabel);

    vLayout->addWidget(m_fileList);
@@ -100,6 +125,11 @@ namespace Isis { 
  }





  int NewControlPointDialog::pointType() const {

    return m_pointTypeCombo->currentIndex();

  }





  QStringList NewControlPointDialog::selectedFiles() const {

    QStringList result;
@@ -116,6 +146,27 @@ namespace Isis { 
  }





  QString NewControlPointDialog::groundSource() const {

    return m_groundSourceCombo->currentText();

  }





  void NewControlPointDialog::pointTypeChanged(int pointType) {

    if (pointType == ControlPoint::Constrained || pointType == ControlPoint::Fixed) {

      m_groundSourceCombo->setVisible(true);

    }

  }





  void NewControlPointDialog::setGroundSource(QStringList groundFiles, int numberShapesWithPoint) {

    m_groundSourceCombo->addItems(groundFiles);

    for (int i = 0; i < numberShapesWithPoint; i++) {

      m_groundSourceCombo->setItemData(i, QColor(Qt::red), Qt::ForegroundRole);

    }

    m_groundSourceCombo->insertSeparator(numberShapesWithPoint);

  }





  /**

   * @internal

   *   @history 2010-06-03 Jeannie Walldren - Removed "std::"