-fixed bug with the wrong filename in "save all info"

-fixed bug with no objects in file in "save all info"
-added current filename to the window title

ImageLabeler.cpp

@@ -1157,8 +1157,6 @@ ImageLabeler::nextImage()
 		/* NOTREACHED */
 	}
 
-
-
 	if (list_images_->end() == current_image_ + 1)
 		current_image_ = list_images_->begin();
 	else
@@ -1168,6 +1166,12 @@ ImageLabeler::nextImage()
 		return;
 		/* NOTREACHED */
 	}
+
+	QString winTitle;
+	winTitle.append("ImageLabeler - ");
+	winTitle.append(*current_image_);
+	setWindowTitle(winTitle);
+
 	image_->load(*current_image_);
 	image_holder_->resize(image_->size());
 	image_holder_->setPixmap(*image_);
@@ -1176,7 +1180,7 @@ ImageLabeler::nextImage()
 	list_areas_->clear();
 	image_holder_->clearAll();
 
-	setWindowTitle(tr("ImageLabeler"));
+	//setWindowTitle(tr("ImageLabeler"));
 }
 
 void
@@ -1196,6 +1200,12 @@ ImageLabeler::prevImage()
 		current_image_ = list_images_->end() - 1;
 	else
 		current_image_--;
+
+	QString winTitle;
+	winTitle.append("ImageLabeler - ");
+	winTitle.append(*current_image_);
+	setWindowTitle(winTitle);
+
 	image_->load(*current_image_);
 	image_holder_->resize(image_->size());
 	image_holder_->setPixmap(*image_);
@@ -1204,7 +1214,7 @@ ImageLabeler::prevImage()
 	list_areas_->clear();
 	image_holder_->clearAll();
 
-	setWindowTitle(tr("ImageLabeler"));
+	//setWindowTitle(tr("ImageLabeler"));
 }
 
 void
@@ -1234,7 +1244,7 @@ ImageLabeler::saveAllInfo()
 		root.appendChild(segmentedImage);
 
 		QDomText pathToSegmented = doc.createTextNode(segmented_image_);
-		image.appendChild(pathToSegmented);
+		segmentedImage.appendChild(pathToSegmented);
 	}
 
 	QDomElement description = doc.createElement(tr("description"));
@@ -1245,6 +1255,8 @@ ImageLabeler::saveAllInfo()
 
 	legendToXml(&doc, &root);
 
+	objectsToXml(&doc, &root);
+
 	setPureData();
 	QDomElement pureData = doc.createElement(tr("pure_data"));
 	QSize imageSize = image_->size();
@@ -1524,6 +1536,12 @@ ImageLabeler::loadInfo()
 				list_images_->append(string);
 				current_image_ = list_images_->end();
 				current_image_--;
+
+				QString winTitle;
+				winTitle.append("ImageLabeler - ");
+				winTitle.append(*current_image_);
+				setWindowTitle(winTitle);
+
 				image_->load(*current_image_);
 				image_holder_->resize(image_->size());
 				image_holder_->setPixmap(*image_);
@@ -1650,6 +1668,11 @@ ImageLabeler::loadImages()
 
 	current_image_ = list_images_->begin();
 
+	QString winTitle;
+	winTitle.append("ImageLabeler - ");
+	winTitle.append(*current_image_);
+	setWindowTitle(winTitle);
+
 	image_->load(*current_image_);
 	image_holder_->resize(image_->size());
 	image_holder_->setPixmap(*image_);

functions.cpp

@@ -79,7 +79,6 @@ QString alterFileName(const QString &aFilename, const QString &aSuffix)
 		newFileName.remove(dotPos, newFileName.size() - dotPos);
 
 	newFileName.insert(dotPos, aSuffix);
-	qDebug() << newFileName;
 
 	int slashPos = newFileName.lastIndexOf('/');
 	newFileName.remove(0, slashPos);