kimageprocess-devel — General development discussion

[kimageprocess-devel] kimageprocess/res2pgm - New directory

[Herton R. K. <he...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/res2pgm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3291/res2pgm

Log Message:
Directory /cvsroot/kimageprocess/kimageprocess/res2pgm added to the repository

[kimageprocess-devel] kimageprocess/src/libkimageprocess Makefile.am ktcalculation.cpp ktcalculation.h ktclassifbackend.cpp ktclassifbackend.h ktmethod.cpp ktmethod.h ktpatternmanager.cpp ktpatternmanager.h ktplugin.h ktpluginmanager.cpp ktpluginmanager.h ktproject.cpp

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32338/src/libkimageprocess

Modified Files:
	Makefile.am ktcalculation.cpp ktcalculation.h 
	ktclassifbackend.cpp ktclassifbackend.h ktmethod.cpp 
	ktmethod.h ktpatternmanager.cpp ktpatternmanager.h ktplugin.h 
	ktpluginmanager.cpp ktpluginmanager.h ktproject.cpp 
Log Message:

All calculation (features extraction, normalization, etc) are now done in 
KTCalculation which provides us a better way to add new classifiers


Index: ktproject.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktproject.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ktproject.cpp	23 Jun 2005 18:33:51 -0000	1.14
+++ ktproject.cpp	23 Jun 2005 23:19:41 -0000	1.15
@@ -32,6 +32,7 @@
 #include <qfile.h>
 
 #include "ktpatternmanager.h"
+#include "ktcalculation.h"
 
 KTProject::KTProject(QObject *parent, const char *name)
  : QObject(parent, name)/*,
@@ -210,14 +211,14 @@
     window_size temp;
     QDomElement option;
         option = m_doc.createElement("windowType");
-        option.setAttribute("value", QString::number(KTImageManager::self()->windowType(), 10));
+        option.setAttribute("value", QString::number(KTCalculation::self()->windowType(), 10));
         options.appendChild(option);
         
         option = m_doc.createElement("numberIterations");
-        option.setAttribute("value", QString::number(KTImageManager::self()->numberIterations(), 10));
+        option.setAttribute("value", QString::number(KTCalculation::self()->numberIterations(), 10));
         options.appendChild(option);
         
-        temp = KTImageManager::self()->windowSize();
+        temp = KTCalculation::self()->windowSize();
         option = m_doc.createElement("windowSize");
         option.setAttribute("type", temp.type?"true":"false");
         option.setAttribute("x", QString::number(temp.width, 10));
@@ -291,11 +292,11 @@
         QDomElement option = options.item(i).toElement();
         
         if (option.nodeName() == "windowType")
-            KTImageManager::self()->setWindowType(option.attribute("value").toInt(&ok, 10));
+            KTCalculation::self()->setWindowType(option.attribute("value").toInt(&ok, 10));
         else if (option.nodeName() == "numberIterations")
-            KTImageManager::self()->setNumberIterations(option.attribute("value").toInt(&ok, 10));
+            KTCalculation::self()->setNumberIterations(option.attribute("value").toInt(&ok, 10));
         else if (option.nodeName() == "windowSize")
-            KTImageManager::self()->setWindowSize((option.attribute("type","true")=="true")? true : false,
+            KTCalculation::self()->setWindowSize((option.attribute("type","true")=="true")? true : false,
                                               option.attribute("x").toInt(&ok, 10),
                                               option.attribute("y").toInt(&ok, 10));
     }

Index: ktcalculation.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ktcalculation.h	23 Jun 2005 19:39:00 -0000	1.2
+++ ktcalculation.h	23 Jun 2005 23:19:41 -0000	1.3
@@ -22,6 +22,30 @@
 #define KTCALCULATION_H
 
 #include <qobject.h>
+#include <qvaluevector.h>
+
+class KTImage;
+class KTMethod;
+
+
+// texture window types
+#define WIN_SEQ  0 // windows are gathered in sequential iterations
+#define WIN_CASC 1 // windows are gathered in sequential cascated iterations
+#define WIN_RAND 2 // windows are gathered in random iterations
+#define WIN_ALLPIX 3 //windows are generated for all pixels from the image
+
+typedef struct 
+{
+    bool type;
+    int height;
+    int width;
+} window_size;
+
+typedef struct
+{
+    float *inputs;
+    int sampleClass;
+} dataEntry;
 
 /**
 A class that actually does the calculation for the images at all
@@ -37,18 +61,53 @@
 
     static KTCalculation *self();
     
+    /* functions to handle texture options */
+    void setWindowType(int type) { m_window_type = type; }
+    int windowType() { return m_window_type; }
+    
+    void setNumberIterations(int number) { m_iterations = number; }
+    int numberIterations() { return m_iterations; }
+    
+    void setWindowSize(bool type, int height, int width);
+    window_size windowSize();
+
+    void parseResults(const QValueList<float> &results);
+    void parseSampleResults(const QValueList<float> &results, int sampleClass);
+
 public slots:
     void calculateSampleData();
 
     void calculateTestData();
     
+
 signals:
     void updateProgress();
     void finished();
     
 private:
-    static KTCalculation *s_self;
+    /**
+     * generate and write results for the current window settings
+     * @param img the image from which we are going to calculate the patterns
+     * @param imgClass the class number of the image used to generate the patterns
+     */
+    void generateWindowResults(KTImage *img, int imgClass);
+
+    int m_inputs;
+    int m_outputs;
+    bool m_first;
+    bool m_testing;
+    QValueList<dataEntry> m_data;
+    QValueVector<float> m_min;
+    QValueVector<float> m_max;
 
+    /* texture window settings */
+    int m_window_type;
+    int m_iterations;
+    window_size m_window_size;
+
+    KTMethod *m_method;
+
+    static KTCalculation *s_self;
 
 };
 

Index: ktpatternmanager.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpatternmanager.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ktpatternmanager.h	23 Jun 2005 18:33:51 -0000	1.14
+++ ktpatternmanager.h	23 Jun 2005 23:19:41 -0000	1.15
@@ -27,11 +27,6 @@
 
 #include <kurl.h>
 
-// texture window types
-#define WIN_SEQ  0 // windows are gathered in sequential iterations
-#define WIN_CASC 1 // windows are gathered in sequential cascated iterations
-#define WIN_RAND 2 // windows are gathered in random iterations
-#define WIN_ALLPIX 3 //windows are generated for all pixels from the image
 
 class KAction;
 class KTImage;
@@ -39,12 +34,6 @@
 
 
 typedef QPtrList<KTImage> KTImageList;
-typedef struct 
-{
-    bool type;
-    int height;
-    int width;
-} window_size;
 
 /**
  * This class manages all the opened pattern images.
@@ -124,38 +113,21 @@
 
     /** the name of the active features */
     QStringList activeFeatureNames();
-        
-    /* functions to handle texture options */
-    void setWindowType(int type) { m_window_type = type; }
-    int windowType() { return m_window_type; }
-    
-    void setNumberIterations(int number) { m_iterations = number; }
-    int numberIterations() { return m_iterations; }
-    
-    void setWindowSize(bool type, int height, int width);
-    window_size windowSize();
-    
+            
     void clear();
     
     static KTImageManager *self();
+
+    KTImageList sampleImages() { return m_sampleImages; } 
+    KTImageList testingImages() { return m_testingImages; }
+        
 private:
-    /**
-     * generate and write results for the current window settings
-     * @param img the image from which we are going to calculate the patterns
-     * @param imgClass the class number of the image used to generate the patterns
-     * @param backend the classification backend to be used
-     */
-    void generateWindowResults(KTImage *img, int imgClass, KTClassifBackend *backend = 0);
-    
+        
     /** The list of loaded samples */
     KTImageList m_sampleImages;
     KTImageList m_testingImages;
     
-    /* texture window settings */
-    int m_window_type;
-    int m_iterations;
-    window_size m_window_size;
-    
+        
     KAction *m_generatePatAction;
     
     static KTImageManager *s_self;

Index: ktpatternmanager.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpatternmanager.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ktpatternmanager.cpp	23 Jun 2005 18:33:51 -0000	1.31
+++ ktpatternmanager.cpp	23 Jun 2005 23:19:41 -0000	1.32
@@ -45,12 +45,6 @@
     
     m_testingData = false;
 
-    //Set defaults
-    m_window_type = WIN_SEQ;
-    m_window_size.type = true; //window, not the whole image
-    m_window_size.width = 5;
-    m_window_size.height = 5;
-    m_iterations = 0;
 }
 
 KTImageManager::~KTImageManager()
@@ -157,191 +151,6 @@
     return names;
 }
 
