diff --git a/MASH-FRET/.release_version.json b/MASH-FRET/.release_version.json index 4b8e9931..e00aafbe 100644 --- a/MASH-FRET/.release_version.json +++ b/MASH-FRET/.release_version.json @@ -1,4 +1,4 @@ { "tag" : "1.3.3.3", -"prev_commit_hash" : "fd17e646" +"prev_commit_hash" : "ea483ee5" } diff --git a/MASH-FRET/source/mod-video-processing/coordinates/mapping_tool/buildMappingTool.m b/MASH-FRET/source/mod-video-processing/coordinates/mapping_tool/buildMappingTool.m index dd8b4411..0249d46d 100644 --- a/MASH-FRET/source/mod-video-processing/coordinates/mapping_tool/buildMappingTool.m +++ b/MASH-FRET/source/mod-video-processing/coordinates/mapping_tool/buildMappingTool.m @@ -18,9 +18,7 @@ function buildMappingTool(img, lim, h_fig) htxt = 14; winratio = 0.75; zoomsldratio = 0.3; -stpbig = 1/4; -stpzoomsmall = 1/20; -zoomfactmax = 5; +zoomfactmax = 10; figttl = 'Mapping tool'; menulbl0 = 'Delete last point'; menulbl1 = 'Delete last set'; @@ -145,7 +143,7 @@ function buildMappingTool(img, lim, h_fig) y = y+htxt; q.slider_zoom = uicontrol('Style', 'slider', 'Units', un, 'Position', ... [x y wtxt hsld], 'Min', 1, 'Max', zoomfactmax, 'Value', 1, ... - 'SliderStep', [stpzoomsmall stpbig], 'Callback', ... + 'SliderStep', [1/(4*(zoomfactmax-1)) 1/(zoomfactmax-1)], 'Callback', ... {@slider_zoom_Callback, h_fig}); diff --git a/MASH-FRET/source/mod-video-processing/coordinates/mapping_tool/updatePnts.m b/MASH-FRET/source/mod-video-processing/coordinates/mapping_tool/updatePnts.m index 3f3f6e43..a0f3bcb6 100644 --- a/MASH-FRET/source/mod-video-processing/coordinates/mapping_tool/updatePnts.m +++ b/MASH-FRET/source/mod-video-processing/coordinates/mapping_tool/updatePnts.m @@ -55,9 +55,11 @@ function updatePnts(h_fig) for c = 1:nChan q.txt{c} = []; q.txtFull{c} = []; + x_lim = get(q.axes_top(c), 'XLim'); y_lim = get(q.axes_top(c), 'YLim'); for n = 1:size(pntCoord{c},1) - if pntCoord{c}(n,2)>y_lim(1) && pntCoord{c}(n,2)y_lim(1) && pntCoord{c}(n,2)x_lim(1) && pntCoord{c}(n,1)