Fixed a few bugs for the PDW demo and commented out all references to... (be1de6a1) · Commits · aflab / astrogeology / ISIS3

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@ namespace Isis {
		BundleObservationViewWorkOrder::BundleObservationViewWorkOrder(Project *project) :
		WorkOrder(project) {
		m_isUndoable = false;
		QAction::setText(tr("View &Bundle Observation..."));
		QUndoCommand::setText(tr("View &Bundle Observation..."));
		QAction::setText(tr("&View..."));
		QUndoCommand::setText(tr("View..."));
		}

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

+31 −15

Original line number	Diff line number	Diff line
		@@ -443,9 +443,23 @@ namespace Isis {

		m_bundleObservationViews.append(result);

		result->setWindowTitle( tr("Bundle Observation View %1").
		QString str = fileItem->fileName();

		if (str.contains("residuals")) {
		result->setWindowTitle( tr("Measure Residuals").
		arg( m_bundleObservationViews.count() ) );
		result->setObjectName( result->windowTitle() );
		}
		else if (str.contains("points")) {
		result->setWindowTitle( tr("Control Points").
		arg( m_bundleObservationViews.count() ) );
		result->setObjectName( result->windowTitle() );
		}
		else if (str.contains("images")) {
		result->setWindowTitle( tr("Images").
		arg( m_bundleObservationViews.count() ) );
		result->setObjectName( result->windowTitle() );
		}

		emit newWidgetAvailable(result);

		@@ -687,14 +701,15 @@ namespace Isis {
		this, SLOT(cleanupControlPointEditViewWidget(QObject *)));
		emit newWidgetAvailable(result);


		m_chipViewports = new ChipViewportsWidget(result);
		// 2017-06-09 Ken commented out for Data Workshop demo
		// m_chipViewports = new ChipViewportsWidget(result);
		// connect(m_chipViewports, SIGNAL(destroyed(QObject *)), this, SLOT(cleanupchipViewportWidges()));
		m_chipViewports->setWindowTitle(tr("ChipViewport View"));
		m_chipViewports->setObjectName(m_chipViewports->windowTitle());
		m_chipViewports->setSerialNumberList(project()->activeImageList()->serialNumberList());
		m_chipViewports->setControlNet(activeControl->controlNet(), activeControl->fileName());
		emit newWidgetAvailable(m_chipViewports);
		// m_chipViewports->setWindowTitle(tr("ChipViewport View"));
		// m_chipViewports->setObjectName(m_chipViewports->windowTitle());
		// m_chipViewports->setSerialNumberList(project()->activeImageList()->serialNumberList());
		// m_chipViewports->setControlNet(activeControl->controlNet(), activeControl->fileName());
		// emit newWidgetAvailable(m_chipViewports);
		// 2017-06-09 Ken commented out for Data Workshop demo


		// Create connections between signals from control point edit view and equivalent directory
		@@ -950,10 +965,11 @@ namespace Isis {
		}
		// For now delete the ChipViewportsWidget also, which must be done first since it is a child
		// of ControlPointEditView
		delete m_chipViewports;
		qDebug()<<"Directory::cleanupControlPointEditViewWidget m_controlPointEditViewWidget = "<<m_controlPointEditViewWidget;
		delete m_controlPointEditViewWidget;

		// delete m_chipViewports;
		// qDebug()<<"Directory::cleanupControlPointEditViewWidget m_controlPointEditViewWidget = "<<m_controlPointEditViewWidget;
		// if (m_controlPointEditViewWidget) {
		// delete m_controlPointEditViewWidget;
		// }
		}


		@@ -1129,12 +1145,12 @@ namespace Isis {
		return m_controlPointEditViewWidget;
		}


		/*
		ChipViewportsWidget *Directory::controlPointChipViewports() {

		return m_chipViewports;
		}

		*/

		/**
		* @brief Gets the ControlNetEditor associated with this the Directory.
		@@ -1492,7 +1508,7 @@ namespace Isis {
		addControlPointEditView();
		}
		controlPointEditView()->controlPointEditWidget()->setEditPoint(controlPoint, serialNumber);
		controlPointChipViewports()->setPoint(controlPoint);
		// controlPointChipViewports()->setPoint(controlPoint);
		}

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -134,6 +134,9 @@ namespace Isis {
		* @history 2017-05-18 Tracie Sucharski - Added serialNumber to the modifyControlPoint slot.
		* @history 2017-05-23 Tracie Sucharski - Fixed all of the cleanup methods to properly remove
		* the correct view/widget from the lists.
		* @history 2017-06-14 Ken Edmundson - Commented out ChipViewport widget code. This will be
		* temporary until the widget is fully developed.

		*/
		class Directory : public QObject {
		Q_OBJECT
		@@ -184,7 +187,7 @@ namespace Isis {
		QList<ImageFileListWidget *> imageFileListViews();
		QList<QProgressBar *> progressBars();
		ControlPointEditView *controlPointEditView();
		ChipViewportsWidget *controlPointChipViewports();
		// ChipViewportsWidget *controlPointChipViewports();



		@@ -335,7 +338,7 @@ namespace Isis {
		QList< QPointer<ImageFileListWidget> > m_fileListWidgets; //!< List of ImageFileListWidgets
		QList< QPointer<Footprint2DView> > m_footprint2DViewWidgets; //!< List of Footprint2DView objs
		QPointer <ControlPointEditView> m_controlPointEditViewWidget;
		QPointer <ChipViewportsWidget> m_chipViewports;
		//QPointer <ChipViewportsWidget> m_chipViewports;
		QList< QPointer<MatrixSceneWidget> > m_matrixViewWidgets; //!< List of MatrixSceneWidgets
		QList< QPointer<SensorInfoWidget> > m_sensorInfoWidgets; //!< List of SensorInfoWidgets
		QList< QPointer<TargetInfoWidget> > m_targetInfoWidgets; //!< List of TargetInfoWidgets

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -344,6 +344,10 @@ namespace Isis {
		m_bundleSolutionInfo->outputResiduals();
		m_bundleSolutionInfo->outputImagesCSV();
		m_bundleSolutionInfo->outputPointsCSV();

		// Write text summary file
		m_bundleSolutionInfo->outputText();

		m_project->addBundleSolutionInfo( new BundleSolutionInfo(*m_bundleSolutionInfo) );

		// create output control net

isis/src/qisis/objs/JigsawDialog/JigsawDialog.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ namespace Isis {
		* @history 2017-05-16 Tracie Sucharski - Disable Close button if jigsaw has been run, force
		* selection of accept or reject. Once a choice has been made,
		* re-enable the Close button.
		* @history 2017-06-14 Ken Edmundson - Write text summary file.
		*/
		class JigsawDialog : public QDialog {
		Q_OBJECT