Changeset 833
- Timestamp:
- Dec 6, 2014, 4:40:35 PM (10 years ago)
- Location:
- trunk/src/series
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/series/civ_input.m
r824 r833 66 66 SeriesData=get(hseries,'UserData');% info stored in the GUI series 67 67 68 %% set visibility options: 69 if strcmp(Param.Action.ActionName,'civ_series') 70 % set(handles.Program,'String','civ_series') 71 set(handles.num_MaxDiff,'Visible','on') 68 %% set visibility options depending on the calling function (Param.Action.ActionName): 69 if strcmp(Param.Action.ActionName,'civ_series')||strcmp(Param.Action.ActionName,'stereo_civ') 70 set(handles.num_MaxDiff,'Visible','on') 72 71 set(handles.num_MaxVel,'Visible','on') 73 72 set(handles.title_MaxVel,'Visible','on') … … 84 83 set(handles.CheckDecimal,'Value',0)% desactivate (work in progress) 85 84 end 85 switch Param.Action.ActionName 86 case 'stereo_civ' 87 set(handles.ListCompareMode,'Visible','off') 88 set(handles.PairIndices,'Visible','off') 89 case 'civ_series' 90 set(handles.ListCompareMode,'Visible','on') 91 set(handles.PairIndices,'Visible','on') 92 end 86 93 87 94 %% input file info … … 140 147 return 141 148 end 142 if isfield(SeriesData,'FileType') && numel(SeriesData.FileType)>=2 && strcmp(SeriesData.FileType{end-1},'image') && strcmp(SeriesData.FileType{end},'image')143 set(handles.ListCompareMode,'Value',3)% we compare two image series term to term ('shift')144 set(handles.PairIndices,'Visible','off')145 end149 % if isfield(SeriesData,'FileType') && numel(SeriesData.FileType)>=2 && strcmp(SeriesData.FileType{end-1},'image') && strcmp(SeriesData.FileType{end},'image') 150 % set(handles.ListCompareMode,'Value',3)% we compare two image series term to term ('shift') 151 % set(handles.PairIndices,'Visible','off') 152 % end 146 153 147 154 %% reinitialise menus … … 154 161 155 162 %% prepare the GUI with input parameters 156 set(handles.ListCompareMode,'Visible','on') 163 % 157 164 set(handles.ref_i,'String',num2str(Param.IndexRange.first_i)) 158 165 if isfield(Param.IndexRange,'first_j') … … 258 265 259 266 %% introduce the stored Civ parameters if available (from previous input or ImportConfig in series) 260 if isfield(Param,'ActionInput') 267 if isfield(Param,'ActionInput')&& strcmp(Param.ActionInput.Program,Param.Action.ActionName)% the program fits with the stored data 261 268 fill_GUI(Param.ActionInput,hObject);%fill the GUI with the parameters retrieved from the input Param 262 269 hcheckgrid=findobj(handles.civ_input,'Tag','CheckGrid'); … … 439 446 checkbox(6)=get(handles.CheckPatch2,'Value'); 440 447 % ind_selected=find(checkbox,1); 441 set(handles.PairIndices,'Visible','on')% make the frame PaiIndices visible, choice of the index pairs fo civ448 %set(handles.PairIndices,'Visible','on')% make the frame PaiIndices visible, choice of the index pairs fo civ 442 449 if opening==0 443 450 errormsg=find_netcpair_civ(handles,1); % select the available netcdf files … … 622 629 case 'displacement' 623 630 OriginIndex='on';%define a frame origin for displacement 624 case 'shift'625 if numel(ImageType)==1626 fileinput=uigetfile_uvmat('pick a second file series for synchronous shift',InputTable{check_nc+1});627 if ~isempty(fileinput)628 series( 'display_file_name',hhseries,fileinput,'append')629 end630 631 632 end631 % case 'shift' 632 % if numel(ImageType)==1 633 % fileinput=uigetfile_uvmat('pick a second file series for synchronous shift',InputTable{check_nc+1}); 634 % if ~isempty(fileinput) 635 % series( 'display_file_name',hhseries,fileinput,'append') 636 % end 637 % 638 % 639 % end 633 640 end 634 641 set(handles.num_OriginIndex,'Visible',OriginIndex) -
trunk/src/series/civ_series.m
r824 r833 285 285 %% get timing from the ImaDoc file or input video 286 286 if iview_A~=0 287 XmlFileName=find_imadoc(RootPath_A,SubDir_A,RootFile_A,FileExt_A);288 time=[];289 if ~isempty(XmlFileName)290 XmlData=imadoc2struct(XmlFileName);287 XmlFileName=find_imadoc(RootPath_A,SubDir_A,RootFile_A,FileExt_A); 288 time=[]; 289 if ~isempty(XmlFileName) 290 XmlData=imadoc2struct(XmlFileName); 291 291 if isfield(XmlData,'Time') 292 292 time=XmlData.Time; … … 304 304 end 305 305 end 306 end307 if isempty(time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video'})))% case of video input308 time=zeros(FileInfo_A.NumberOfFrames+1,2);309 time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)';310 TimeSource='video';311 ColorType='truecolor';312 end313 if isempty(time)% time = index i +0.001 index j by default314 %MinIndex_i=min(i1_series_Civ1);315 MaxIndex_i=max(i2_series_Civ1);316 %MinIndex_j=min(j1_series_Civ1);317 MaxIndex_j=max(j2_series_Civ1);318 time=(1:MaxIndex_i)'*ones(1,MaxIndex_j);319 time=time+0.001*ones(MaxIndex_i,1)*(1:MaxIndex_j);320 time=[zeros(1,MaxIndex_j);time];% insert a first line of zeros321 time=[zeros(MaxIndex_i+1,1) time];% insert a first column of zeros322 end306 end 307 if isempty(time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video'})))% case of video input 308 time=zeros(FileInfo_A.NumberOfFrames+1,2); 309 time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)'; 310 TimeSource='video'; 311 ColorType='truecolor'; 312 end 313 if isempty(time)% time = index i +0.001 index j by default 314 %MinIndex_i=min(i1_series_Civ1); 315 MaxIndex_i=max(i2_series_Civ1); 316 %MinIndex_j=min(j1_series_Civ1); 317 MaxIndex_j=max(j2_series_Civ1); 318 time=(1:MaxIndex_i)'*ones(1,MaxIndex_j); 319 time=time+0.001*ones(MaxIndex_i,1)*(1:MaxIndex_j); 320 time=[zeros(1,MaxIndex_j);time];% insert a first line of zeros 321 time=[zeros(MaxIndex_i+1,1) time];% insert a first column of zeros 322 end 323 323 324 if length(FileInfo_A) >1 %case of image with multiple frames325 nbfield=length(FileInfo_A);326 nbfield_j=1;327 end324 if length(FileInfo_A) >1 %case of image with multiple frames 325 nbfield=length(FileInfo_A); 326 nbfield_j=1; 327 end 328 328 end 329 329 -
trunk/src/series/extract_rdvision.m
r826 r833 367 367 OutputDir=fullfile(PathDir,SeqData.sequencename) 368 368 if exist(OutputDir,'dir') 369 errormsg=[Outpu Dir ' already exist, delete it first'];369 errormsg=[OutputDir ' already exist, delete it first']; 370 370 return 371 371 end
Note: See TracChangeset
for help on using the changeset viewer.