modify Image to create serial# and observation# on construction (a41c3432) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/Image/Image.cpp

+10 −6

Original line number	Diff line number	Diff line
		@@ -53,6 +53,11 @@ namespace Isis {

		m_fileName = imageFileName;

		m_observationNumber = ObservationNumber::Compose(*(cube()));
		m_serialNumber = SerialNumber::Compose(*(cube()));
		qDebug() << "ob# " << m_observationNumber;
		qDebug() << "sn# " << m_serialNumber;

		cube();

		initCamStats();
		@@ -88,6 +93,11 @@ namespace Isis {
		m_lineResolution = Null;
		m_sampleResolution = Null;

		m_observationNumber = ObservationNumber::Compose(*(cube()));
		m_serialNumber = SerialNumber::Compose(*(cube()));
		qDebug() << "ob# " << m_observationNumber;
		qDebug() << "sn# " << m_serialNumber;

		initCamStats();

		try {
		@@ -317,9 +327,6 @@ namespace Isis {
		* @return QString A string representation of the observation number of the cube.
		*/
		QString Image::observationNumber() {
		if (m_observationNumber.isEmpty()) {
		m_observationNumber = ObservationNumber::Compose(*(cube()));
		}
		return m_observationNumber;
		}

		@@ -329,9 +336,6 @@ namespace Isis {
		* @return @b QString A string representation of the serial number of the cube.
		*/
		QString Image::serialNumber() {
		if (m_serialNumber.isEmpty()) {
		m_serialNumber = SerialNumber::Compose(*(cube()));
		}
		return m_serialNumber;
		}