-fixed bug in load image menu action

ImageDescriptionForm.cpp

@@ -1,82 +0,0 @@
-/*
- * ImageDescriptionForm.cpp
- *
- *  Created on: Oct 6, 2011
- *      Author: Gapchich Vlad
- */
-
-#include "ImageDescriptionForm.h"
-
-#include <QLineEdit>
-#include <QPushButton>
-#include <QBoxLayout>
-#include <QMessageBox>
-#include <QApplication>
-#include <QDesktopWidget>
-
-ImageDescriptionForm::ImageDescriptionForm(QWidget *aParent)
-	: QWidget(aParent)
-{
-	setWindowTitle(tr("Image Description"));
-
-	layout_v_ = new QVBoxLayout(this);
-	layout_h_ = new QHBoxLayout;
-
-	image_description_ = new QLineEdit(this);
-	button_ok_ = new QPushButton(this);
-	button_ok_->setText(tr("OK"));
-	button_cancel_ = new QPushButton(this);
-	button_cancel_->setText(tr("Cancel"));
-
-	layout_v_->addWidget(image_description_);
-	layout_v_->addLayout(layout_h_);
-
-	layout_h_->addWidget(button_ok_);
-	layout_h_->addWidget(button_cancel_);
-
-	connect(
-		button_ok_,
-		SIGNAL(clicked()),
-		this,
-		SLOT(setDescription())
-		);
-	connect(
-		button_cancel_,
-		SIGNAL(clicked()),
-		this,
-		SLOT(hide())
-		);
-
-	adjustSize();
-	move(QApplication::desktop()->screen()->rect().center() - rect().center());
-}
-
-ImageDescriptionForm::~ImageDescriptionForm()
-{
-	delete image_description_;
-	delete button_ok_;
-	delete button_cancel_;
-
-	delete layout_v_;
-}
-
-void
-ImageDescriptionForm::setDescription()
-{
-	if (!image_description_->text().isEmpty()) {
-		emit descriptionSet(image_description_->text());
-		hide();
-	}
-	else
-		QMessageBox::warning(
-			this,
-			tr("Warning!"),
-			tr("Image description is empty"),
-			QMessageBox::Ok,
-			QMessageBox::Cancel
-			);
-}
-
-/*
- *
- */

ImageDescriptionForm.h

@@ -1,43 +0,0 @@
-/*
- * ImageDescriptionForm.h
- *
- *  Created on: Oct 6, 2011
- *      Author: Gapchich Vlad
- */
-
-#ifndef __IMAGEDESCRIPTIONFORM_H__
-#define __IMAGEDESCRIPTIONFORM_H__
-
-#include <QWidget>
-
-class QLineEdit;
-class QPushButton;
-class QVBoxLayout;
-class QHBoxLayout;
-
-class ImageDescriptionForm : public QWidget{
-	Q_OBJECT
-public:
-	ImageDescriptionForm(QWidget *aParent = 0);
-	virtual ~ImageDescriptionForm();
-
-public slots:
-	void setDescription();
-
-signals:
-	void descriptionSet(QString aDescription);
-
-private:
-	QLineEdit *image_description_;
-	QPushButton *button_ok_;
-	QPushButton *button_cancel_;
-
-	QVBoxLayout *layout_v_;
-	QHBoxLayout *layout_h_;
-};
-
-#endif /* __IMAGEDESCRIPTIONFORM_H__ */
-
-/*
- *
- */

ImageLabeler.cpp

@@ -466,8 +466,8 @@ ImageLabeler::ImageLabeler(QWidget *aParent) :
 	connect(
 		action_add_description_,
 		SIGNAL(triggered()),
-		&image_description_form_,
-		SLOT(show())
+		&line_edit_form_,
+		SLOT(setDescription())
 		);
 	connect(
 		action_options_,
@@ -624,12 +624,12 @@ ImageLabeler::ImageLabeler(QWidget *aParent) :
 		this,
 		SLOT(onSelectionStarted())
 		);
