Fixed text color and valid measure counting in control net monitor. (7e806bd8) · Commits · aflab / astrogeology / ISIS3

isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp

+78 −53

Original line number	Diff line number	Diff line
		@@ -310,33 +310,10 @@ namespace Isis {
		*/
		void ControlNetVitals::addMeasure(ControlMeasure *measure) {
		emitHistoryEntry("Control Measure Added", measure->GetCubeSerialNumber(), "", "");
		m_numMeasures++;


		ControlPoint *point = measure->Parent();
		if (point) {
		// By this time, the measure has been added to its parent point, so the
		// old count is the current count minus one.
		int numValidMeasures = point->GetNumValidMeasures();
		if ( --m_pointMeasureCounts[numValidMeasures - 1] < 1 ) {
		m_pointMeasureCounts.remove(numValidMeasures - 1);
		}
		if ( !m_pointMeasureCounts.contains(numValidMeasures) ) {
		m_pointMeasureCounts.insert(numValidMeasures, 1);
		}
		else {
		m_pointMeasureCounts[numValidMeasures]++;
		}
		}
		m_numMeasures++;

		QString serial = measure->GetCubeSerialNumber();
		int numValidMeasures = m_controlNet->GetNumberOfValidMeasuresInImage(serial);
		if ( !m_imageMeasureCounts.contains(numValidMeasures) ) {
		m_imageMeasureCounts.insert(numValidMeasures, 1);
		}
		else {
		m_imageMeasureCounts[numValidMeasures]++;
		}
		addMeasureToCounts(measure);

		validate();
		}
		@@ -367,10 +344,10 @@ namespace Isis {
		historyEntry = "Measure Ignored Modified";

		if ( !oldValue.toBool() && newValue.toBool() ) {
		return addMeasure(measure);
		return removeMeasureFromCounts(measure);
		}
		else if ( oldValue.toBool() && !newValue.toBool() ) {
		return deleteMeasure(measure);
		return addMeasureToCounts(measure);
		}
		break;

		@@ -379,7 +356,7 @@ namespace Isis {
		break;
		}

		emitHistoryEntry(historyEntry, measure->GetCubeSerialNumber(), "", "");
		ControlNetVitals::emitHistoryEntry(historyEntry, measure->GetCubeSerialNumber(), "", "");
		validate();
		}

		@@ -397,8 +374,57 @@ namespace Isis {
		void ControlNetVitals::deleteMeasure(ControlMeasure *measure) {

		emitHistoryEntry("Control Measure Deleted", measure->GetCubeSerialNumber(), "", "");

		m_numMeasures--;

		removeMeasureFromCounts(measure);

		validate();
		}


		/**
		* Add a measure to the internal counters
		*
		* @param measure The measure to add
		*/
		void ControlNetVitals::addMeasureToCounts(ControlMeasure *measure) {
		ControlPoint *point = measure->Parent();
		if (point) {
		// By this time, the measure has been added to its parent point, so the
		// old count is the current count minus one.
		int numValidMeasures = point->GetNumValidMeasures();
		if ( --m_pointMeasureCounts[numValidMeasures] < 1 ) {
		m_pointMeasureCounts.remove(numValidMeasures);
		}
		if ( !m_pointMeasureCounts.contains(numValidMeasures + 1) ) {
		m_pointMeasureCounts.insert(numValidMeasures + 1, 1);
		}
		else {
		m_pointMeasureCounts[numValidMeasures + 1]++;
		}
		}

		QString serial = measure->GetCubeSerialNumber();
		int numValidMeasures = m_controlNet->GetNumberOfValidMeasuresInImage(serial);
		if ( --m_imageMeasureCounts[numValidMeasures - 1] < 1 ) {
		m_imageMeasureCounts.remove(numValidMeasures);
		}
		if ( !m_imageMeasureCounts.contains(numValidMeasures) ) {
		m_imageMeasureCounts.insert(numValidMeasures, 1);
		}
		else {
		m_imageMeasureCounts[numValidMeasures]++;
		}
		}


		/**
		* Remove a measure from the internal counters
		*
		* @param measure The measure to remove
		*/
		void ControlNetVitals::removeMeasureFromCounts(ControlMeasure *measure) {
		ControlPoint *point = measure->Parent();
		if (point) {
		// By this time, the measure is still a valid measure in the parent control point.
		@@ -418,8 +444,8 @@ namespace Isis {
		QString serial = measure->GetCubeSerialNumber();
		int numValidMeasures = m_controlNet->GetNumberOfValidMeasuresInImage(serial);

		if ( --m_pointMeasureCounts[numValidMeasures] < 1 ) {
		m_pointMeasureCounts.remove(numValidMeasures);
		if ( --m_imageMeasureCounts[numValidMeasures] < 1 ) {
		m_imageMeasureCounts.remove(numValidMeasures);
		}

		if ( !m_imageMeasureCounts.contains(numValidMeasures - 1) ) {
		@@ -428,7 +454,6 @@ namespace Isis {
		else {
		m_imageMeasureCounts[numValidMeasures - 1]++;
		}
		validate();
		}

isis/src/control/objs/ControlNetVitals/ControlNetVitals.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,12 @@ namespace Isis {


		private:
		void addMeasureToCounts(ControlMeasure *measure);
		void removeMeasureFromCounts(ControlMeasure *measure);
		// TESTING JAM
		QString countersToString();
		// TESTING JAM

		//! The Control Network that the vitals class is observing.
		ControlNet *m_controlNet;

isis/src/control/objs/ControlPoint/ControlPoint.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -285,6 +285,15 @@ namespace Isis {
		ValidateMeasure(serialNumber);
		ControlMeasure cm = (measures)[serialNumber];

		// notify parent network of the change
		if (parentNetwork) {
		parentNetwork->measureDeleted(cm);

		if (!IsIgnored() && !cm->IsIgnored()) {
		parentNetwork->emitNetworkStructureModified();
		}
		}

		if (cm->IsEditLocked()) {
		return ControlMeasure::MeasureLocked;
		}
		@@ -304,15 +313,6 @@ namespace Isis {
		referenceMeasure = NULL;
		}

		// notify parent network of the change
		if (parentNetwork) {
		parentNetwork->measureDeleted(cm);

		if (!IsIgnored() && !cm->IsIgnored()) {
		parentNetwork->emitNetworkStructureModified();
		}
		}

		delete cm;
		cm = NULL;

isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -485,7 +485,7 @@ namespace Isis {
		m_pointsFreeProgressbar = new QProgressBar();
		QPalette p = m_pointsFreeProgressbar->palette();
		p.setColor(QPalette::Highlight, Qt::blue);
		p.setColor(QPalette::Text, Qt::white);
		p.setColor(QPalette::Text, Qt::black);
		m_pointsFreeProgressbar->setPalette(p);
		m_pointsFreeProgressbar->setRange(0, 100);