Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 8f3dac89 authored by Elian Dib's avatar Elian Dib
Browse files

Scaling renamed range, type renamed class

parent 8afa167e
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ classdef Viewer < handle
data
name = 'LightField'
state = 'uv'
scaling = 'Type'
range = 'class'
curView = [1,1]
curPos = [1,1]
end
......@@ -25,11 +25,11 @@ classdef Viewer < handle
end
properties(Hidden)
typeRange
classRange
currentRange
allRange
validStates = {'xy','uv','ux','vy'};
validScalings = {'Type','CurrentView','AllViews'};
validRanges = {'class','current','all'};
end
methods
......@@ -39,7 +39,7 @@ classdef Viewer < handle
p.addRequired('data');
p.addParameter('name' , obj.name ,@ischar);
p.addParameter('state', obj.state ,@(state) any(strcmp(state,obj.validStates)));
p.addParameter('scaling', obj.scaling ,@(scaling) any(strcmp(scaling,obj.validScalings)));
p.addParameter('range', obj.range ,@(range) any(strcmpi(range,obj.validRanges)));
p.parse(data,varargin{:});
......@@ -54,7 +54,7 @@ classdef Viewer < handle
addlistener(obj,'curView' ,'PostSet' ,@(src,evnt) obj.updateFigure);
addlistener(obj,'curPos' ,'PostSet' ,@(src,evnt) obj.updateFigure);
addlistener(obj,'scaling' ,'PostSet' ,@(src,evnt) obj.updateFigure);
addlistener(obj,'range' ,'PostSet' ,@(src,evnt) obj.updateFigure);
addlistener(obj,'name' ,'PostSet' ,@(src,evnt) obj.updateFigure);
obj.setRanges();
......@@ -83,14 +83,14 @@ classdef Viewer < handle
end
function range_ = get.range_(obj)
range_ = [0 1];
switch obj.scaling
case 'Type'
range_ = obj.typeRange;
case 'CurrentView'
switch lower(obj.range)
case 'class'
range_ = obj.classRange;
case 'current'
u=obj.curView(1); v=obj.curView(2);
range_ = obj.currentRange{u,v};
case 'AllViews'
case 'all'
range_ = obj.allRange;
otherwise
end
......@@ -121,13 +121,13 @@ classdef Viewer < handle
methods(Hidden)
function setRanges(obj)
obj.typeRange = getrangefromclass(obj.data);
obj.classRange = getrangefromclass(obj.data);
cMin = cellfun(@(slice) min(slice(:)),obj.slices);
cMax = cellfun(@(slice) max(slice(:)),obj.slices);
cMin(isnan(cMin)) = obj.typeRange(1);
cMax(isnan(cMax)) = obj.typeRange(2);
cMin(isnan(cMin)) = obj.classRange(1);
cMax(isnan(cMax)) = obj.classRange(2);
minmax = cMin>=cMax;
cMin(minmax) = cMax(minmax)-1;
......@@ -176,9 +176,9 @@ classdef Viewer < handle
case 'rightarrow'
curView_(2) = curView_(2)+1;
case 'space'
rangeInd = find(strcmp(obj.scaling,obj.validScalings));
rangeInd = find(strcmp(obj.range,obj.validRanges));
rangeInd = mod(rangeInd,3)+1;
obj.scaling = obj.validScalings{rangeInd};
obj.range = obj.validRanges{rangeInd};
end
sz = size(obj.slices);
obj.curView = min(sz,max([1,1],curView_));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment