removed old comments

baselib/ICETools.cpp

@@ -8,10 +8,11 @@
 #include "core/image/ImageT.h"
 #include "core/vector/VectorT.h"
 #include "core/vector/MatrixT.h"
-#include <core/imagedisplay/ImageDisplay.h>
 #include <core/image/Filter.h>
 #include <core/image/Convert.h>
 
+#include <core/imagedisplay/ImageDisplay.h>
+
 #include <iostream>
 
 #include <core/image/RectT.h>
@@ -37,68 +38,11 @@ ICETools::~ICETools()
 void ICETools::selectRectangles ( const NICE::Image & panel, NICE::Image & overlay, vector<Vector> & x, int color )
 {
   fthrow ( Exception, "ICETools::selectRectangles -- not yet implemented due to old ICE version." );
-// #ifndef NOVISUAL
-//     // new NICE code
-//     vector<RectT<double> > rectangles;
-//   //TODO check this!
-// //     NICE::selectRectangles ( panel, rectangles, "select rectangles" );
-// //   selectRectangles ( panel, rectangles, "select rectangles" );
-//
-//     for ( vector<RectT<double> >::const_iterator i = rectangles.begin();
-//  i != rectangles.end(); i++ )
-//     {
-//  Vector vec (4);
-//  vec[0] = i->left;
-//  vec[1] = i->top;
-//  vec[2] = i->right();
-//  vec[3] = i->bottom();
-//
-//  x.push_back ( vec );
-//     }
-// #else
-//     fprintf (stderr, "ICETools::selectRectangles: visualization disabled !\n");
-// #endif
 }
 
 void ICETools::selectPoints ( const NICE::Image & panel, NICE::Image & overlay, vector<Vector> & x, int color )
 {
   fthrow ( Exception, "ICETools::selectPoints -- not yet implemented due to old ICE version." );
-// #ifndef NOVISUAL
-//     vector<CoordT<double> > points;
-//   //TODO check this!
-// //     NICE::selectPoints ( panel, points, "select points" );
-// //  selectPoints ( panel, points, "select points" );
-//
-//     for ( vector<CoordT<double> >::const_iterator i = points.begin();
-//  i != points.end(); i++ )
-//     {
-//  Vector vec (2);
-//  vec[0] = i->x;
-//  vec[1] = i->y;
-//
-//  x.push_back ( vec );
-//     }
-//
-//     /** OLD ICE Code
-//     int p[2];
-//     int rc = -1;
-//
-//     while ( (rc = SelPoint ( DEFAULT, panel, p )) != -1 )
-//     {
-//         int x1, y1;
-//         x1 = p[0]; y1 = p[1];
-//         // refactor-nice.pl: check this substitution
-//         // old: Marker ( DEFAULT, p[0], p[1], color, 5, overlay );
-//         // REFACTOR-FIXME Unable to map this statement
-//         // refactor-nice.pl: check this substitution
-//         // old: x.push_back ( Vector(x1, y1) );
-//         // REFACTOR-FIXME Unable to std::map this statement
-//     }
-//     */
-// #else
-//     fprintf (stderr, "ICETools::selectPoints: visualization disabled !\n");
-// #endif
-
 }
 
 void ICETools::convertToRGB ( const NICE::Matrix & m, NICE::ColorImage & img )
@@ -147,66 +91,19 @@ int ICETools::markImage ( const NICE::Image & img, NICE::Image & mark, int marks
 {
   fprintf ( stderr, "ICETools::markImage: reimplement this function for NICE\n" );
   exit ( -1 );
-
-  /*
-      int flags;
-      int p[2];
-      int xo = -1;
-      int yo = -1;
-
-      while(1) {
-   // refactor-nice.pl: check this substitution
-   // old: flags = Mouse(img,p[0],p[1]);
-   // REFACTOR-FIXME Unable to map this statement
-   if ( (flags & M_LEFT_DOWN) > 0 ) {
-       if ( (p[0] != xo) || (p[1] != yo) ) {
-    if ( marksize == 1 ) {
-        // refactor-nice.pl: check this substitution
-        // old: PutVal( mark, p[0], p[1], color );
-        mark.setPixel(p[0],p[1],color);
-    } else {
-        // refactor-nice.pl: check this substitution
-        // old: Marker(3, p[0], p[1], color, marksize, mark);
-        // REFACTOR-FIXME Unable to map this statement
-    }
-
-    xo = p[0];
-    yo = p[1];
-       }
-   }
-   if ( (flags & M_RIGHT_DOWN) > 0 ) {
-       while ( (flags & M_RIGHT_DOWN) > 0 ) {
-    // refactor-nice.pl: check this substitution
-    // old: flags = Mouse(img,p[0],p[1]);
-    // REFACTOR-FIXME Unable to map this statement
-       };
-       return -1;
-   }
-      }
-  */
-
   return 0;
 }
 
-// refactor-nice.pl: check this substitution
-// old: int ICETools::showImages ( vector<Image> & imagelist )
 int ICETools::showImages ( vector<NICE::Image> & imagelist )
 {
 #ifndef NOVISUAL
   for ( size_t j = 0 ; j < imagelist.size() ; j++ )
   {
-    // refactor-nice.pl: check this substitution
-    // old: Show(ON, imagelist[j]);
     showImage ( imagelist[j] );
   }
 #endif
 
-  // assumption: same size
-  // refactor-nice.pl: check this substitution
-  // old: int xsize = imagelist[0]->xsize;
   int xsize = imagelist[0].width();
-  // refactor-nice.pl: check this substitution
-  // old: int ysize = imagelist[0]->ysize;
   int ysize = imagelist[0].height();
 
   int n = imagelist.size();