-	connect(
-		&image_description_form_,
-		SIGNAL(descriptionSet(QString)),
-		this,
-		SLOT(setDescription(QString))
-		);
+//	connect(
+//		&image_description_form_,
+//		SIGNAL(descriptionSet(QString)),
+//		this,
+//		SLOT(setDescription(QString))
+//		);
 	connect(
 		image_holder_,
 		SIGNAL(imageScaled()),
@@ -1231,7 +1231,6 @@ ImageLabeler::getImagesFromDir(const QDir &dir)
 	QStringList ignoredFiles;
 
 	foreach (QString file, listImages) {
-		qDebug() << "file is: " << file;
 		if (ignoredFiles.contains(file) ||
 			file.contains("_segmented", Qt::CaseInsensitive) ||
 			file.contains(".dat", Qt::CaseInsensitive)) {
@@ -1820,8 +1819,6 @@ ImageLabeler::loadPascalFile()
 	clearAllTool();
 	clearLabelList();
 	if (loadPascalFile(filename)) {
-		qDebug() << list_bounding_box_.at(0)->label_ID_;
-		qDebug() << list_bounding_box_.size();
 		enableTools();
 		Image newImage;
 		newImage.image_ = current_image_;
@@ -1864,7 +1861,6 @@ ImageLabeler::loadPascalFile(QString aFilename)
 	QDomNode rootNode = elements.firstChild();
 	QString string;
 	QString path = getPathFromFilename(aFilename);
-	qDebug() << path;
 	QString filename;
 	QStringList labels;
 	labels << "BACKGROUND";
@@ -1962,7 +1958,6 @@ ImageLabeler::loadPascalFile(QString aFilename)
 								if (ok)
 									bottomRight.setY(qRound(ymax));
 							}
-							qDebug() << string;
 							if (string.isEmpty() || !ok)
 								break;
 
@@ -1986,7 +1981,6 @@ ImageLabeler::loadPascalFile(QString aFilename)
 		rootNode = rootNode.nextSibling();
 	}
 
-	qDebug() << path  + "/" + filename;
 	if (!image_->load(path + "/" + filename)) {
 		return false;
 		/* NOTREACHED */
@@ -2067,15 +2061,12 @@ ImageLabeler::loadPascalPolys(QString aFilename)
 	//for (int i = 0; i < data.length(); i++) {
 	int i = 0;
 	while (i < data.length()) {
-		qDebug() << data.at(i);
 		if (data.at(i) == ' ' && label.isEmpty() && !pointCount) {
 			label = QString(data.mid(lastSpace, i - lastSpace));
-			qDebug() << label;
 			lastSpace = i + 1;
 		}
 		else if (data.at(i) == ' ' && !label.isEmpty() && !pointCount) {
 			QString num = QString(data.mid(lastSpace, i - lastSpace));
-			qDebug() << num;
 			bool ok = 1;
 			pointCount = num.toInt(&ok, 10);
 			if (!ok) {
@@ -2093,7 +2084,6 @@ ImageLabeler::loadPascalPolys(QString aFilename)
 		{
 			evenFlag = 1;
 			QString num = QString(data.mid(lastSpace, i - lastSpace));
-			qDebug() << num;
 			bool ok = 1;
 			int coor = qRound(num.toDouble(&ok));
 			if (!ok) {
@@ -2111,7 +2101,6 @@ ImageLabeler::loadPascalPolys(QString aFilename)
 			evenFlag = 0;
 			pointCount--;
 			QString num = QString(data.mid(lastSpace, i - lastSpace));
-			qDebug() << num;
 			bool ok = 1;
 			int coor = qRound(num.toDouble(&ok));
 			if (!ok) {
@@ -2182,7 +2171,8 @@ ImageLabeler::loadImage()
 		/* NOTREACHED */
 	}
 
-	QDir dir(filename);
+	QString dirPath = getPathFromFilename(filename);
+	QDir dir(dirPath);
 	QStringList filter;
 	filter << "*.dat";
 	QStringList fileList = dir.entryList(filter, QDir::Files);
@@ -2192,6 +2182,11 @@ ImageLabeler::loadImage()
 	if (fileList.contains(labeled, Qt::CaseInsensitive)) {
 		labeled = dir.absoluteFilePath(labeled);
 		loadInfo(labeled);
+		Image *newImage = new Image;
+		newImage->image_ = filename;
+		newImage->labeled_ = 1;
+		newImage->pas_ = 0;
+		addImage(newImage);
 		return;
 		/* NOTREACHED */
 	}
@@ -2210,20 +2205,20 @@ ImageLabeler::loadImage()
 	image_holder_->resize(image_->size());
 	image_holder_->setPixmap(*image_);
 
-	if (!list_images_widget_->count()) {
-		return;
-		/* NOTREACHED */
-	}
-
 	current_image_ = filename;
 	image_ID_ = list_images_widget_->count() - 1;
 	list_images_widget_->setCurrentRow(image_ID_);
 
-	Image newImage;
-	newImage.image_ = filename;
-	newImage.labeled_ = 0;
-	newImage.pas_ = 0;
-	addImage(&newImage);
+	Image *newImage = new Image;
+	newImage->image_ = filename;
+	newImage->labeled_ = 0;
+	newImage->pas_ = 0;
+	addImage(newImage);
+
+	if (!list_images_widget_->count()) {
+		return;
+		/* NOTREACHED */
+	}
 
 	enableTools();
 }
@@ -2611,7 +2606,6 @@ ImageLabeler::BBoxFromData(
 	QString *aBBoxData
 )
 {
-	qDebug() << *aBBoxData;
 	BoundingBox bbox;
 	QString buffer;
 	bbox.rect.setRect(-1, -1, -1, -1);
@@ -3268,7 +3262,8 @@ void
 ImageLabeler::selectImage(QListWidgetItem *anItem)
 {
 	if (!anItem || list_images_widget_->row(anItem) < 0 ||
-		list_images_->isEmpty())  {
+		list_images_->isEmpty())
+	{
 		return;
 		/* NOTREACHED */
 	}

ImageLabeler.h

@@ -9,7 +9,7 @@
 #define __IMAGELABELER_H__
 
 #include "ImageHolder.h"
-#include "ImageDescriptionForm.h"
+#include "LineEditForm.h"
 #include "OptionsForm.h"
 
 #include <QMainWindow>
@@ -230,7 +230,7 @@ private:
 	QListWidget *list_label_;
 	QListWidget *list_areas_;
 	QListWidget *list_images_widget_;
-	ImageDescriptionForm image_description_form_;
+	LineEditForm line_edit_form_;
 	OptionsForm options_form_;
 
 	QPushButton *button_bound_box_tool_;

ImageLabeler.pro

@@ -3,13 +3,13 @@ TARGET = ImageLabeler
 QT += core \
     gui \
     xml
-HEADERS += OptionsForm.h \
-    ImageDescriptionForm.h \
+HEADERS += LineEditForm.h \
+    OptionsForm.h \
     functions.h \
     ImageHolder.h \
     ImageLabeler.h
-SOURCES += OptionsForm.cpp \
-    ImageDescriptionForm.cpp \
+SOURCES += LineEditForm.cpp \
+    OptionsForm.cpp \
     functions.cpp \
     ImageHolder.cpp \
     ImageLabeler.cpp \

Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ImageLabeler
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Di. Okt 18 10:14:46 2011
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Di. Okt 18 13:23:07 2011
 # Project:  ImageLabeler.pro
 # Template: app
 # Command: /usr/bin/qmake -unix CONFIG+=debug_and_release -o Makefile ImageLabeler.pro

Makefile.Debug

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ImageLabeler
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Di. Okt 18 10:14:46 2011
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Di. Okt 18 13:23:07 2011
 # Project:  ImageLabeler.pro
 # Template: app
 #############################################################################
@@ -42,23 +42,23 @@ OBJECTS_DIR   = debug/
 
 ####### Files
 
-SOURCES       = OptionsForm.cpp \
-		ImageDescriptionForm.cpp \
+SOURCES       = LineEditForm.cpp \
+		OptionsForm.cpp \
 		functions.cpp \
 		ImageHolder.cpp \
 		ImageLabeler.cpp \
-		main.cpp debug/moc_OptionsForm.cpp \
-		debug/moc_ImageDescriptionForm.cpp \
+		main.cpp debug/moc_LineEditForm.cpp \
+		debug/moc_OptionsForm.cpp \
 		debug/moc_ImageHolder.cpp \
 		debug/moc_ImageLabeler.cpp
-OBJECTS       = debug/OptionsForm.o \
-		debug/ImageDescriptionForm.o \
+OBJECTS       = debug/LineEditForm.o \
+		debug/OptionsForm.o \
 		debug/functions.o \
 		debug/ImageHolder.o \
 		debug/ImageLabeler.o \
 		debug/main.o \
+		debug/moc_LineEditForm.o \
 		debug/moc_OptionsForm.o \
-		debug/moc_ImageDescriptionForm.o \
 		debug/moc_ImageHolder.o \
 		debug/moc_ImageLabeler.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
@@ -119,7 +119,7 @@ qmake:  FORCE
 
 dist: 
 	@$(CHK_DIR_EXISTS) debug/ImageLabeler1.0.0 || $(MKDIR) debug/ImageLabeler1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) debug/ImageLabeler1.0.0/ && $(COPY_FILE) --parents OptionsForm.h ImageDescriptionForm.h functions.h ImageHolder.h ImageLabeler.h debug/ImageLabeler1.0.0/ && $(COPY_FILE) --parents OptionsForm.cpp ImageDescriptionForm.cpp functions.cpp ImageHolder.cpp ImageLabeler.cpp main.cpp debug/ImageLabeler1.0.0/ && (cd `dirname debug/ImageLabeler1.0.0` && $(TAR) ImageLabeler1.0.0.tar ImageLabeler1.0.0 && $(COMPRESS) ImageLabeler1.0.0.tar) && $(MOVE) `dirname debug/ImageLabeler1.0.0`/ImageLabeler1.0.0.tar.gz . && $(DEL_FILE) -r debug/ImageLabeler1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) debug/ImageLabeler1.0.0/ && $(COPY_FILE) --parents LineEditForm.h OptionsForm.h functions.h ImageHolder.h ImageLabeler.h debug/ImageLabeler1.0.0/ && $(COPY_FILE) --parents LineEditForm.cpp OptionsForm.cpp functions.cpp ImageHolder.cpp ImageLabeler.cpp main.cpp debug/ImageLabeler1.0.0/ && (cd `dirname debug/ImageLabeler1.0.0` && $(TAR) ImageLabeler1.0.0.tar ImageLabeler1.0.0 && $(COMPRESS) ImageLabeler1.0.0.tar) && $(MOVE) `dirname debug/ImageLabeler1.0.0`/ImageLabeler1.0.0.tar.gz . && $(DEL_FILE) -r debug/ImageLabeler1.0.0
 
 
 clean:compiler_clean 
@@ -140,20 +140,19 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: debug/moc_OptionsForm.cpp debug/moc_ImageDescriptionForm.cpp debug/moc_ImageHolder.cpp debug/moc_ImageLabeler.cpp
+compiler_moc_header_make_all: debug/moc_LineEditForm.cpp debug/moc_OptionsForm.cpp debug/moc_ImageHolder.cpp debug/moc_ImageLabeler.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) debug/moc_OptionsForm.cpp debug/moc_ImageDescriptionForm.cpp debug/moc_ImageHolder.cpp debug/moc_ImageLabeler.cpp
+	-$(DEL_FILE) debug/moc_LineEditForm.cpp debug/moc_OptionsForm.cpp debug/moc_ImageHolder.cpp debug/moc_ImageLabeler.cpp
+debug/moc_LineEditForm.cpp: LineEditForm.h
+	/usr/bin/moc $(DEFINES) $(INCPATH) LineEditForm.h -o debug/moc_LineEditForm.cpp
+
 debug/moc_OptionsForm.cpp: OptionsForm.h
 	/usr/bin/moc $(DEFINES) $(INCPATH) OptionsForm.h -o debug/moc_OptionsForm.cpp
 
-debug/moc_ImageDescriptionForm.cpp: ImageDescriptionForm.h
-	/usr/bin/moc $(DEFINES) $(INCPATH) ImageDescriptionForm.h -o debug/moc_ImageDescriptionForm.cpp
-
 debug/moc_ImageHolder.cpp: ImageHolder.h
 	/usr/bin/moc $(DEFINES) $(INCPATH) ImageHolder.h -o debug/moc_ImageHolder.cpp
 
 debug/moc_ImageLabeler.cpp: ImageHolder.h \
-		ImageDescriptionForm.h \
 		OptionsForm.h \
 		ImageLabeler.h
 	/usr/bin/moc $(DEFINES) $(INCPATH) ImageLabeler.h -o debug/moc_ImageLabeler.cpp
@@ -177,12 +176,12 @@ compiler_clean: compiler_moc_header_clean
 
 ####### Compile
 
+debug/LineEditForm.o: LineEditForm.cpp LineEditForm.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/LineEditForm.o LineEditForm.cpp
+
 debug/OptionsForm.o: OptionsForm.cpp OptionsForm.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/OptionsForm.o OptionsForm.cpp
 
-debug/ImageDescriptionForm.o: ImageDescriptionForm.cpp ImageDescriptionForm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ImageDescriptionForm.o ImageDescriptionForm.cpp
-
 debug/functions.o: functions.cpp functions.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/functions.o functions.cpp
 
@@ -192,23 +191,21 @@ debug/ImageHolder.o: ImageHolder.cpp ImageHolder.h \
 
 debug/ImageLabeler.o: ImageLabeler.cpp ImageLabeler.h \
 		ImageHolder.h \
-		ImageDescriptionForm.h \
 		OptionsForm.h \
 		functions.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ImageLabeler.o ImageLabeler.cpp
 
 debug/main.o: main.cpp ImageLabeler.h \
 		ImageHolder.h \
-		ImageDescriptionForm.h \
 		OptionsForm.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o main.cpp
 
+debug/moc_LineEditForm.o: debug/moc_LineEditForm.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_LineEditForm.o debug/moc_LineEditForm.cpp
+
 debug/moc_OptionsForm.o: debug/moc_OptionsForm.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_OptionsForm.o debug/moc_OptionsForm.cpp
 
-debug/moc_ImageDescriptionForm.o: debug/moc_ImageDescriptionForm.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ImageDescriptionForm.o debug/moc_ImageDescriptionForm.cpp
-
 debug/moc_ImageHolder.o: debug/moc_ImageHolder.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ImageHolder.o debug/moc_ImageHolder.cpp
 

Makefile.Release

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ImageLabeler
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Di. Okt 18 10:14:46 2011
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Di. Okt 18 13:23:07 2011
 # Project:  ImageLabeler.pro
 # Template: app
 #############################################################################
@@ -42,23 +42,23 @@ OBJECTS_DIR   = release/
 
 ####### Files
 
-SOURCES       = OptionsForm.cpp \
-		ImageDescriptionForm.cpp \
+SOURCES       = LineEditForm.cpp \
+		OptionsForm.cpp \
 		functions.cpp \
 		ImageHolder.cpp \
 		ImageLabeler.cpp \
-		main.cpp release/moc_OptionsForm.cpp \
-		release/moc_ImageDescriptionForm.cpp \
+		main.cpp release/moc_LineEditForm.cpp \
+		release/moc_OptionsForm.cpp \
 		release/moc_ImageHolder.cpp \
 		release/moc_ImageLabeler.cpp
-OBJECTS       = release/OptionsForm.o \
-		release/ImageDescriptionForm.o \
+OBJECTS       = release/LineEditForm.o \
+		release/OptionsForm.o \
 		release/functions.o \
 		release/ImageHolder.o \
 		release/ImageLabeler.o \
 		release/main.o \
+		release/moc_LineEditForm.o \
 		release/moc_OptionsForm.o \
-		release/moc_ImageDescriptionForm.o \
 		release/moc_ImageHolder.o \
 		release/moc_ImageLabeler.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
@@ -119,7 +119,7 @@ qmake:  FORCE
 
 dist: 
 	@$(CHK_DIR_EXISTS) release/ImageLabeler1.0.0 || $(MKDIR) release/ImageLabeler1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) release/ImageLabeler1.0.0/ && $(COPY_FILE) --parents OptionsForm.h ImageDescriptionForm.h functions.h ImageHolder.h ImageLabeler.h release/ImageLabeler1.0.0/ && $(COPY_FILE) --parents OptionsForm.cpp ImageDescriptionForm.cpp functions.cpp ImageHolder.cpp ImageLabeler.cpp main.cpp release/ImageLabeler1.0.0/ && (cd `dirname release/ImageLabeler1.0.0` && $(TAR) ImageLabeler1.0.0.tar ImageLabeler1.0.0 && $(COMPRESS) ImageLabeler1.0.0.tar) && $(MOVE) `dirname release/ImageLabeler1.0.0`/ImageLabeler1.0.0.tar.gz . && $(DEL_FILE) -r release/ImageLabeler1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) release/ImageLabeler1.0.0/ && $(COPY_FILE) --parents LineEditForm.h OptionsForm.h functions.h ImageHolder.h ImageLabeler.h release/ImageLabeler1.0.0/ && $(COPY_FILE) --parents LineEditForm.cpp OptionsForm.cpp functions.cpp ImageHolder.cpp ImageLabeler.cpp main.cpp release/ImageLabeler1.0.0/ && (cd `dirname release/ImageLabeler1.0.0` && $(TAR) ImageLabeler1.0.0.tar ImageLabeler1.0.0 && $(COMPRESS) ImageLabeler1.0.0.tar) && $(MOVE) `dirname release/ImageLabeler1.0.0`/ImageLabeler1.0.0.tar.gz . && $(DEL_FILE) -r release/ImageLabeler1.0.0
 
 
 clean:compiler_clean 
@@ -140,20 +140,19 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: release/moc_OptionsForm.cpp release/moc_ImageDescriptionForm.cpp release/moc_ImageHolder.cpp release/moc_ImageLabeler.cpp
+compiler_moc_header_make_all: release/moc_LineEditForm.cpp release/moc_OptionsForm.cpp release/moc_ImageHolder.cpp release/moc_ImageLabeler.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) release/moc_OptionsForm.cpp release/moc_ImageDescriptionForm.cpp release/moc_ImageHolder.cpp release/moc_ImageLabeler.cpp
+	-$(DEL_FILE) release/moc_LineEditForm.cpp release/moc_OptionsForm.cpp release/moc_ImageHolder.cpp release/moc_ImageLabeler.cpp
+release/moc_LineEditForm.cpp: LineEditForm.h
+	/usr/bin/moc $(DEFINES) $(INCPATH) LineEditForm.h -o release/moc_LineEditForm.cpp
+
 release/moc_OptionsForm.cpp: OptionsForm.h
 	/usr/bin/moc $(DEFINES) $(INCPATH) OptionsForm.h -o release/moc_OptionsForm.cpp
 
-release/moc_ImageDescriptionForm.cpp: ImageDescriptionForm.h
-	/usr/bin/moc $(DEFINES) $(INCPATH) ImageDescriptionForm.h -o release/moc_ImageDescriptionForm.cpp
-
 release/moc_ImageHolder.cpp: ImageHolder.h
 	/usr/bin/moc $(DEFINES) $(INCPATH) ImageHolder.h -o release/moc_ImageHolder.cpp
 
 release/moc_ImageLabeler.cpp: ImageHolder.h \
-		ImageDescriptionForm.h \
 		OptionsForm.h \
 		ImageLabeler.h
 	/usr/bin/moc $(DEFINES) $(INCPATH) ImageLabeler.h -o release/moc_ImageLabeler.cpp
@@ -177,12 +176,12 @@ compiler_clean: compiler_moc_header_clean
 
 ####### Compile
 
+release/LineEditForm.o: LineEditForm.cpp LineEditForm.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/LineEditForm.o LineEditForm.cpp
+
 release/OptionsForm.o: OptionsForm.cpp OptionsForm.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/OptionsForm.o OptionsForm.cpp
 
-release/ImageDescriptionForm.o: ImageDescriptionForm.cpp ImageDescriptionForm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ImageDescriptionForm.o ImageDescriptionForm.cpp
-
 release/functions.o: functions.cpp functions.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/functions.o functions.cpp
 
@@ -192,23 +191,21 @@ release/ImageHolder.o: ImageHolder.cpp ImageHolder.h \
 
 release/ImageLabeler.o: ImageLabeler.cpp ImageLabeler.h \
 		ImageHolder.h \
-		ImageDescriptionForm.h \
 		OptionsForm.h \
 		functions.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ImageLabeler.o ImageLabeler.cpp
 
 release/main.o: main.cpp ImageLabeler.h \
 		ImageHolder.h \
-		ImageDescriptionForm.h \
 		OptionsForm.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o main.cpp
 
+release/moc_LineEditForm.o: release/moc_LineEditForm.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_LineEditForm.o release/moc_LineEditForm.cpp
+
 release/moc_OptionsForm.o: release/moc_OptionsForm.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_OptionsForm.o release/moc_OptionsForm.cpp
 
-release/moc_ImageDescriptionForm.o: release/moc_ImageDescriptionForm.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ImageDescriptionForm.o release/moc_ImageDescriptionForm.cpp
-
 release/moc_ImageHolder.o: release/moc_ImageHolder.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ImageHolder.o release/moc_ImageHolder.cpp
 

functions.cpp

@@ -90,7 +90,7 @@ removePath(const QString &aFilename)
 	QString newFileName = aFilename;
 
 	int slashPos = newFileName.lastIndexOf('/');
-	newFileName.remove(0, slashPos);
+	newFileName.remove(0, slashPos + 1);
 
 	return newFileName;
 }