-void KTImageManager::calculateSampleData(KTImage *img, KTClassifBackend *backend)
-{
-    if (img)
-    {
-        int imgClass=1;
-        
-        if (!m_testingData)
-        {
-            KTImage *it;
-            for ( it = m_sampleImages.first(); it; it = m_sampleImages.next())
-                if (it == img)
-                    break;
-                else
-                    imgClass++;
-        }
-        generateWindowResults(img, imgClass, backend);
-    }
-    else
-    {
-        int imgClass=1;
-        KTImage *it;
-        for ( it = m_sampleImages.first(); it; it = m_sampleImages.next())
-        {
-            generateWindowResults(it, imgClass, backend);
-            imgClass++;
-        }
-    }
-}
-
-void KTImageManager::generateWindowResults(KTImage *img, int imgClass, KTClassifBackend *backend)
-{
-    int i, x, y, width, height, acumm;
-    KTImage *tmpimg;
-    
-    KTMethod *m_method = KTMethodManager::self()->activeMethod();
-    if (!m_window_size.type) 
-    {
-        m_method->calculate(img, backend, imgClass);
-    }
-    else 
-    {
-        switch(m_window_type) 
-        {
-            case WIN_SEQ:
-                x = y = i = 0;
-                width = img->width();
-                height = img->height();
-                
-                while ( (x + m_window_size.width <= width) && (y + m_window_size.height <= height) &&
-                        (i < m_iterations || m_iterations == 0) )
-                {
-                    tmpimg = img->returnWindow(x, y, m_window_size.width, m_window_size.height);
-                    m_method->calculate(tmpimg, backend, imgClass);
-                    delete tmpimg;
-                    ++i;
-                    ++x;
-                    if (x + m_window_size.width > width)
-                    {
-                        x = 0;
-                        ++y;
-                    }
-                }
-                break;
-            case WIN_CASC:
-                x = y = i = acumm = 0;
-                width = img->width();
-                height = img->height();
-                
-                while ( (x + m_window_size.width <= width) && (y + m_window_size.height <= height) && 
-                         (i < m_iterations || m_iterations == 0) )
-                {
-                    tmpimg = img->returnWindow(x, y, m_window_size.width, m_window_size.height);
-                    m_method->calculate(tmpimg, backend, imgClass);
-                    delete tmpimg;
-                    ++i;
-                    x += m_window_size.width;
-                    if (x + m_window_size.width > width)
-                    {
-                        x = ++acumm;
-                        acumm = acumm % m_window_size.width;
-                        y += m_window_size.height;
-                    }
-                }
-                break;
-            case WIN_RAND:
-                i = 0;
-                width = img->width();
-                height = img->height();
-                
-                srand((unsigned) time(NULL));
-                
-                while (i < m_iterations) 
-                {
-                    x = rand() % (width - m_window_size.width);
-                    y = rand() % (height - m_window_size.height);
-                    tmpimg = img->returnWindow(x, y, m_window_size.width, m_window_size.height);
-                    m_method->calculate(tmpimg, backend, imgClass);
-                    delete tmpimg;
-                    i++;
-                }
-                break;
-            case WIN_ALLPIX:
-                int cols_right, cols_left, rows_below, rows_above;
-                
-                // Calculate the outer borders of the image, because we're using centered windows
-                // (The window cross image boundaries)
-                cols_right = m_window_size.width / 2;
-                rows_below = m_window_size.height / 2;
-                if (m_window_size.width % 2 == 0)
-                    cols_left = cols_right;
-                else
-                    cols_left = cols_right + 1;
-                if (m_window_size.height % 2 == 0)
-                    rows_above = rows_below;
-                else
-                    rows_above = rows_below + 1;
-                
-                // Generate the pattern for Testing Image
-                int width = img->width();
-                int height = img->height();
-                for (y = 0; y < height; y++)
-                {
-                    kdDebug() << "x = 0 y = " << y << endl;
-                    for (x = 0; x < width; x++)
-                    {
-                        int startx, starty;
-                        
-                        //handling windows that are partly or fully outside the image
-                        
-                        //the x side
-                        if ( x - cols_left < 0 )
-                            startx = 0;
-                        else if ( x + cols_right >= width )
-                            startx = width - m_window_size.width - 1;
-                        else
-                            startx = x - cols_left;
-                        
-                        //the y side
-                        if ( y - rows_above < 0 )
-                            starty = 0;
-                        else if ( y + rows_below >= height )
-                            starty = height - m_window_size.height - 1;
-                        else
-                            starty = y - rows_above;
-                        
-                        tmpimg = img->returnWindow(startx, starty, m_window_size.width, m_window_size.height);
-                        m_method->calculate(tmpimg, backend, imgClass);
-                        delete tmpimg;
-                    }
-                }
-                break;
-        }
-    }
-}
-
-void KTImageManager::calculateTestData(KTImage *img, KTClassifBackend *backend)
-{
-    int wt = m_window_type;
-    m_window_type = WIN_ALLPIX;
-    
-    m_testingData = true;
-    KTMethodManager::self()->activeMethod()->setTestingData(true);
-    
-    if (img == 0)
-        img = m_testingImages.first();
-    
-    calculateSampleData(img, backend);
-    
-    m_testingData = false;
-    KTMethodManager::self()->activeMethod()->setTestingData(false);
-    m_window_type = wt;
-}
-
-void KTImageManager::setWindowSize(bool type, int height, int width)
-{
-    m_window_size.type = type;
-    m_window_size.height = height;
-    m_window_size.width = width;
-}
-
-window_size KTImageManager::windowSize()
-{
-    return m_window_size;
-}
-
 KTImage *KTImageManager::testingImage()
 {
     return m_testingImages.first();

Index: ktplugin.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktplugin.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ktplugin.h	23 Jun 2005 18:33:51 -0000	1.5
+++ ktplugin.h	23 Jun 2005 23:19:41 -0000	1.6
@@ -40,6 +40,7 @@
 
     virtual ~KTPlugin();
     virtual void setupPlugin();
+
 };
 
 #endif

Index: ktclassifbackend.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktclassifbackend.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ktclassifbackend.cpp	23 Jun 2005 18:33:50 -0000	1.5
+++ ktclassifbackend.cpp	23 Jun 2005 23:19:41 -0000	1.6
@@ -19,9 +19,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "ktclassifbackend.h"
+#include <ktcalculation.h>
 
 KTClassifBackend::KTClassifBackend(QObject *parent, const char *name)
- : KTPlugin(parent, name)
+ : QObject(parent, name)
 {
 }
 
@@ -29,15 +30,23 @@
 {
 }
 
-void KTClassifBackend::parseResults(const QValueList<float> &results)
+void KTClassifBackend::doTraining(const QValueList<dataEntry>& data, int inputs, int outputs)
 {
-    Q_UNUSED(results);
+    Q_UNUSED(data);
+    Q_UNUSED(inputs);
+    Q_UNUSED(outputs);
 }
 
-void KTClassifBackend::parseSampleResults(const QValueList<float> &results, int sampleClass)
+void KTClassifBackend::doClassify(const QValueList<dataEntry>& data, int inputs, int outputs)
 {
-    Q_UNUSED(results);
-    Q_UNUSED(sampleClass);
+    Q_UNUSED(data);
+    Q_UNUSED(inputs);
+    Q_UNUSED(outputs);        
+}
+
+QString KTClassifBackend::classifierName()
+{
+    return "unnamed";
 }
 
 #include "ktclassifbackend.moc"

Index: Makefile.am
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	23 Jun 2005 18:33:49 -0000	1.6
+++ Makefile.am	23 Jun 2005 23:19:41 -0000	1.7
@@ -3,7 +3,7 @@
 libkimageprocess_la_LDFLAGS = $(all_libraries)
 libkimageprocess_la_SOURCES = ktimage.cpp ktpatternmanager.cpp ktplugin.cpp \
 				ktpluginmanager.cpp ktproject.cpp ktclassifbackend.cpp ktfeature.cpp ktfeature.h \
-			ktfeaturemanager.cpp ktfeaturemanager.h ktmethod.cpp ktmethodmanager.cpp ktcalculation.cpp
+				ktfeaturemanager.cpp ktfeaturemanager.h ktmethod.cpp ktmethodmanager.cpp ktcalculation.cpp
 
 noinst_HEADERS = ktimage.h ktpatternmanager.h ktplugin.h ktpluginmanager.h \
 		ktproject.h ktclassifbackend.h ktcalculation.h

Index: ktpluginmanager.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpluginmanager.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ktpluginmanager.h	23 Jun 2005 18:33:51 -0000	1.3
+++ ktpluginmanager.h	23 Jun 2005 23:19:41 -0000	1.4
@@ -22,12 +22,17 @@
 #define KTPLUGINMANAGER_H
 
 #include <qobject.h>
-#include <qptrlist.h>
+#include <qdict.h>
 
 class KTPlugin;
 //class KMainWindow;
 class KTImageManager;
 
+
+#include "ktclassifbackend.h"
+
+typedef QDict<KTClassifBackend> BackendList;
+
 /**
 A class to manage KImageProcess plugins
 
@@ -47,9 +52,10 @@
     
     static KTPluginManager *self();
     
+    KTClassifBackend *classifier();
 private:
     //KMainWindow *m_window;
-    QPtrList<KTPlugin> m_pluginList;  
+    BackendList m_backends;
     static KTPluginManager *s_self;
 };
 

Index: ktmethod.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ktmethod.h	23 Jun 2005 18:33:51 -0000	1.8
+++ ktmethod.h	23 Jun 2005 23:19:41 -0000	1.9
@@ -42,7 +42,7 @@
     ~KTMethod();
 
     ///must be reimplemented by child classes
-	virtual void calculate(KTImage *img, KTClassifBackend *backend, int imgClass = 0);
+	virtual void calculate(KTImage *img, int imgClass = 0);
     
     QString methodName();
     QString longName();

Index: ktpluginmanager.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpluginmanager.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ktpluginmanager.cpp	23 Jun 2005 18:33:51 -0000	1.5
+++ ktpluginmanager.cpp	23 Jun 2005 23:19:41 -0000	1.6
@@ -20,7 +20,7 @@
  ***************************************************************************/
 #include "ktpluginmanager.h"
 #include "ktpatternmanager.h"
-#include "ktplugin.h"
+#include "ktclassifbackend.h"
 
 #include <kmainwindow.h>
 #include <kparts/componentfactory.h>
@@ -55,7 +55,7 @@
 
 void KTPluginManager::loadPlugins()
 {
-    KTPlugin *plugin;
+    KTClassifBackend *plugin;
     
     KTrader::OfferList offers = KTrader::self()->query("KImageProcess/Plugin");
     
@@ -66,19 +66,23 @@
     {
         KService::Ptr service = *iter;
         int errCode = 0;
-        plugin = KParts::ComponentFactory::createInstanceFromService<KTPlugin>
+        plugin = KParts::ComponentFactory::createInstanceFromService<KTClassifBackend>
             ( service, this, 0, QStringList(), &errCode);
         // here we ought to check the error code.
 
         if (plugin) 
         {
             //m_window->guiFactory()->addClient(plugin);
-            
-            kdDebug() << "KTPluginManager: Loaded plugin "
-                      << plugin->name() << endl;
+            kdDebug() << "Loaded classifier: " << plugin->classifierName() << endl;
+            m_backends.insert(plugin->classifierName(), plugin);
         }
 
     }
 }
 
+KTClassifBackend *KTPluginManager::classifier()
+{
+    //FIXME: hardcoded to snns    
+    return m_backends["snns"];
+}
 #include "ktpluginmanager.moc"

Index: ktcalculation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ktcalculation.cpp	23 Jun 2005 19:39:00 -0000	1.2
+++ ktcalculation.cpp	23 Jun 2005 23:19:41 -0000	1.3
@@ -18,13 +18,28 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include "ktimage.h"
 #include "ktcalculation.h"
+#include "ktfeaturemanager.h"
+#include "ktmethodmanager.h"
+#include "ktmethod.h"
+#include "ktpatternmanager.h"
+#include "ktclassifbackend.h"
+#include "ktpluginmanager.h"
 
 #include <kstaticdeleter.h>
+#include <kdebug.h>
 
 KTCalculation::KTCalculation(QObject *parent, const char *name)
  : QObject(parent, name)
 {
+    //Set defaults
+    m_window_type = WIN_SEQ;
+    m_window_size.type = true; //window, not the whole image
+    m_window_size.width = 5;
+    m_window_size.height = 5;
+    m_iterations = 0;
+
 }
 
 
