Changeset 824 for trunk/src/series/civ_series.m
 Timestamp:
 Nov 22, 2014, 12:15:53 AM (9 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/src/series/civ_series.m
r822 r824 131 131 PairCiv1=Param.ActionInput.PairIndices.ListPairCiv1; 132 132 if isfield(Param.ActionInput.PairIndices,'ListPairCiv2') 133 PairCiv2=Param.ActionInput.PairIndices.ListPairCiv2; 133 PairCiv2=Param.ActionInput.PairIndices.ListPairCiv2;%string which determines the civ2 pair 134 134 end 135 135 if iview_A==1% if Civ1 is performed … … 157 157 % j2_series_Civ1=j2_series_Civ1(~check_bounds); 158 158 case 'displacement' 159 i1_series_Civ1=Param.ActionInput.OriginIndex*ones(size(i _series{1}));160 i2_series_Civ1=i _series{1};i2_series_Civ2=i_series{1};161 j1_series_Civ1=ones(size(i _series{1}));% first j index is 1159 i1_series_Civ1=Param.ActionInput.OriginIndex*ones(size(i1_series{1})); 160 i2_series_Civ1=i1_series{1};i2_series_Civ2=i1_series{1}; 161 j1_series_Civ1=ones(size(i1_series{1}));% first j index is 1 162 162 if isempty(j1_series_Civ1) 163 j2_series_Civ1=ones(size(i _series{1}));163 j2_series_Civ1=ones(size(i1_series{1})); 164 164 else 165 165 j2_series_Civ1=j1_series_Civ1; … … 170 170 NomTypeNc=NomType; 171 171 case 'shift' 172 i1_series_Civ1=i _series{1};i1_series_Civ2=i_series{1};173 i2_series_Civ1=i _series{1};i2_series_Civ2=i_series{1};174 if isempty(j _series{1})175 j1_series_Civ1=ones(size(i _series{1}));176 j2_series_Civ1=ones(size(i _series{1}));172 i1_series_Civ1=i1_series{1};i1_series_Civ2=i1_series{1}; 173 i2_series_Civ1=i1_series{2};i2_series_Civ2=i1_series{2}; 174 if isempty(j1_series{1}) 175 j1_series_Civ1=ones(size(i1_series{1})); 176 j2_series_Civ1=ones(size(i1_series{2})); 177 177 else 178 j1_series_Civ1=j _series{1};179 j2_series_Civ1=j _series{1};178 j1_series_Civ1=j1_series{1}; 179 j2_series_Civ1=j1_series{2}; 180 180 end 181 181 j1_series_Civ2=j1_series_Civ1; … … 192 192 FrameIndex_B_Civ1=j2_series_Civ1; 193 193 end 194 if ~isempty(PairCiv2) 195 % i1_series_Civ2=i1_series_Civ2(~check_bounds); 196 % i2_series_Civ2=i2_series_Civ2(~check_bounds); 197 % j1_series_Civ2=j1_series_Civ2(~check_bounds); 198 % j2_series_Civ2=j2_series_Civ2(~check_bounds); 194 if isempty(PairCiv2) 195 FrameIndex_A_Civ2=FrameIndex_A_Civ1; 196 FrameIndex_B_Civ2=FrameIndex_B_Civ1; 197 else 199 198 if isempty(j1_series_Civ2) 200 199 FrameIndex_A_Civ2=i1_series_Civ2;
Note: See TracChangeset
for help on using the changeset viewer.