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

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

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

Modified Files:
	ktcalculation.cpp ktpatternmanager.h 
Log Message:
Fixed WIN_ALLPIX navigation
Removed obsolete code


Index: ktpatternmanager.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpatternmanager.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ktpatternmanager.h	23 Jun 2005 23:19:41 -0000	1.15
+++ ktpatternmanager.h	29 Jun 2005 03:03:00 -0000	1.16
@@ -95,19 +95,6 @@
      */
     KTImage *testingImage();
     
-    /**
-     * Extract data from samples
-     * The file format can be found in the JavaNNS documentation
-     * @param img The pattern image that will be used to generate the pattern file.
-     * @param backend The classification backend to be used
-     * Note that when no @ref img is specified, the pattern file will be generated
-     * using all available pattern images.
-     */
-    void calculateSampleData(KTImage *img = 0, KTClassifBackend *backend = 0);
-    
-    /** Extract data from testing images */
-    void calculateTestData(KTImage *img, KTClassifBackend *backend = 0);
-    
     /** count the active features */
     int activeFeaturesCount();
 

Index: ktcalculation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ktcalculation.cpp	28 Jun 2005 22:11:33 -0000	1.6
+++ ktcalculation.cpp	29 Jun 2005 03:03:00 -0000	1.7
@@ -222,20 +222,8 @@
                 }
                 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;
+                int beginx = (m_window_size.width / 2);
+                int beginy = (m_window_size.height / 2);
                 
                 // Generate the pattern for Testing Image
                 int width = img->width();
@@ -249,21 +237,22 @@
                         //handling windows that are partly or fully outside the image
                         
                         //the x side
-                        if ( x - cols_left < 0 )
+                        if ( x - beginx < 0 )
                             startx = 0;
-                        else if ( x + cols_right >= width )
-                            startx = width - m_window_size.width - 1;
+                        else if ( x - beginx + m_window_size.width > width )
+                            startx = width - m_window_size.width;
                         else
-                            startx = x - cols_left;
+                            startx = x - beginx;
                         
                         //the y side
-                        if ( y - rows_above < 0 )
+                        if ( y - beginy < 0 )
                             starty = 0;
-                        else if ( y + rows_below >= height )
-                            starty = height - m_window_size.height - 1;
+                        else if ( y - beginy + m_window_size.height > height )
+                            starty = height - m_window_size.height;
                         else
-                            starty = y - rows_above;
+                            starty = y - beginy;
                         
+                        //kdDebug() << "Taking startx=" << startx << " starty=" << starty << " for x=" << x << " y=" << y << endl;
                         tmpimg = img->returnWindow(startx, starty, m_window_size.width, m_window_size.height);
                         m_method->calculate(tmpimg, imgClass);
                         delete tmpimg;