@@ -50,6 +65,39 @@
 
 void KTCalculation::calculateSampleData()
 {
+    m_testing = false;
+
+    m_method = KTMethodManager::self()->activeMethod();
+    
+    m_inputs = KTFeatureManager::self()->enabledFeaturesCount(m_method->methodName());
+    m_outputs = KTImageManager::self()->sampleCount();
+
+    m_data.clear();
+    m_min.resize(m_inputs, 0);
+    m_max.resize(m_inputs, 0);
+    
+    int imgClass = 1;
+    KTImage *it;
+    for ( it = KTImageManager::self()->sampleImages().first(); it; it = KTImageManager::self()->sampleImages().next())
+        generateWindowResults(it, imgClass++);
+   
+    //normalize
+    QValueList<dataEntry>::iterator end = m_data.end();
+
+    float dif[m_inputs];
+    for (int i=0; i < m_inputs; ++i)
+        dif[i] = m_max[i] - m_min[i];
+
+    for (QValueList<dataEntry>::iterator it = m_data.begin(); it != end; ++it)
+    {
+        for ( int i=0; i < m_inputs; ++i )
+        {
+            (*it).inputs[i] = ((*it).inputs[i] - m_min[i]) * 100 / dif[i];
+        }
+    }
+
+    KTPluginManager::self()->classifier()->doTraining(m_data, m_inputs, m_outputs);
+    
     emit updateProgress();
     sleep(1);
     emit finished();
@@ -57,6 +105,47 @@
 
 void KTCalculation::calculateTestData()
 {
+    m_testing = true;
+
+    m_method = KTMethodManager::self()->activeMethod();
+    
+    m_inputs = KTFeatureManager::self()->enabledFeaturesCount(m_method->methodName());
+    m_outputs = KTImageManager::self()->sampleCount();
+
+    m_data.clear();
+    m_min.resize(m_inputs, 0);
+    m_max.resize(m_inputs, 0);
+
+    KTImage *img = KTImageManager::self()->testingImage();
+    
+    if (!img)
+    {
+        emit finished();
+        return;
+    }
+
+    int winType = m_window_type;
+    m_window_type = WIN_ALLPIX;
+    generateWindowResults(img, 0);
+    m_window_type = winType;
+        
+    //normalize
+    QValueList<dataEntry>::iterator end = m_data.end();
+
+    float dif[m_inputs];
+    for (int i=0; i < m_inputs; ++i)
+        dif[i] = m_max[i] - m_min[i];
+
+    for (QValueList<dataEntry>::iterator it = m_data.begin(); it != end; ++it)
+    {
+        for ( int i=0; i < m_inputs; ++i )
+        {
+            (*it).inputs[i] = ((*it).inputs[i] - m_min[i]) * 100 / dif[i];
+        }
+    }
+    
+    KTPluginManager::self()->classifier()->doClassify(m_data, m_inputs, m_outputs);
+    
     emit updateProgress();
     sleep(1);
     emit updateProgress();
@@ -64,4 +153,209 @@
     emit finished();
 }
 
+void KTCalculation::generateWindowResults(KTImage *img, int imgClass)
+{
+    int i, x, y, width, height, acumm;
+    KTImage *tmpimg;
+    
+    if (!m_window_size.type) 
+    {
+        m_method->calculate(img, imgClass);
+    }
+    else 
+    {
+        switch(m_window_type) 
+        {
+            case WIN_SEQ:
+                x = y = i = 0;
+                width = img->width();
+                height = img->height();
+                
+                while ( (x + m_window_size.width <= width) && (y + m_window_size.height <= height) &&
+                        (i < m_iterations || m_iterations == 0) )
+                {
+                    tmpimg = img->returnWindow(x, y, m_window_size.width, m_window_size.height);
+                    m_method->calculate(tmpimg, imgClass);
+                    delete tmpimg;
+                    ++i;
+                    ++x;
+                    if (x + m_window_size.width > width)
+                    {
+                        x = 0;
+                        ++y;
+                    }
+                }
+                break;
+            case WIN_CASC:
+                x = y = i = acumm = 0;
+                width = img->width();
+                height = img->height();
+                
+                while ( (x + m_window_size.width <= width) && (y + m_window_size.height <= height) && 
+                         (i < m_iterations || m_iterations == 0) )
+                {
+                    tmpimg = img->returnWindow(x, y, m_window_size.width, m_window_size.height);
+                    m_method->calculate(tmpimg, imgClass);
+                    delete tmpimg;
+                    ++i;
+                    x += m_window_size.width;
+                    if (x + m_window_size.width > width)
+                    {
+                        x = ++acumm;
+                        acumm = acumm % m_window_size.width;
+                        y += m_window_size.height;
+                    }
+                }
+                break;
+            case WIN_RAND:
+                i = 0;
+                width = img->width();
+                height = img->height();
+                
+                srand((unsigned) time(NULL));
+                
+                while (i < m_iterations) 
+                {
+                    x = rand() % (width - m_window_size.width);
+                    y = rand() % (height - m_window_size.height);
+                    tmpimg = img->returnWindow(x, y, m_window_size.width, m_window_size.height);
+                    m_method->calculate(tmpimg, imgClass);
+                    delete tmpimg;
+                    i++;
+                }
+                break;
+            case WIN_ALLPIX:
+                int cols_right, cols_left, rows_below, rows_above;
+                
+                // Calculate the outer borders of the image, because we're using centered windows
+                // (The window cross image boundaries)
+                cols_right = m_window_size.width / 2;
+                rows_below = m_window_size.height / 2;
+                if (m_window_size.width % 2 == 0)
+                    cols_left = cols_right;
+                else
+                    cols_left = cols_right + 1;
+                if (m_window_size.height % 2 == 0)
+                    rows_above = rows_below;
+                else
+                    rows_above = rows_below + 1;
+                
+                // Generate the pattern for Testing Image
+                int width = img->width();
+                int height = img->height();
+                for (y = 0; y < height; y++)
+                {
+                    for (x = 0; x < width; x++)
+                    {
+                        int startx, starty;
+                        
+                        //handling windows that are partly or fully outside the image
+                        
+                        //the x side
+                        if ( x - cols_left < 0 )
+                            startx = 0;
+                        else if ( x + cols_right >= width )
+                            startx = width - m_window_size.width - 1;
+                        else
+                            startx = x - cols_left;
+                        
+                        //the y side
+                        if ( y - rows_above < 0 )
+                            starty = 0;
+                        else if ( y + rows_below >= height )
+                            starty = height - m_window_size.height - 1;
+                        else
+                            starty = y - rows_above;
+                        
+                        tmpimg = img->returnWindow(startx, starty, m_window_size.width, m_window_size.height);
+                        m_method->calculate(tmpimg, imgClass);
+                        delete tmpimg;
+                    }
+                    emit updateProgress();
+                }
+                break;
+        }
+    }
+}
+
+void KTCalculation::parseResults(const QValueList<float> &results)
+{
+	float *inputs = new float[m_inputs];
+
+    QValueList<float>::const_iterator it;
+
+    if (m_first)
+    {
+        for (int j = 0; j < m_inputs; ++j)
+            m_min[j] = m_max[j] = inputs[j];
+        m_first = false;
+    }
+    
+    int i = 0;
+    
+    //prepare the input
+    for ( it = results.begin(); it != results.end(); ++it)
+    {
+        inputs[i] = (*it);
+        if (inputs[i] > m_max[i])
+            m_max[i] = inputs[i];
+        else if (inputs[i] < m_min[i])
+            m_min[i] = inputs[i];
+        ++i;
+    }
+
+    dataEntry entry ;
+    entry.inputs = inputs;
+    entry.sampleClass = 0;
+    m_data.append(entry);
+    
+}
+
+void KTCalculation::parseSampleResults(const QValueList<float> &results, int sampleClass)
+{
+    float *inputs = new float[m_inputs];
+
+    QValueList<float>::const_iterator it;
+    
+
+    if (m_first)
+    {
+        for (int j = 0; j < m_inputs; ++j)
+            m_min[j] = m_max[j] = inputs[j];
+        m_first = false;
+    }
+
+    int i = 0;
+    
+    //prepare the input
+    for ( it = results.begin(); it != results.end(); ++it)
+    {
+        inputs[i] = (*it);
+        if (inputs[i] > m_max[i])
+            m_max[i] = inputs[i];
+        else if (inputs[i] < m_min[i])
+            m_min[i] = inputs[i];
+        ++i;
+    }
+
+    dataEntry entry;
+    entry.inputs = inputs;
+    entry.sampleClass = sampleClass;
+    m_data.append(entry);
+    
+}
+
+void KTCalculation::setWindowSize(bool type, int height, int width)
+{
+    m_window_size.type = type;
+    m_window_size.height = height;
+    m_window_size.width = width;
+}
+
+window_size KTCalculation::windowSize()
+{
+    return m_window_size;
+}
+
+
 #include "ktcalculation.moc"

Index: ktclassifbackend.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktclassifbackend.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ktclassifbackend.h	23 Jun 2005 18:33:50 -0000	1.3
+++ ktclassifbackend.h	23 Jun 2005 23:19:41 -0000	1.4
@@ -21,16 +21,18 @@
 #ifndef KTCLASSIFBACKEND_H
 #define KTCLASSIFBACKEND_H
 
-#include <ktplugin.h>
+#include <ktcalculation.h>
 
 #include <qvaluelist.h>
+#include <qobject.h>
+#include <qstring.h>
 
 /**
 Base class for all classification backends
 
 @author Gustavo Pichorim Boiko
 */
-class KTClassifBackend : public KTPlugin
+class KTClassifBackend : public QObject
 {
 Q_OBJECT
 public:
@@ -38,8 +40,10 @@
 
     ~KTClassifBackend();
 
-    virtual void parseResults(const QValueList<float> &results);
-    virtual void parseSampleResults(const QValueList<float> &results, int sampleClass);
+    virtual void doTraining(const QValueList<dataEntry>& data, int inputs, int outputs);
+    virtual void doClassify(const QValueList<dataEntry>& data, int inputs, int outputs);
+    
+    virtual QString classifierName();
 };
 
 #endif

Index: ktmethod.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ktmethod.cpp	23 Jun 2005 18:33:51 -0000	1.7
+++ ktmethod.cpp	23 Jun 2005 23:19:41 -0000	1.8
@@ -33,10 +33,9 @@
     //do nothing here too
 }
 
-void KTMethod::calculate(KTImage *img, KTClassifBackend *backend, int imgClass)
+void KTMethod::calculate(KTImage *img, int imgClass)
 {
     Q_UNUSED(img);
-    Q_UNUSED(backend);
     Q_UNUSED(imgClass);
 }
 

[kimageprocess-devel] kimageprocess/src kimageprocess.cpp kttextureoptions.cpp

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32338/src

Modified Files:
	kimageprocess.cpp kttextureoptions.cpp 
Log Message:

All calculation (features extraction, normalization, etc) are now done in 
KTCalculation which provides us a better way to add new classifiers


Index: kttextureoptions.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kttextureoptions.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kttextureoptions.cpp	23 Jun 2005 18:33:49 -0000	1.5
+++ kttextureoptions.cpp	23 Jun 2005 23:19:40 -0000	1.6
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <ktpatternmanager.h>
+#include <ktcalculation.h>
 #include <ktimage.h>
 #include <ktmethodmanager.h>
 #include <ktmethod.h>
@@ -63,7 +63,7 @@
 {
     window_size temp;
     
-    switch (KTImageManager::self()->windowType()) 
+    switch (KTCalculation::self()->windowType()) 
     {
         case WIN_SEQ:
             m_ui->rbnSequential->setChecked(true);
@@ -77,7 +77,7 @@
             m_ui->rbnSlideIterations->setChecked(true);
             break;
     }
-    temp = KTImageManager::self()->windowSize();
+    temp = KTCalculation::self()->windowSize();
     if (temp.type)
         m_ui->rbnCustom->setChecked(true);
     else 
@@ -90,14 +90,14 @@
     }
     m_ui->spbX->setValue(temp.width);
     m_ui->spbY->setValue(temp.height);
-    if (KTImageManager::self()->numberIterations() == 0) 
+    if (KTCalculation::self()->numberIterations() == 0) 
     {
         m_ui->rbnSlideAll->setChecked(true);
         m_ui->spbIterations->setDisabled(true);
     }
     else
         m_ui->rbnSlideIterations->setChecked(true);
