cleanup and bugfixes

mergeRoiTool.m

@@ -214,9 +214,9 @@ fp = [path '/' files(n).name];
         dcmlist(end).fname = files(n).name;
         dcmlist(end).protocol = nfo.ProtocolName;     
     end
-    setProgress(hObject, eventdata, handles,n/length(files),[])
+    setProgress(hObject, eventdata, handles,n/length(files),[]);
 end
-setProgress(hObject, eventdata, handles,1,'Finished')
+setProgress(hObject, eventdata, handles,1,'Finished');
 
 if length(dcmlist) < 1
     error('no dicoms found');
@@ -242,10 +242,10 @@ ha = handles.axes1;
 h = imagesc(ha,zeros(330));
 colormap('gray');
 %get(h)
-set(h,'HitTest','off')
-set(h,'PickableParts','none')
-get(ha)
-set(ha,'ButtonDownFcn',@axes1_ButtonDownFcn)
+set(h,'HitTest','off');
+set(h,'PickableParts','none');
+%get(ha);
+set(ha,'ButtonDownFcn',@axes1_ButtonDownFcn);
 handles.imageHandle = h;
 
 guidata(hObject,handles);
@@ -371,7 +371,9 @@ path = handles.dcmlist(imagenum).path;
 
 axes(handles.axes1);
 images = dicomread(path);
-%h = imagesc(images(:,:,1,1),'HitTest','off');
+dcminfo = dicominfo(path);
+%h = imagesc(images(:,:,1,1),'HitTest','off');\
+handles.dcminfo = dcminfo;
 set(handles.imageHandle,'CData',images(:,:,1,1));
 %h = imagesc(images(:,:,1,1));
 set(handles.sliceCount,'String',sprintf('/ %i',size(images,4)));
@@ -381,8 +383,10 @@ set(handles.sliceCount,'String',sprintf('/ %i',size(images,4)));
 %set(h,'HitTest','off')
 %set(h,'ButtonDownFcn',@axes1_ButtonDownFcn)
 tsize = size(images);
-display("matrix size");
-display(tsize);
+if handles.debug
+    display("matrix size");
+    display(tsize);
+end
 if max(size(tsize)) > 2
 tsize = tsize([1:2 4]);
 end
@@ -400,6 +404,7 @@ handles.roiCoords = struct;
 handles.roi.liver = roi;
 handles.roi.muscle = roi;
 handles.imageMat = images;
+handles.currentSlice = 1;
 handles.needsReload = 0;
 handles.climval = get(handles.axes1,'CLim');
 set(handles.slider_color,'Value',1);