From b111c9996ad7d76483033fbc7eb5c3915d8324f2 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@620bd6b2-0a58-f614-fd9a-1bd335dccda9>
Date: Sat, 4 Feb 2012 22:38:28 +0000
Subject: [PATCH] Fixed parameter ranges when default=0

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@80 620bd6b2-0a58-f614-fd9a-1bd335dccda9
---
 src/MainWindow.cpp        |  5 ++++-
 src/MainWindow.h          |  2 +-
 src/ParametersToolBox.cpp | 10 +++++++++-
 src/qtipl.cpp             |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 50c74f86..51414fad 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -151,8 +151,9 @@ ParametersToolBox * MainWindow::parametersToolBox() const
 	return ui_->toolBox;
 }
 
-void MainWindow::loadObjects(const QString & dirPath)
+int MainWindow::loadObjects(const QString & dirPath)
 {
+	int loadedObjects = 0;
 	QDir dir(dirPath);
 	if(dir.exists())
 	{
@@ -166,7 +167,9 @@ void MainWindow::loadObjects(const QString & dirPath)
 		{
 			this->updateObjects();
 		}
+		loadedObjects = list.size();
 	}
+	return loadedObjects;
 }
 
 void MainWindow::saveObjects(const QString & dirPath)
diff --git a/src/MainWindow.h b/src/MainWindow.h
index b0b0e5d9..3e3e0aed 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -29,7 +29,7 @@ public:
 	MainWindow(Camera * camera = 0, QWidget * parent = 0);
 	virtual ~MainWindow();
 
-	void loadObjects(const QString & dirPath);
+	int loadObjects(const QString & dirPath);
 	void saveObjects(const QString & dirPath);
 
 	ParametersToolBox * parametersToolBox() const;
diff --git a/src/ParametersToolBox.cpp b/src/ParametersToolBox.cpp
index 53cedc17..53454a3b 100644
--- a/src/ParametersToolBox.cpp
+++ b/src/ParametersToolBox.cpp
@@ -212,10 +212,14 @@ void ParametersToolBox::addParameter(QVBoxLayout * layout,
 		widget->setDecimals(3);
 	}
 
-	if(def>0.0)
+	if(def>=0.0)
 	{
 		widget->setMaximum(def*1000000.0);
 	}
+	else if(def==0.0)
+	{
+		widget->setMaximum(1000000.0);
+	}
 	else if(def<0.0)
 	{
 		widget->setMinimum(def*1000000.0);
@@ -238,6 +242,10 @@ void ParametersToolBox::addParameter(QVBoxLayout * layout,
 	{
 		widget->setMaximum(def*1000000);
 	}
+	else if(def == 0)
+	{
+		widget->setMaximum(1000000);
+	}
 	else if(def<0)
 	{
 		widget->setMinimum(def*1000000);
diff --git a/src/qtipl.cpp b/src/qtipl.cpp
index 6f0b65f9..4419bea5 100644
--- a/src/qtipl.cpp
+++ b/src/qtipl.cpp
@@ -4,6 +4,7 @@
 
 #include "qtipl.h"
 #include <opencv2/core/core_c.h>
+#include <stdio.h>
 
 // TODO : support only from gray 8bits ?
 QImage Ipl2QImage(const IplImage *newImage)