-    m_ui->spbIterations->setValue(KTImageManager::self()->numberIterations());
+    m_ui->spbIterations->setValue(KTCalculation::self()->numberIterations());
    
     //List methods and set the active one as selected
     MethodList methods = KTMethodManager::self()->methods();
@@ -115,17 +115,17 @@
 void KTTextureOptions::save()
 {
     if (m_ui->rbnSequential->isChecked())
-        KTImageManager::self()->setWindowType(WIN_SEQ);
+        KTCalculation::self()->setWindowType(WIN_SEQ);
     if (m_ui->rbnCascaded->isChecked())
-        KTImageManager::self()->setWindowType(WIN_CASC);
+        KTCalculation::self()->setWindowType(WIN_CASC);
     if (m_ui->rbnRandom->isChecked())
-        KTImageManager::self()->setWindowType(WIN_RAND);
+        KTCalculation::self()->setWindowType(WIN_RAND);
     
-    KTImageManager::self()->setWindowSize(m_ui->rbnCustom->isChecked(), m_ui->spbY->value(), m_ui->spbX->value());
+    KTCalculation::self()->setWindowSize(m_ui->rbnCustom->isChecked(), m_ui->spbY->value(), m_ui->spbX->value());
     if (m_ui->rbnSlideAll->isChecked())
-        KTImageManager::self()->setNumberIterations(0);
+        KTCalculation::self()->setNumberIterations(0);
     else
-        KTImageManager::self()->setNumberIterations(m_ui->spbIterations->value());
+        KTCalculation::self()->setNumberIterations(m_ui->spbIterations->value());
 
     QString method = m_ui->cmbMethod->currentText();
     KTMethodManager::self()->setActiveMethod(method.remove(QRegExp(" - .*")));

Index: kimageprocess.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocess.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kimageprocess.cpp	23 Jun 2005 19:39:00 -0000	1.23
+++ kimageprocess.cpp	23 Jun 2005 23:19:39 -0000	1.24
@@ -32,6 +32,7 @@
 #include "ktlistview.h"
 #include "ktprogressbar.h"
 #include "ktcalculation.h"
+#include "ktimage.h"
 
 #include <qdragobject.h>
 #include <qlayout.h>
@@ -439,7 +440,7 @@
 
 void KImageProcess::projectCalculateTestData()
 {
-    m_progressBar->startAction(5, i18n("Calculating testing data..."));
+    m_progressBar->startAction(KTImageManager::self()->testingImage()->height(), i18n("Calculating testing data..."));
     m_progressBar->show();
 
     QTimer::singleShot(0, KTCalculation::self(), SLOT(calculateTestData()));

[kimageprocess-devel] kimageprocess/src/methods/glcm glcm.cpp glcm.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32338/src/methods/glcm

Modified Files:
	glcm.cpp glcm.h 
Log Message:

All calculation (features extraction, normalization, etc) are now done in 
KTCalculation which provides us a better way to add new classifiers


Index: glcm.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/glcm.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- glcm.cpp	23 Jun 2005 18:33:52 -0000	1.9
+++ glcm.cpp	23 Jun 2005 23:19:42 -0000	1.10
@@ -28,7 +28,7 @@
 #include <ktmethodmanager.h>
 #include <ktfeaturemanager.h>
 #include <ktfeature.h>
-#include <ktclassifbackend.h>
+#include <ktcalculation.h>
 
 K_EXPORT_COMPONENT_FACTORY( kimageprocess_glcm,
                             KGenericFactory<KTGLCM>( "kimageprocess_glcm" ) )
@@ -54,7 +54,7 @@
 {    
 }
 
-void KTGLCM::calculate(KTImage *img, KTClassifBackend *backend, int imgClass)
+void KTGLCM::calculate(KTImage *img, int imgClass)
 {
     m_img = img;
     
@@ -89,6 +89,7 @@
         results[0][i] = (results[0][i] + results[1][i] + results[2][i] + results[3][i])/4;
     end = 0;
 
+    KTCalculation *calc = KTCalculation::self();
     //final results
     for (k=begin; k<=end; k++)
     {
@@ -96,13 +97,10 @@
         for (j=0; j < results[k].count(); ++j)
             result.append(results[k][j]);
         
-        if (backend != 0)
-        {
-            if (m_testingData)
-                backend->parseResults(result);
-            else
-                backend->parseSampleResults(result, imgClass);
-        }
+        if (m_testingData)
+            calc->parseResults(result);
+        else
+            calc->parseSampleResults(result, imgClass);
     }
 
     //delete the GLCM's after calculating

Index: glcm.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/glcm.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- glcm.h	23 Jun 2005 18:33:52 -0000	1.6
+++ glcm.h	23 Jun 2005 23:19:42 -0000	1.7
@@ -37,7 +37,7 @@
 
     ~KTGLCM();
     
-    void calculate(KTImage *img, KTClassifBackend *backend, int imgClass = 0); 
+    void calculate(KTImage *img, int imgClass = 0); 
     
     void *data(int direction) const;
 

[kimageprocess-devel] kimageprocess/src/methods/hsvcm hsvcm.cpp hsvcm.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32338/src/methods/hsvcm

Modified Files:
	hsvcm.cpp hsvcm.h 
Log Message:

All calculation (features extraction, normalization, etc) are now done in 
KTCalculation which provides us a better way to add new classifiers


Index: hsvcm.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/hsvcm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- hsvcm.cpp	23 Jun 2005 18:34:05 -0000	1.12
+++ hsvcm.cpp	23 Jun 2005 23:19:42 -0000	1.13
@@ -28,7 +28,7 @@
 #include <ktmethodmanager.h>
 #include <ktfeaturemanager.h>
 #include <ktfeature.h>
-#include <ktclassifbackend.h>
+#include <ktcalculation.h>
 
 K_EXPORT_COMPONENT_FACTORY( kimageprocess_hsvcm,
                             KGenericFactory<KTHSVCM>( "kimageprocess_hsvcm" ) )
@@ -59,7 +59,7 @@
 {    
 }
 
-void KTHSVCM::calculate(KTImage *img, KTClassifBackend *backend, int imgClass)
+void KTHSVCM::calculate(KTImage *img, int imgClass)
 {
     m_img = img;
     
@@ -104,13 +104,11 @@
     for (j=0; j < results[0].count(); ++j)
         result.append(results[0][j]);
     
-    if (backend != 0)
-    {
-        if (m_testingData)
-            backend->parseResults(result);
-        else
-            backend->parseSampleResults(result, imgClass);
-    }
+    KTCalculation *calc = KTCalculation::self();
+    if (m_testingData)
+        calc->parseResults(result);
+    else
+        calc->parseSampleResults(result, imgClass);
     
     //delete the GLCM's after calculating
     for (int dir=0; dir < 9; dir++)

Index: hsvcm.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/hsvcm.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hsvcm.h	23 Jun 2005 18:34:05 -0000	1.5
+++ hsvcm.h	23 Jun 2005 23:19:42 -0000	1.6
@@ -47,7 +47,7 @@
 
     ~KTHSVCM();
     
-    void calculate(KTImage *img, KTClassifBackend *backend, int imgClass = 0); 
+    void calculate(KTImage *img, int imgClass = 0); 
     
     void *data(int direction) const;
 

[kimageprocess-devel] kimageprocess/src/plugins Makefile.am

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32338/src/plugins

Modified Files:
	Makefile.am 
Log Message:

All calculation (features extraction, normalization, etc) are now done in 
KTCalculation which provides us a better way to add new classifiers


Index: Makefile.am
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	23 Jun 2005 03:18:48 -0000	1.6
+++ Makefile.am	23 Jun 2005 23:19:42 -0000	1.7
@@ -1,3 +1,3 @@
 INCLUDES = $(all_includes) -I$(srcdir)/libkimageprocess -I$(srcdir)/libktimgview
 METASOURCES = AUTO
-SUBDIRS = snns lwnn fann
+SUBDIRS = snns #lwnn fann

[kimageprocess-devel] kimageprocess/src/plugins/snns snns.cpp snns.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/plugins/snns
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32338/src/plugins/snns

Modified Files:
	snns.cpp snns.h 
Log Message:

All calculation (features extraction, normalization, etc) are now done in 
KTCalculation which provides us a better way to add new classifiers


Index: snns.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/snns/snns.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- snns.cpp	23 Jun 2005 18:30:07 -0000	1.6
+++ snns.cpp	23 Jun 2005 23:19:43 -0000	1.7
@@ -39,17 +39,6 @@
 KTSNNSPlugin::KTSNNSPlugin(QObject *parent, const char* name, const QStringList&)
  : KTClassifBackend(parent, name)
 {
-    m_generateTrainingPattern = new KAction(i18n("&Generate Training Pattern"), 0,
-                                  this, SLOT(slotGenerateTrainingPattern()),
-                                  actionCollection(), "snns_generate_training_pattern");
-    
-    m_generateTesingPattern = new KAction(i18n("Generate &Testing Pattern"), 0,
-                                  this, SLOT(slotGenerateTestingPattern()),
-                                  actionCollection(), "snns_generate_testing_pattern");
-                                             
-    setInstance(KGenericFactory<KTSNNSPlugin>::instance());
-    setXMLFile("kimageprocess_snns.rc");
-
     m_tempFile = 0;
 }
 
@@ -57,22 +46,18 @@
 KTSNNSPlugin::~KTSNNSPlugin()
 {
 }
-void KTSNNSPlugin::slotGenerateTrainingPattern()
+void KTSNNSPlugin::doTraining(const QValueList<dataEntry>& data, int inputs, int outputs)
 {
     KURL dest = KFileDialog::getSaveURL(QString::null,i18n("*.pat|Pattern files"),0,i18n("Save pattern"));
     
     if (!dest.isEmpty())
     {
         m_sampleImage = dest;
-        m_patternCount = 0;
         KTempFile tmpHeaderFile;
         tmpHeaderFile.setAutoDelete(false);
         m_tempFile = new KTempFile();
         m_tempFile->setAutoDelete(false);
 
-        m_input = KTImageManager::self()->activeFeaturesCount();
-        m_output = KTImageManager::self()->sampleCount();
-        
         if (tmpHeaderFile.file()->isOpen() && m_tempFile->file()->isOpen())
         {   
             QTextStream streamData(tmpHeaderFile.file());
@@ -81,9 +66,9 @@
             m_contents += "generated at " + QDateTime::currentDateTime().toString();
             m_contents += "\n\n\n";
             m_contents += "No. of patterns : %1\n";
-            m_contents += "No. of input units : " + QString::number( m_input );
+            m_contents += "No. of input units : " + QString::number( inputs );
             m_contents += "\n";
-            m_contents += "No. of output units : " + QString::number( m_output );
+            m_contents += "No. of output units : " + QString::number( outputs );
             m_contents += "\n\n";
             
             QStringList names = KTImageManager::self()->activeFeatureNames();
@@ -96,53 +81,31 @@
             
             m_stream.setDevice(m_tempFile->file());
 
-            m_first = true;
-            m_patterns.clear();
-            m_max.resize(m_input, 0);
-            m_min.resize(m_input, 0);
-            KTImageManager::self()->calculateSampleData(0, this);
-            
-            QValueList<pattern>::iterator end = m_patterns.end();
-
-            float dif[m_input];
-            for (int i=0; i < m_input; ++i)
-                dif[i] = m_max[i] - m_min[i];
+            QValueList<dataEntry>::ConstIterator end = data.constEnd();
 
-            for (QValueList<pattern>::iterator it = m_patterns.begin(); it != end; ++it)
-            {
-                QString line = "";
-                for ( int i=0; i < m_input; ++i )
-                {
-                    line += " " + QString::number((*it).inputs[i]);
-                    (*it).inputs[i] = ((*it).inputs[i] - m_min[i]) * 100 / dif[i];	
-                }
-                kdDebug() << line << endl;
-            }
-            
-            for (QValueList<pattern>::iterator it = m_patterns.begin(); it != end; ++it)
+            for (QValueList<dataEntry>::ConstIterator it = data.constBegin(); it != end; ++it)
             {
                 QString line = "";
                 
-                for ( int i=0; i < m_input; ++i )
+                for ( int i=0; i < inputs; ++i )
                     line.sprintf("%s %.5f", line.ascii(), (*it).inputs[i]);
                 
                 m_stream << line.stripWhiteSpace() << endl;
                 
                 QString temp="";
-                for (int j = 1; j <= m_output; j++)
+                for (int j = 1; j <= outputs; j++)
                     if (j == (*it).sampleClass)
                         temp += "1 ";
                 else
                     temp += "0 ";
                 
                 m_stream << temp.stripWhiteSpace() << endl << endl;
-                m_patternCount++;
 
             }
 
             //save the pattern file
             QTextStream streamHeader(tmpHeaderFile.file());
-            streamHeader << m_contents.arg(m_patternCount);
+            streamHeader << m_contents.arg(data.count());
             m_tempFile->file()->reset(); // place the cursor in the beginning of file
             while (!m_stream.atEnd()) 
             {
@@ -159,17 +122,13 @@
     }
 }
 
-void KTSNNSPlugin::slotGenerateTestingPattern()
+void KTSNNSPlugin::doClassify(const QValueList<dataEntry>& data, int inputs, int outputs)
 {
     KURL dest = KFileDialog::getSaveURL(QString::null,i18n("*.pat|Pattern files"),0,i18n("Save pattern"));
 
     if (!dest.isEmpty())
     {
-        m_input = KTImageManager::self()->activeFeaturesCount();
-        m_output = KTImageManager::self()->sampleCount();
-        
         m_sampleImage = dest;
-        m_patternCount = 0;
         KTempFile tmpHeaderFile;
         tmpHeaderFile.setAutoDelete(false);
         m_tempFile = new KTempFile();
@@ -183,7 +142,7 @@
             m_contents += "generated at " + QDateTime::currentDateTime().toString();
             m_contents += "\n\n\n";
             m_contents += "No. of patterns : %1\n";
-            m_contents += "No. of input units : " + QString::number( KTImageManager::self()->activeFeaturesCount() );
+            m_contents += "No. of input units : " + QString::number( inputs );
             m_contents += "\n";
             m_contents += "No. of output units : 0\n";
             m_contents += "\n\n";
@@ -198,36 +157,16 @@
             
             m_stream.setDevice(m_tempFile->file());
             
-            m_patterns.clear();
-            m_max.resize(m_input, 0);
-            m_min.resize(m_input, 0);
-            m_first = true;
-            KTImageManager::self()->calculateTestData(0, this);
-            
-            float dif[m_input];
-            for (int i=0; i < m_input; ++i)
-                dif[i] = m_max[i] - m_min[i];
-    
-            QValueList<pattern>::iterator end = m_patterns.end();
-            for (QValueList<pattern>::iterator it = m_patterns.begin(); it != end; ++it)
-            {
-                QString line = "";
-                for ( int i=0; i < m_input; ++i )
-                {
-                    line += " " + QString::number((*it).inputs[i]);
-                    (*it).inputs[i] = ((*it).inputs[i] - m_min[i]) * 100 / dif[i];	
-                }
-                kdDebug() << line << endl;
-            }
-            
-            for (QValueList<pattern>::iterator it = m_patterns.begin(); it != end; ++it)
+            QValueList<dataEntry>::ConstIterator end = data.constEnd();
+            int m_patternCount = 0;
+            for (QValueList<dataEntry>::ConstIterator it = data.constBegin(); it != end; ++it)
             {
                 QString line = "";
                 
                 //append the count (just for debuggin purposes )
                 m_stream << "#" << ++m_patternCount << endl;
                 
-                for ( int i=0; i < m_input; ++i)
+                for ( int i=0; i < inputs; ++i)
                     line.sprintf("%s %.5f", line.ascii(), (*it).inputs[i]);
                 
                 line = line + "\n";
@@ -237,7 +176,7 @@
 
             //save the pattern file
             QTextStream streamHeader(tmpHeaderFile.file());
-            streamHeader << m_contents.arg(m_patternCount);
+            streamHeader << m_contents.arg(data.count());
             m_tempFile->file()->reset(); // place the cursor in the beginning of file
             while (!m_stream.atEnd()) {
                 temp = m_stream.readLine();
@@ -258,72 +197,4 @@
 //connect signals/slots here    
 }
 
-void KTSNNSPlugin::parseResults(const QValueList<float> &results)
-{
-	float *inputs = new float[m_input];
-
-    QValueList<float>::const_iterator it;
-
-    if (m_first)
-    {
-        for (int j = 0; j < m_input; ++j)
-            m_min[j] = m_max[j] = inputs[j];
-        m_first = false;
-    }
-    
-    int i = 0;
-    
-    //prepare the input
-    for ( it = results.begin(); it != results.end(); ++it)
-    {
-        inputs[i] = (*it);
-        if (inputs[i] > m_max[i])
-            m_max[i] = inputs[i];
-        else if (inputs[i] < m_min[i])
-            m_min[i] = inputs[i];
-        ++i;
-}
-
-    pattern pat;
-    pat.inputs = inputs;
-    pat.sampleClass = 0;
-    m_patterns.append(pat);
-    
-}
-
-void KTSNNSPlugin::parseSampleResults(const QValueList<float> &results, int sampleClass)
-{
-    float *inputs = new float[m_input];
-
-    QValueList<float>::const_iterator it;
-    
-
-    if (m_first)
-    {
-        for (int j = 0; j < m_input; ++j)
-            m_min[j] = m_max[j] = inputs[j];
-        m_first = false;
-    }
-
-    int i = 0;
-    
-    //prepare the input
-    for ( it = results.begin(); it != results.end(); ++it)
-    {
-        inputs[i] = (*it);
-        if (inputs[i] > m_max[i])
-            m_max[i] = inputs[i];
-        else if (inputs[i] < m_min[i])
-            m_min[i] = inputs[i];
-        ++i;
-    }
-
-    pattern pat;
-    pat.inputs = inputs;
-    pat.sampleClass = sampleClass;
-    m_patterns.append(pat);
-    
-}
-
-
 #include "snns.moc"

Index: snns.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/snns/snns.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- snns.h	23 Jun 2005 18:30:07 -0000	1.6
+++ snns.h	23 Jun 2005 23:19:44 -0000	1.7
@@ -25,6 +25,7 @@
 
 #include <qvaluelist.h>
 #include <qvaluevector.h>
+#include <qstring.h>
 
 #include <kurl.h>
 
@@ -32,12 +33,6 @@
 class KTImage;
 class KTempFile;
 
-typedef struct
-{
-	    float *inputs;
-		    int sampleClass;
-} pattern;
-
 /**
 A SNNS backend plugin
 @author Gustavo Pichorim Boiko
@@ -53,10 +48,10 @@
     void setupPlugin();
     
     // Reimplemented from KTClassifBackends
-    void parseResults(const QValueList<float> &results);
-    
-    void parseSampleResults(const QValueList<float> &results, int sampleClass);
+    void doTraining(const QValueList<dataEntry>& data, int inputs, int outputs);
+    void doClassify(const QValueList<dataEntry>& data, int inputs, int outputs);
     
+    QString classifierName() { return "snns"; } 
 private:
     KAction *m_generateTrainingPattern;
     KAction *m_generateTesingPattern;
@@ -68,21 +63,7 @@
     
     KTempFile *m_tempFile;
     QTextStream m_stream;
-
-    QValueList<pattern> m_patterns;
-
-    int m_input;
-    int m_output;
-    QValueVector<float> m_min;
-    QValueVector<float> m_max;
-    bool m_first;
-    
-private slots:
-    void slotGenerateTrainingPattern();
-    // for now assume we are using one test image for each project.
-    // TODO: Fix that (will require API change)
-    void slotGenerateTestingPattern();
-    
+   
 };
 
 #endif

[kimageprocess-devel] kimageprocess/testclass testclass.c

[Herton R. K. <he...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/testclass
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12099

Modified Files:
	testclass.c 
Log Message:
- Replace prototypes by static functions.
- Small bug fix in parameter handling.


Index: testclass.c
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/testclass/testclass.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- testclass.c	23 Jun 2005 20:58:37 -0000	1.17
+++ testclass.c	23 Jun 2005 22:38:08 -0000	1.18
@@ -20,13 +20,7 @@
 	int numPatterns;
 } pat;
 
-/* function prototypes */
-void usage(char *progname);
-void fatal(int err);
-void netLoadFail(int code, char *fileName);
-void loadNetwork(pat *patInf, FILE *patFile, char *fileName);
-
-void usage(char *progname)
+static void usage(char *progname)
 {
 	fprintf(stderr, "testclass version %s\n", TESTCLASS_VERSION);
 	fprintf(stderr, "Copyright (C) 2005 by\n");
@@ -46,13 +40,13 @@
 	exit(1);
 }
 
-void fatal(int err)
+static void fatal(int err)
 {
 	fprintf(stderr, "%s\n", strerror(err));
 	exit(err);
 }
 
-void netLoadFail(int code, char *fileName)
+static void netLoadFail(int code, char *fileName)
 {
 	switch(code)
 	{
@@ -69,7 +63,7 @@
 	exit(1);
 }
 
-void loadNetwork(pat *patInf, FILE *patFile, char *fileName)
+static void loadNetwork(pat *patInf, FILE *patFile, char *fileName)
 {
 	int tok, curPat = 0, i, j;
 	float *tempp;
@@ -180,7 +174,7 @@
 		{"train-pattern", 1, NULL, 't'},
 		{"classify-pattern", 1, NULL, 'c'},
 		{"res-file", 1, NULL, 'r'},
-		{"activation-function", NULL, 'a'},
+		{"activation-function", 1, NULL, 'a'},
 		{0, 0, 0, 0}
 	};
 	opterr = 0;

[kimageprocess-devel] kimageprocess/testclass testclass.c

[Herton R. K. <he...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/testclass
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24132

Modified Files:
	testclass.c 
Log Message:
- Added support for select activation functions for hidden&output neurons.


Index: testclass.c
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/testclass/testclass.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- testclass.c	8 Apr 2005 01:16:48 -0000	1.16
+++ testclass.c	23 Jun 2005 20:58:37 -0000	1.17
@@ -33,9 +33,16 @@
 	fprintf(stderr, "         Gustavo Pichorim Boiko <gus...@kd...>\n");
 	fprintf(stderr, "         Herton Ronaldo Krzesinski <he...@my...>\n\n");
 	fprintf(stderr, "Usage: %s [options]\n", progname);
-	fprintf(stderr, "Options:  -t,--train-pattern     trainpatternfile\n");
-	fprintf(stderr, "          -c,--classify-pattern  classifypatternfile\n");
-	fprintf(stderr, "          -r,--res-file          resfile\n");
+	fprintf(stderr, "Options:  -t,--train-pattern       trainpatternfile\n");
+	fprintf(stderr, "          -c,--classify-pattern    classifypatternfile\n");
+	fprintf(stderr, "          -r,--res-file            resfile\n");
+	fprintf(stderr, "          -a,--activation-function FANN_THRESHOLD\n");
+	fprintf(stderr, "                                   FANN_THRESHOLD_SYMMETRIC\n");
+	fprintf(stderr, "                                   FANN_LINEAR\n");
+	fprintf(stderr, "                                   FANN_SIGMOID\n");
+	fprintf(stderr, "                                   FANN_SIGMOID_STEPWISE\n");
+	fprintf(stderr, "                                   FANN_SIGMOID_SYMMETRIC\n");
+	fprintf(stderr, "                                   FANN_SIGMOID_SYMMETRIC_STEPWISE\n");
 	exit(1);
 }
 
@@ -173,6 +180,7 @@
 		{"train-pattern", 1, NULL, 't'},
 		{"classify-pattern", 1, NULL, 'c'},
 		{"res-file", 1, NULL, 'r'},
+		{"activation-function", NULL, 'a'},
 		{0, 0, 0, 0}
 	};
 	opterr = 0;
@@ -185,7 +193,7 @@
 	float connection_rate = 1;
 	float learning_rate = 0.7;
 	float *result;
-	int npat;
+	int npat, a_func;
 	time_t tempTime;
 
 	if (argc == 1)
@@ -194,9 +202,10 @@
 	t_file = NULL;
 	c_file = NULL;
 	r_file = NULL;
+	a_func = FANN_SIGMOID_SYMMETRIC_STEPWISE;
 	while (1)
 	{
-		c = getopt_long (argc, argv, "+t:c:r:", long_options, &option_index);
+		c = getopt_long (argc, argv, "+t:c:r:a:", long_options, &option_index);
 		if (c == -1 && optind != argc)
 			usage(argv[0]);
 		if (c == -1)
@@ -212,6 +221,38 @@
 			case 'r':
 				r_file = optarg;
 				break;
+			case 'a':
+				if (!strncmp(optarg, "FANN_THRESHOLD_SYMMETRIC", strlen("FANN_THRESHOLD_SYMMETRIC"))) {
+					a_func = FANN_THRESHOLD_SYMMETRIC;
+					break;
+				}
+				if (!strncmp(optarg, "FANN_THRESHOLD", strlen("FANN_THRESHOLD"))) {
+					a_func = FANN_THRESHOLD;
+					break;
+				}
+				if (!strncmp(optarg, "FANN_LINEAR", strlen("FANN_LINEAR"))) {
+					a_func = FANN_LINEAR;
+					break;
+				}
+				if (!strncmp(optarg, "FANN_SIGMOID_SYMMETRIC_STEPWISE",
+				             strlen("FANN_SIGMOID_SYMMETRIC_STEPWISE"))) {
+					a_func = FANN_SIGMOID_SYMMETRIC_STEPWISE;
+					break;
+				}
+				if (!strncmp(optarg, "FANN_SIGMOID_SYMMETRIC", strlen("FANN_SIGMOID_SYMMETRIC"))) {
+					a_func = FANN_SIGMOID_SYMMETRIC;
+					break;
+				}
+				if (!strncmp(optarg, "FANN_SIGMOID_STEPWISE", strlen("FANN_SIGMOID_STEPWISE"))) {
+					a_func = FANN_SIGMOID_STEPWISE;
+					break;
+				}
+				if (!strncmp(optarg, "FANN_SIGMOID", strlen("FANN_SIGMOID"))) {
+					a_func = FANN_SIGMOID;
+					break;
+				}
+				usage(argv[0]);
+				break;
 			case ':':
 			case '?':
 				usage(argv[0]);
@@ -240,8 +281,8 @@
 	                    t_patData.numOutputUnits);
 	fann_set_activation_steepness_hidden(tfann, 1.0);
 	fann_set_activation_steepness_output(tfann, 1.0);
-	fann_set_activation_function_hidden(tfann, FANN_SIGMOID_SYMMETRIC_STEPWISE);
-	fann_set_activation_function_output(tfann, FANN_SIGMOID_SYMMETRIC_STEPWISE);
+	fann_set_activation_function_hidden(tfann, a_func);
+	fann_set_activation_function_output(tfann, a_func);
 	tfanndata.num_data = t_patData.numPatterns;
 	tfanndata.num_input = t_patData.numInputUnits;
 	tfanndata.num_output = t_patData.numOutputUnits;
@@ -318,3 +359,7 @@
 		fatal(errno);
 	return 0;
 }
+
+/*
+ * vim:noet
+ */

[kimageprocess-devel] kimageprocess/src ktprogressbar.cpp

[Herton R. K. <he...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26481

Modified Files:
	ktprogressbar.cpp 
Log Message:
- Some more fixes for progress.


Index: ktprogressbar.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktprogressbar.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ktprogressbar.cpp	23 Jun 2005 19:39:00 -0000	1.3
+++ ktprogressbar.cpp	23 Jun 2005 20:00:20 -0000	1.4
@@ -34,15 +34,15 @@
     layout->setAutoAdd(true);
     m_ui = new ProgressBarUI(this);
     m_ui->show();
-
     resize(332,112);
 }
 
 void KTProgressBar::startAction(int progressSteps, const QString& initialText)
 {
     m_ui->kalStatus->setText(initialText);
-    m_ui->kpStatus->reset();
     m_ui->kpStatus->setTotalSteps(progressSteps);
+    m_ui->kpStatus->setProgress(0);
+    update();
 }
 
 void KTProgressBar::finishAction()
@@ -58,7 +58,6 @@
 
 void KTProgressBar::advanceProgress()
 {
-    int p = m_ui->kpStatus->progress();
-    m_ui->kpStatus->setProgress(++p);
+    m_ui->kpStatus->advance(1);
 }
 #include "ktprogressbar.moc"

[kimageprocess-devel] kimageprocess/src/methods/hsvcm/features/entropy entropy.cpp

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16273/methods/hsvcm/features/entropy

Modified Files:
	entropy.cpp 
Log Message:

- Fixed progressbar stuff
- added (testing) code for progressbar


Index: entropy.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy/entropy.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- entropy.cpp	23 Jun 2005 18:34:06 -0000	1.6
+++ entropy.cpp	23 Jun 2005 19:39:01 -0000	1.7
@@ -64,7 +64,7 @@
         for (int j=0; j< cmSizeH; ++j)
             for (int k=0; k < cmSizeS; ++k)
                 sum += cm[i][j][k] * log10(cm[i][j][k] + EPSILON);
-    return sum;
+    return -sum;
 }
 
 #include "entropy.moc"

[kimageprocess-devel] kimageprocess/src/methods/hsvcm/features/correlation correlation.cpp

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/correlation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16273/methods/hsvcm/features/correlation

Modified Files:
	correlation.cpp 
Log Message:

- Fixed progressbar stuff
- added (testing) code for progressbar


Index: correlation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/correlation/correlation.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- correlation.cpp	23 Jun 2005 18:34:06 -0000	1.8
+++ correlation.cpp	23 Jun 2005 19:39:00 -0000	1.9
@@ -82,7 +82,6 @@
                 ps[k] += value;
             }
             
-    float mult;
     // ----- V component -------------
     for (i=0; i < cmSizeV; ++i)
         meanv += pv[i]*i;
@@ -104,17 +103,18 @@
         sum_sqrs += value * (k-means) * (k-means);
     }
     
-    stddevv = sqrt(sum_sqrv);
-    stddevh = sqrt(sum_sqrh);
-    stddevs = sqrt(sum_sqrs);
+    stddevv = sum_sqrv;
+    stddevh = sum_sqrh;
+    stddevs = sum_sqrs;
     
+    float mult;
     //and now (finally) the correlation itself:
     tmp = 0;
     for (i = 0; i < cmSizeV; ++i)
         for (j = 0; j < cmSizeH; ++j)
             for (k = 0; k < cmSizeS; ++k)
             {
-                float mult = stddevv * stddevh * stddevs;
+                mult = stddevv * stddevh * stddevs;
                 if (mult == 0)
                     mult = 0.000000000001;
                 tmp += (i * j * k * cm[i][j][k] - meanv * meanh * means) / mult;

[kimageprocess-devel] kimageprocess/src/libkimageprocess ktcalculation.cpp ktcalculation.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16273/libkimageprocess

Modified Files:
	ktcalculation.cpp ktcalculation.h 
Log Message:

- Fixed progressbar stuff
- added (testing) code for progressbar


Index: ktcalculation.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ktcalculation.h	23 Jun 2005 18:33:50 -0000	1.1
+++ ktcalculation.h	23 Jun 2005 19:39:00 -0000	1.2
@@ -35,14 +35,21 @@
 
     ~KTCalculation();
 
-    void calculateSampleData();
+    static KTCalculation *self();
     
+public slots:
+    void calculateSampleData();
+
     void calculateTestData();
     
-    static KTCalculation *self();
+signals:
+    void updateProgress();
+    void finished();
     
 private:
     static KTCalculation *s_self;
+
+
 };
 
 #endif

Index: ktcalculation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ktcalculation.cpp	23 Jun 2005 18:33:50 -0000	1.1
+++ ktcalculation.cpp	23 Jun 2005 19:39:00 -0000	1.2
@@ -50,10 +50,18 @@
 
 void KTCalculation::calculateSampleData()
 {
+    emit updateProgress();
+    sleep(1);
+    emit finished();
 }
 
 void KTCalculation::calculateTestData()
 {
+    emit updateProgress();
+    sleep(1);
+    emit updateProgress();
+    sleep(2);
+    emit finished();
 }
 
 #include "ktcalculation.moc"

[kimageprocess-devel] kimageprocess/src kimageprocess.cpp kimageprocess.h ktprogressbar.cpp ktprogressbar_ui.ui

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16273

Modified Files:
	kimageprocess.cpp kimageprocess.h ktprogressbar.cpp 
	ktprogressbar_ui.ui 
Log Message:

- Fixed progressbar stuff
- added (testing) code for progressbar


Index: kimageprocess.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocess.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kimageprocess.h	23 Jun 2005 18:32:24 -0000	1.10
+++ kimageprocess.h	23 Jun 2005 19:39:00 -0000	1.11
@@ -43,6 +43,7 @@
 class KTMethodManager;
 class KTListView;
 class KRecentFilesAction;
+class KTProgressBar;
 
 /**
  * This class serves as the main window for KImageProcess.  It handles the
@@ -117,12 +118,15 @@
     
     void fileOpen(const KURL &url);
     
+    void calculationFinished();
+
 private:
     void setupAccel();
     void setupActions();
 
     KTSideBar *m_sideBar;
     KImageProcessView *m_view;
+    KTProgressBar *m_progressBar;
     
     KPrinter   *m_printer;
     KToggleAction *m_toolbarAction;

Index: ktprogressbar.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktprogressbar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ktprogressbar.cpp	23 Jun 2005 19:29:40 -0000	1.2
+++ ktprogressbar.cpp	23 Jun 2005 19:39:00 -0000	1.3
@@ -24,6 +24,8 @@
 #include <kprogress.h>
 #include <kpushbutton.h>
 
+#include <qlayout.h>
+
 #include "ktprogressbar.h"
 
 KTProgressBar::KTProgressBar(QWidget *parent, const char *name) : QFrame(parent, name)
@@ -32,6 +34,8 @@
     layout->setAutoAdd(true);
     m_ui = new ProgressBarUI(this);
     m_ui->show();
+
+    resize(332,112);
 }
 
 void KTProgressBar::startAction(int progressSteps, const QString& initialText)

Index: kimageprocess.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocess.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- kimageprocess.cpp	23 Jun 2005 18:32:24 -0000	1.22
+++ kimageprocess.cpp	23 Jun 2005 19:39:00 -0000	1.23
@@ -30,10 +30,13 @@
 #include "ktfeaturemanager.h"
 #include "ktmethodmanager.h"
 #include "ktlistview.h"
+#include "ktprogressbar.h"
+#include "ktcalculation.h"
 
 #include <qdragobject.h>
 #include <qlayout.h>
 #include <qregexp.h>
+#include <qtimer.h>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -83,6 +86,8 @@
     m_view->sizePolicy().setHorStretch( 4 );
     m_view->sizePolicy().setHorData(QSizePolicy::Expanding);
     
+    m_progressBar = new KTProgressBar();
+    
     // accept dnd
     setAcceptDrops(true);
 
@@ -141,11 +146,22 @@
     
     KTMethodManager::self()->loadMethods();
     KTFeatureManager::self()->loadFeatures();
+
+
+    //progress bar stuff
+    KTCalculation *calc = KTCalculation::self();
+    connect(calc, SIGNAL(updateProgress()),
+            m_progressBar, SLOT(advanceProgress()));
+    connect(calc, SIGNAL(finished()),
+            this, SLOT(calculationFinished()));
+
 }
 
 KImageProcess::~KImageProcess()
 {
     KConfig cfg("kimageprocessrc");
+
+    delete m_progressBar;
     
     m_recentFiles->saveEntries(&cfg);
     
@@ -415,10 +431,18 @@
 
 void KImageProcess::projectCalculateSampleData()
 {
+    m_progressBar->startAction(3, i18n("Calculating sample data..."));
+    m_progressBar->show();
+    
+    QTimer::singleShot(0, KTCalculation::self(), SLOT(calculateSampleData()));
 }
 
 void KImageProcess::projectCalculateTestData()
 {
+    m_progressBar->startAction(5, i18n("Calculating testing data..."));
+    m_progressBar->show();
+
+    QTimer::singleShot(0, KTCalculation::self(), SLOT(calculateTestData()));
 }
 
 void KImageProcess::changeStatusbar(const QString& text)
@@ -438,4 +462,9 @@
     load(url);
 }
 
+void KImageProcess::calculationFinished()
+{
+    m_progressBar->close();
+}
+
 #include "kimageprocess.moc"

Index: ktprogressbar_ui.ui
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktprogressbar_ui.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ktprogressbar_ui.ui	23 Jun 2005 04:26:46 -0000	1.1
+++ ktprogressbar_ui.ui	23 Jun 2005 19:39:00 -0000	1.2
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ProgressBarUI</class>
-<widget class="QDialog">
+<widget class="QWidget">
     <property name="name">
         <cstring>ProgressBarUI</cstring>
     </property>
@@ -23,9 +23,6 @@
     <property name="caption">
         <string>Status</string>
     </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
     <widget class="KActiveLabel">
         <property name="name">
             <cstring>kalStatus</cstring>

[kimageprocess-devel] kimageprocess/src ktprogressbar.cpp

[Herton R. K. <he...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12148

Modified Files:
	ktprogressbar.cpp 
Log Message:
- Fixed displaying of progress bar form when creating form.


Index: ktprogressbar.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktprogressbar.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ktprogressbar.cpp	23 Jun 2005 04:26:46 -0000	1.1
+++ ktprogressbar.cpp	23 Jun 2005 19:29:40 -0000	1.2
@@ -28,7 +28,10 @@
 
 KTProgressBar::KTProgressBar(QWidget *parent, const char *name) : QFrame(parent, name)
 {
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->setAutoAdd(true);
     m_ui = new ProgressBarUI(this);
+    m_ui->show();
 }
 
 void KTProgressBar::startAction(int progressSteps, const QString& initialText)

[kimageprocess-devel] kimageprocess/src/methods/glcm/features/imcorrelation imcorrelation.cpp imcorrelation.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/imcorrelation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/imcorrelation

Modified Files:
	imcorrelation.cpp imcorrelation.h 
Log Message:
Copyright update


Index: imcorrelation.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/imcorrelation/imcorrelation.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imcorrelation.h	24 Mar 2005 03:06:05 -0000	1.2
+++ imcorrelation.h	23 Jun 2005 18:34:02 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: imcorrelation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/imcorrelation/imcorrelation.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imcorrelation.cpp	24 Mar 2005 03:06:05 -0000	1.2
+++ imcorrelation.cpp	23 Jun 2005 18:34:02 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src/methods/glcm/features/sumaverage sumaverage.cpp sumaverage.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumaverage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/sumaverage

Modified Files:
	sumaverage.cpp sumaverage.h 
Log Message:
Copyright update


Index: sumaverage.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumaverage/sumaverage.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sumaverage.h	24 Mar 2005 03:06:07 -0000	1.2
+++ sumaverage.h	23 Jun 2005 18:34:04 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: sumaverage.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumaverage/sumaverage.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sumaverage.cpp	24 Mar 2005 03:06:06 -0000	1.2
+++ sumaverage.cpp	23 Jun 2005 18:34:04 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src/libkimageprocess ktcalculation.cpp ktcalculation.h Makefile.am ktclassifbackend.cpp ktclassifbackend.h ktfeature.cpp ktfeature.h ktfeaturemanager.cpp ktfeaturemanager.h ktimage.cpp ktimage.h ktmethod.cpp ktmethod.h ktmethodmanager.cpp ktmethodmanager.h ktpatternmanager.cpp ktpatternmanager.h ktplugin.cpp ktplugin.h ktpluginmanager.cpp ktpluginmanager.h ktproject.cpp ktproject.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/libkimageprocess

Modified Files:
	Makefile.am ktclassifbackend.cpp ktclassifbackend.h 
	ktfeature.cpp ktfeature.h ktfeaturemanager.cpp 
	ktfeaturemanager.h ktimage.cpp ktimage.h ktmethod.cpp 
	ktmethod.h ktmethodmanager.cpp ktmethodmanager.h 
	ktpatternmanager.cpp ktpatternmanager.h ktplugin.cpp 
	ktplugin.h ktpluginmanager.cpp ktpluginmanager.h ktproject.cpp 
	ktproject.h 
Added Files:
	ktcalculation.cpp ktcalculation.h 
Log Message:
Copyright update


Index: ktfeature.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeature.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ktfeature.h	24 Mar 2005 03:05:45 -0000	1.4
+++ ktfeature.h	23 Jun 2005 18:33:50 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

--- NEW FILE: ktcalculation.h ---
/***************************************************************************
 *   Copyright (C) 2005 by                                                 *
 *            Gustavo Pichorim Boiko <gus...@kd...>           *
 *            Herton Ronaldo Krzesinski <he...@my...>             *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 *   This program is distributed in the hope that it will be useful,       *
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 *   GNU General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
#ifndef KTCALCULATION_H
#define KTCALCULATION_H

#include <qobject.h>

/**
A class that actually does the calculation for the images at all

*/
class KTCalculation : public QObject
{
Q_OBJECT
public:
    KTCalculation(QObject *parent = 0, const char *name = 0);

    ~KTCalculation();

    void calculateSampleData();
    
    void calculateTestData();
    
    static KTCalculation *self();
    
private:
    static KTCalculation *s_self;
};

#endif

Index: ktfeature.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeature.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ktfeature.cpp	23 Jun 2005 04:26:46 -0000	1.6
+++ ktfeature.cpp	23 Jun 2005 18:33:50 -0000	1.7
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktfeaturemanager.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeaturemanager.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ktfeaturemanager.cpp	23 Jun 2005 04:26:46 -0000	1.9
+++ ktfeaturemanager.cpp	23 Jun 2005 18:33:50 -0000	1.10
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktimage.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktimage.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ktimage.cpp	2 Apr 2005 18:12:41 -0000	1.17
+++ ktimage.cpp	23 Jun 2005 18:33:51 -0000	1.18
@@ -1,7 +1,7 @@
 /***************************************************************************
  * The texture feature's code was originally based on pgmtexture from      *
  * the netpbm package.                                                     *
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktclassifbackend.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktclassifbackend.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ktclassifbackend.cpp	23 Jun 2005 04:26:46 -0000	1.4
+++ ktclassifbackend.cpp	23 Jun 2005 18:33:50 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktplugin.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktplugin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ktplugin.cpp	23 Jun 2005 03:18:47 -0000	1.3
+++ ktplugin.cpp	23 Jun 2005 18:33:51 -0000	1.4
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktmethod.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ktmethod.h	23 Jun 2005 04:26:46 -0000	1.7
+++ ktmethod.h	23 Jun 2005 18:33:51 -0000	1.8
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktclassifbackend.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktclassifbackend.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ktclassifbackend.h	26 Feb 2005 20:37:42 -0000	1.2
+++ ktclassifbackend.h	23 Jun 2005 18:33:50 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktfeaturemanager.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeaturemanager.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ktfeaturemanager.h	18 Mar 2005 20:33:46 -0000	1.5
+++ ktfeaturemanager.h	23 Jun 2005 18:33:51 -0000	1.6
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktimage.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktimage.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ktimage.h	23 Jun 2005 04:26:46 -0000	1.10
+++ ktimage.h	23 Jun 2005 18:33:51 -0000	1.11
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktproject.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktproject.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ktproject.cpp	23 Jun 2005 03:18:47 -0000	1.13
+++ ktproject.cpp	23 Jun 2005 18:33:51 -0000	1.14
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktmethodmanager.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethodmanager.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ktmethodmanager.cpp	23 Jun 2005 04:26:46 -0000	1.9
+++ ktmethodmanager.cpp	23 Jun 2005 18:33:51 -0000	1.10
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktpatternmanager.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpatternmanager.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ktpatternmanager.h	23 Jun 2005 03:18:47 -0000	1.13
+++ ktpatternmanager.h	23 Jun 2005 18:33:51 -0000	1.14
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktproject.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktproject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ktproject.h	23 Jun 2005 03:18:47 -0000	1.4
+++ ktproject.h	23 Jun 2005 18:33:51 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktpatternmanager.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpatternmanager.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ktpatternmanager.cpp	23 Jun 2005 03:18:47 -0000	1.30
+++ ktpatternmanager.cpp	23 Jun 2005 18:33:51 -0000	1.31
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktplugin.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktplugin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ktplugin.h	23 Jun 2005 03:18:47 -0000	1.4
+++ ktplugin.h	23 Jun 2005 18:33:51 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: Makefile.am
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	17 Mar 2005 03:46:55 -0000	1.5
+++ Makefile.am	23 Jun 2005 18:33:49 -0000	1.6
@@ -2,11 +2,11 @@
 lib_LTLIBRARIES = libkimageprocess.la
 libkimageprocess_la_LDFLAGS = $(all_libraries)
 libkimageprocess_la_SOURCES = ktimage.cpp ktpatternmanager.cpp ktplugin.cpp \
-			ktpluginmanager.cpp ktproject.cpp ktclassifbackend.cpp ktfeature.cpp ktfeature.h \
-		ktfeaturemanager.cpp ktfeaturemanager.h ktmethod.cpp ktmethodmanager.cpp
+				ktpluginmanager.cpp ktproject.cpp ktclassifbackend.cpp ktfeature.cpp ktfeature.h \
+			ktfeaturemanager.cpp ktfeaturemanager.h ktmethod.cpp ktmethodmanager.cpp ktcalculation.cpp
 
 noinst_HEADERS = ktimage.h ktpatternmanager.h ktplugin.h ktpluginmanager.h \
-	ktproject.h ktclassifbackend.h
+		ktproject.h ktclassifbackend.h ktcalculation.h
  
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO

Index: ktpluginmanager.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpluginmanager.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ktpluginmanager.h	23 Jun 2005 03:18:47 -0000	1.2
+++ ktpluginmanager.h	23 Jun 2005 18:33:51 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktmethodmanager.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethodmanager.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ktmethodmanager.h	31 Mar 2005 23:56:43 -0000	1.4
+++ ktmethodmanager.h	23 Jun 2005 18:33:51 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktmethod.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ktmethod.cpp	23 Jun 2005 04:26:46 -0000	1.6
+++ ktmethod.cpp	23 Jun 2005 18:33:51 -0000	1.7
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

--- NEW FILE: ktcalculation.cpp ---
/***************************************************************************
 *   Copyright (C) 2004-2005 by                                                 *
 *            Gustavo Pichorim Boiko <gus...@kd...>           *
 *            Herton Ronaldo Krzesinski <he...@my...>             *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 *   This program is distributed in the hope that it will be useful,       *
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 *   GNU General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
#include "ktcalculation.h"

#include <kstaticdeleter.h>

KTCalculation::KTCalculation(QObject *parent, const char *name)
 : QObject(parent, name)
{
}


KTCalculation::~KTCalculation()
{
}

// Put the static deleter in its anonymous namespace -- why?
namespace
{
    KStaticDeleter<KTCalculation> sd;
}

KTCalculation *KTCalculation::s_self = 0L;

KTCalculation *KTCalculation::self()
{
    if ( !s_self )
        sd.setObject( s_self, new KTCalculation() );

    return s_self;
}

void KTCalculation::calculateSampleData()
{
}

void KTCalculation::calculateTestData()
{
}

#include "ktcalculation.moc"

Index: ktpluginmanager.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpluginmanager.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ktpluginmanager.cpp	23 Jun 2005 03:18:47 -0000	1.4
+++ ktpluginmanager.cpp	23 Jun 2005 18:33:51 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src/methods/glcm/features/sumentropy sumentropy.cpp sumentropy.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumentropy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/sumentropy

Modified Files:
	sumentropy.cpp sumentropy.h 
Log Message:
Copyright update


Index: sumentropy.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumentropy/sumentropy.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sumentropy.h	24 Mar 2005 03:06:07 -0000	1.2
+++ sumentropy.h	23 Jun 2005 18:34:04 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: sumentropy.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumentropy/sumentropy.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sumentropy.cpp	2 Apr 2005 20:10:24 -0000	1.3
+++ sumentropy.cpp	23 Jun 2005 18:34:04 -0000	1.4
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src/methods/glcm/features/mean mean.cpp mean.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/mean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/mean

Modified Files:
	mean.cpp mean.h 
Log Message:
Copyright update


Index: mean.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/mean/mean.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mean.h	24 Mar 2005 03:06:06 -0000	1.2
+++ mean.h	23 Jun 2005 18:34:03 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: mean.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/mean/mean.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mean.cpp	2 Apr 2005 20:10:23 -0000	1.3
+++ mean.cpp	23 Jun 2005 18:34:03 -0000	1.4
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src/methods/glcm/features/dissimilarity dissimilarity.cpp dissimilarity.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/dissimilarity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/dissimilarity

Modified Files:
	dissimilarity.cpp dissimilarity.h 
Log Message:
Copyright update


Index: dissimilarity.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/dissimilarity/dissimilarity.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dissimilarity.h	24 Mar 2005 03:06:04 -0000	1.2
+++ dissimilarity.h	23 Jun 2005 18:34:01 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: dissimilarity.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/dissimilarity/dissimilarity.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dissimilarity.cpp	2 Apr 2005 20:10:21 -0000	1.3
+++ dissimilarity.cpp	23 Jun 2005 18:34:01 -0000	1.4
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src/methods/glcm/features/energy energy.cpp energy.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/energy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/energy

Modified Files:
	energy.cpp energy.h 
Log Message:
Copyright update


Index: energy.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/energy/energy.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- energy.h	24 Mar 2005 03:06:04 -0000	1.2
+++ energy.h	23 Jun 2005 18:34:01 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: energy.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/energy/energy.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- energy.cpp	24 Mar 2005 03:06:04 -0000	1.2
+++ energy.cpp	23 Jun 2005 18:34:01 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src/methods/glcm/features/sumvariance sumvariance.cpp sumvariance.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumvariance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/sumvariance

Modified Files:
	sumvariance.cpp sumvariance.h 
Log Message:
Copyright update


Index: sumvariance.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumvariance/sumvariance.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sumvariance.cpp	24 Mar 2005 03:06:07 -0000	1.2
+++ sumvariance.cpp	23 Jun 2005 18:34:04 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: sumvariance.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/sumvariance/sumvariance.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sumvariance.h	24 Mar 2005 03:06:07 -0000	1.2
+++ sumvariance.h	23 Jun 2005 18:34:04 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src kimageprocessiface.h kimageprocessview.cpp kimageprocessview.h ktfeaturechooser.cpp ktfeaturechooser.h ktlistview.cpp ktlistview.h ktsidebar.cpp ktsidebar.h kttextureoptions.cpp kttextureoptions.h main.cpp pref.cpp pref.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src

Modified Files:
	kimageprocessiface.h kimageprocessview.cpp kimageprocessview.h 
	ktfeaturechooser.cpp ktfeaturechooser.h ktlistview.cpp 
	ktlistview.h ktsidebar.cpp ktsidebar.h kttextureoptions.cpp 
	kttextureoptions.h main.cpp pref.cpp pref.h 
Log Message:
Copyright update


Index: kttextureoptions.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kttextureoptions.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kttextureoptions.h	23 Jun 2005 03:18:47 -0000	1.2
+++ kttextureoptions.h	23 Jun 2005 18:33:49 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktlistview.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktlistview.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ktlistview.cpp	2 Apr 2005 20:14:51 -0000	1.5
+++ ktlistview.cpp	23 Jun 2005 18:33:49 -0000	1.6
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: main.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/main.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- main.cpp	10 Dec 2004 23:30:51 -0000	1.1.1.1
+++ main.cpp	23 Jun 2005 18:33:49 -0000	1.2
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *
@@ -41,7 +41,7 @@
 int main(int argc, char **argv)
 {
     KAboutData about("kimageprocess", I18N_NOOP("KImageProcess"), version, description,
-                     KAboutData::License_GPL, "(C) 2004 KImageProcess Development Team", 0, 0, 0);
+                     KAboutData::License_GPL, "(C) 2004-2005 KImageProcess Development Team", 0, 0, 0);
     about.addAuthor( "Gustavo Pichorim Boiko", 0, "gus...@kd..." );
     about.addAuthor( "Herton Ronaldo Krzesinski", 0, "he...@my..." );
     KCmdLineArgs::init(argc, argv, &about);

Index: pref.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/pref.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pref.h	23 Jun 2005 03:18:47 -0000	1.7
+++ pref.h	23 Jun 2005 18:33:49 -0000	1.8
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktfeaturechooser.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktfeaturechooser.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ktfeaturechooser.cpp	31 Mar 2005 22:35:15 -0000	1.8
+++ ktfeaturechooser.cpp	23 Jun 2005 18:33:49 -0000	1.9
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktfeaturechooser.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktfeaturechooser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ktfeaturechooser.h	18 Mar 2005 20:33:46 -0000	1.3
+++ ktfeaturechooser.h	23 Jun 2005 18:33:49 -0000	1.4
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktsidebar.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktsidebar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ktsidebar.h	15 Mar 2005 23:02:04 -0000	1.3
+++ ktsidebar.h	23 Jun 2005 18:33:49 -0000	1.4
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: kimageprocessiface.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocessiface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kimageprocessiface.h	15 Dec 2004 15:06:10 -0000	1.2
+++ kimageprocessiface.h	23 Jun 2005 18:33:49 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktlistview.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktlistview.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ktlistview.h	4 Feb 2005 23:54:16 -0000	1.2
+++ ktlistview.h	23 Jun 2005 18:33:49 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: pref.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/pref.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pref.cpp	23 Jun 2005 03:18:47 -0000	1.7
+++ pref.cpp	23 Jun 2005 18:33:49 -0000	1.8
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: ktsidebar.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/ktsidebar.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ktsidebar.cpp	15 Mar 2005 23:02:04 -0000	1.4
+++ ktsidebar.cpp	23 Jun 2005 18:33:49 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: kimageprocessview.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocessview.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kimageprocessview.cpp	15 Mar 2005 23:02:04 -0000	1.3
+++ kimageprocessview.cpp	23 Jun 2005 18:33:49 -0000	1.4
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: kttextureoptions.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kttextureoptions.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kttextureoptions.cpp	23 Jun 2005 03:18:47 -0000	1.4
+++ kttextureoptions.cpp	23 Jun 2005 18:33:49 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: kimageprocessview.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocessview.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kimageprocessview.h	15 Mar 2005 23:02:04 -0000	1.4
+++ kimageprocessview.h	23 Jun 2005 18:33:49 -0000	1.5
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

[kimageprocess-devel] kimageprocess/src/methods/glcm/features/entropy entropy.cpp entropy.h

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/entropy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/entropy

Modified Files:
	entropy.cpp entropy.h 
Log Message:
Copyright update


Index: entropy.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/entropy/entropy.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entropy.h	24 Mar 2005 03:06:05 -0000	1.2
+++ entropy.h	23 Jun 2005 18:34:01 -0000	1.3
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *

Index: entropy.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/entropy/entropy.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entropy.cpp	2 Apr 2005 20:10:22 -0000	1.3
+++ entropy.cpp	23 Jun 2005 18:34:01 -0000	1.4
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2004 by                                                 *
+ *   Copyright (C) 2004-2005 by                                                 *
  *            Gustavo Pichorim Boiko <gus...@kd...>           *
  *            Herton Ronaldo Krzesinski <he...@my...>             *
  *                                                                         *