Changeset 699 for branches

Timestamp:

02/22/10 00:53:34 (2 years ago)

Author:

taborts

Message:

removed references to missing images, left only 3 good examples and one bad

Files:

• branches/2010-image-rec/hist_test.m (modified) (6 diffs)

branches/2010-image-rec/hist_test.m

@@ -1 +1 @@
 function hist_test(fn)
 
-show_images = 0;
+show_images = 1;
 
 if show_images
     close all;
-    %fn = 'images/course-walk/cimg4943.jpg';
-    %fn = 'images/course-walk/cimg4921.jpg';
-    fn = 'images/elphel/cam-000078.jpeg';
-    %fn = 'images/elphel/cam-000086.jpeg'; % Hard image
-    %fn = 'images/course-walk/cimg4989.jpg';
-    %fn = 'images/elphel-09/test29.jpg';
+    
+    
+    %fn = 'images/elphel/cam-000086.jpeg'; % Hard image, example of failure
+    
+    %fn = 'images/elphel/cam-000087.jpeg';
     %fn = 'images/elphel/cam-000094.jpeg';
     %fn = 'images/elphel/cam-000081.jpeg';
@@ -61 +60 @@
 % Area at the bottom of the image assumed to be grass, clear of obstacles
 clear_area = im(round(clear_area_top * rows):end, ...
-                round(clear_area_left * cols): ...
-                    round((1 - clear_area_left) * cols), :);
+    round(clear_area_left * cols): ...
+    round((1 - clear_area_left) * cols), :);
 
 % Histograms of each channel
@@ -155 +154 @@
 right_x = round((1 - clear_area_left) * cols);
 line([left_x right_x right_x left_x left_x], ...
-     [top_y top_y bottom_y bottom_y top_y],'LineWidth',4,'Color','red');
+    [top_y top_y bottom_y bottom_y top_y],'LineWidth',4,'Color','red');
 scatter(bottomlist(:,1), bottomlist(:,2), '.');
 
@@ -171 +170 @@
 axis on, axis normal, hold on;
 P  = houghpeaks(H,2,'NHoodSize',[161,161],'Threshold',ceil(0.5*max(H(:))));
-x = T(P(:,2)); 
+x = T(P(:,2));
 y = R(P(:,1));
 plot(x,y,'s','color','white');
@@ -181 +180 @@
 figure('Name','Hough lines'), imshow(im_rgb), hold on
 for k = 1:length(lns)
-        xy = [lns(k).point1; lns(k).point2];
-        plot(xy(:,1),xy(:,2),'LineWidth',8,'Color','blue');
-
-        % plot beginnings and ends of lines
-        plot(xy(1,1),xy(1,2),'x','LineWidth',8,'Color','yellow');
-        plot(xy(2,1),xy(2,2),'x','LineWidth',8,'Color','red');
+    xy = [lns(k).point1; lns(k).point2];
+    plot(xy(:,1),xy(:,2),'LineWidth',8,'Color','blue');
+    
+    % plot beginnings and ends of lines
+    plot(xy(1,1),xy(1,2),'x','LineWidth',8,'Color','yellow');
+    plot(xy(2,1),xy(2,2),'x','LineWidth',8,'Color','red');
 end
 
@@ -198 +197 @@
 
 function rgb = bw2rgb(bw)
-        rgb = zeros(size(bw, 1), size(bw, 2), 3);
-        rgb(:,:,1) = bw;
-        rgb(:,:,2) = bw;
-        rgb(:,:,3) = bw;
+rgb = zeros(size(bw, 1), size(bw, 2), 3);
+rgb(:,:,1) = bw;
+rgb(:,:,2) = bw;
+rgb(:,:,3) = bw;
 end
 
 function bottomlist = bottomFind(bw)
-    list = zeros(size(bw,2),2);
-    for i = 1:size(bw,2)
-        bw(1,:) = 1;
-        list(i,2) = find(bw(:,i) == 1, 1, 'last');
-        list(i,1) = i;
-    end
-    
-    bottomlist = list(list(:,2) ~= 1, :);
-    
-end
+list = zeros(size(bw,2),2);
+for i = 1:size(bw,2)
+    bw(1,:) = 1;
+    list(i,2) = find(bw(:,i) == 1, 1, 'last');
+    list(i,1) = i;
+end
+
+bottomlist = list(list(:,2) ~= 1, :);
+
+end