|
@@ -143,7 +143,9 @@ classdef FileRunner
|
|
obj = obj.JumpNextWell;
|
|
obj = obj.JumpNextWell;
|
|
m_well=strcat(char(64+obj.last_well_row+1),num2str(obj.last_well_col+1));
|
|
m_well=strcat(char(64+obj.last_well_row+1),num2str(obj.last_well_col+1));
|
|
if obj.file_finished == 1
|
|
if obj.file_finished == 1
|
|
- break
|
|
|
|
|
|
+ errorread = 1;%to show that the file finished and nothing to readhere
|
|
|
|
+ chlabel=[];
|
|
|
|
+ return
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
|
|
@@ -180,7 +182,7 @@ classdef FileRunner
|
|
if obj.final_well_col-1 <= obj.last_well_col % viimeinen kaivosarake, otetaan seuraavalta rivilt?
|
|
if obj.final_well_col-1 <= obj.last_well_col % viimeinen kaivosarake, otetaan seuraavalta rivilt?
|
|
obj.last_well_col = obj.first_well_col-1;
|
|
obj.last_well_col = obj.first_well_col-1;
|
|
if obj.final_well_row-1 <= obj.last_well_row
|
|
if obj.final_well_row-1 <= obj.last_well_row
|
|
- disp('All channels have been read from1!');
|
|
|
|
|
|
+ disp('All channels have been read from!');
|
|
obj.file_finished = 1;
|
|
obj.file_finished = 1;
|
|
else
|
|
else
|
|
obj.last_well_row = obj.last_well_row+1;
|
|
obj.last_well_row = obj.last_well_row+1;
|
|
@@ -266,7 +268,7 @@ classdef FileRunner
|
|
if obj.final_well_col-1 <= obj.last_well_col
|
|
if obj.final_well_col-1 <= obj.last_well_col
|
|
obj.last_well_col = obj.first_well_col-1;
|
|
obj.last_well_col = obj.first_well_col-1;
|
|
if obj.final_well_row-1 <= obj.last_well_row
|
|
if obj.final_well_row-1 <= obj.last_well_row
|
|
- disp('All channels have been read from2!');
|
|
|
|
|
|
+ disp('All channels have been read from!');
|
|
obj.file_finished = 1;
|
|
obj.file_finished = 1;
|
|
else
|
|
else
|
|
obj.last_well_row = obj.last_well_row+1;
|
|
obj.last_well_row = obj.last_well_row+1;
|