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