Fix: Save photo description when adding photos

Consolidated AscentViewer::changeToPhoto(...) and AscentViewer::updatePhoto()

Closes #165

Author: svetter

src/viewer/ascent_viewer.cpp

@@ -378,25 +378,20 @@ void AscentViewer::setupPhotos()
 
 
 
-void AscentViewer::changeToPhoto(int photoIndex)
+void AscentViewer::changeToPhoto(int photoIndex, bool saveDescriptionFirst)
 {
-	savePhotoDescription();
+	if (saveDescriptionFirst) {
+		savePhotoDescription();
+	}
 
 	currentPhotoIndex = photoIndex;
-	updatePhoto();
-	updatePhotoButtonsEnabled();
-}
-
-void AscentViewer::updatePhoto()
-{
+	
 	photoDescriptionLabel	->setText(QString());
 	photoDescriptionLineEdit->setText(QString());
 	photoDescriptionLabel	->setVisible(false);
 	photoDescriptionLineEdit->setVisible(false);
 	imageLabel				->setToolTip(QString());
 
-	updatePhotoIndexLabel();
-	
 	if (currentPhotoIndex < 0 || photos.isEmpty()) {
 		imageLabel->clearImage();
 		return;
@@ -418,21 +413,23 @@ void AscentViewer::updatePhoto()
 		QMessageBox::StandardButton result = QMessageBox::warning(this, title, message, buttons);
 
 		if (result == QMessageBox::Yes) {
-			removeCurrentPhoto();
-			updatePhoto();
+			removeCurrentPhoto();	// calls changeToPhoto() back, recursing until valid image is found or all photos removed
 		}
-		return;
 	}
-	
-	image = newImage;
-	if (image.colorSpace().isValid()) image.convertToColorSpace(QColorSpace::SRgb);
-	imageLabel->setImage(image);
+	else {
+		image = newImage;
+		if (image.colorSpace().isValid()) image.convertToColorSpace(QColorSpace::SRgb);
+		imageLabel->setImage(image);
+	}
 
 	photoDescriptionLabel	->setText(photos.at(currentPhotoIndex).description);
 	photoDescriptionLineEdit->setText(photos.at(currentPhotoIndex).description);
 	photoDescriptionLabel	->setVisible(!photoDescriptionEditable);
 	photoDescriptionLineEdit->setVisible(photoDescriptionEditable);
 	imageLabel				->setToolTip(filepath);
+	
+	updatePhotoIndexLabel();
+	updatePhotoButtonsEnabled();
 }
 
 void AscentViewer::updatePhotoIndexLabel()
@@ -481,26 +478,25 @@ void AscentViewer::addPhotos()
 	QStringList filepaths = openFileDialogForPhotosSelection(this);
 	if (filepaths.isEmpty()) return;
 
+	savePhotoDescription();
+	
 	if (currentPhotoIndex < 0) currentPhotoIndex = -1;
 	currentPhotoIndex++;	// Set to index of first inserted photo
 	for (int i = 0; i < filepaths.size(); i++) {
 		photos.insert(currentPhotoIndex + i, Photo(currentAscentID, ItemID(), -1, filepaths.at(i), QString()));
 	}
-	
 	savePhotosList();
 
-	updatePhoto();
-	updatePhotoButtonsEnabled();
+	changeToPhoto(currentPhotoIndex);
 }
 
 void AscentViewer::removeCurrentPhoto()
 {
 	photos.removeAt(currentPhotoIndex);
 	savePhotosList();
 
-	if (currentPhotoIndex >= photos.size()) currentPhotoIndex = photos.size() - 1;
-	updatePhotoButtonsEnabled();
-	updatePhoto();
+	int newPhotoIndex = std::min(currentPhotoIndex, (int) photos.size() - 1);
+	changeToPhoto(newPhotoIndex);
 }
 
 void AscentViewer::savePhotoDescription()
@@ -589,22 +585,22 @@ void AscentViewer::handle_lastAscentOfPeak()
 
 void AscentViewer::handle_firstPhoto()
 {
-	changeToPhoto(0);
+	changeToPhoto(0, true);
 }
 
 void AscentViewer::handle_previousPhoto()
 {
-	changeToPhoto(currentPhotoIndex - 1);
+	changeToPhoto(currentPhotoIndex - 1, true);
 }
 
 void AscentViewer::handle_nextPhoto()
 {
-	changeToPhoto(currentPhotoIndex + 1);
+	changeToPhoto(currentPhotoIndex + 1, true);
 }
 
 void AscentViewer::handle_lastPhoto()
 {
-	changeToPhoto(photos.size() - 1);
+	changeToPhoto(photos.size() - 1, true);
 }
 
 

src/viewer/ascent_viewer.h

@@ -85,8 +85,7 @@ class AscentViewer : public QDialog, public Ui_AscentViewer {
 	void setupPhotos();
 
 	// Photo change
-	void changeToPhoto(int photoIndex);
-	void updatePhoto();
+	void changeToPhoto(int photoIndex, bool saveDescriptionFirst = false);
 	void updatePhotoIndexLabel();
 	void updatePhotoButtonsEnabled();