[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;