Changeset 85 for trunk/src/civ.m
- Timestamp:
- Apr 25, 2010, 9:46:07 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/civ.m
r84 r85 528 528 end 529 529 if isfield(XmlData,'Time') 530 time=XmlData.Time 530 time=XmlData.Time; 531 531 nbfield=size(time,1); 532 532 nburst=size(time,2); … … 2149 2149 else 2150 2150 msgbox_uvmat('ERROR','for BATCH option, UBC file names, beginning by \\, are needed'); 2151 set(handles.BATCH, 'Enable','On')2152 set(handles.BATCH,'BackgroundColor',[1 0 0])2151 % set(handles.BATCH, 'Enable','On') 2152 % set(handles.BATCH,'BackgroundColor',[1 0 0]) 2153 2153 return 2154 2154 end … … 2159 2159 [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=... 2160 2160 set_civ_filenames(handles,compare,box_test); 2161 2161 if isempty(filecell) 2162 return 2163 end 2162 2164 %choice of batch priority 2163 2165 ind_answer=2; … … 2209 2211 nbslice_mask=get(handles.mask_fix1,'UserData'); % get the number of slices (= number of masks) 2210 2212 %%%%%%%%%%%%%COMPLETER LE PROGRAMME FIX 2211 % inf_sup=get(handles.inf_sup1,'Value'); 2213 % inf_sup=get(handles.inf_sup1,'Value');80 2212 2214 % fileref=get(handles.ref_fix1,'String'); 2213 2215 % refpath=get(handles.ref_fix1,'UserData'); … … 2680 2682 display(['!' filename_bat ' &']) 2681 2683 end 2682 % if(isunix)2683 % cmdtodo=['. ' filename_bat ];%removed for Mathieu tests %' && rm -f ' filename_bat] ;2684 % else2685 % cmdtodo=[filename_bat];%removed for Mathieu tests %' && del /F /Q ' filename_bat' ;2686 % end2687 % count= fprintf(p1,'%s\n', cmdtodo);2688 2684 end 2689 2685 end 2690 2686 end 2691 % if ~sge 2692 % fclose(p1); 2693 % fclose(p0); 2694 % delete(name_lock); 2695 % end 2696 2697 set(handles.BATCH, 'Enable','On') 2698 set(handles.BATCH,'BackgroundColor',[1 0 0]) 2687 % set(handles.BATCH, 'Enable','On') 2688 % set(handles.BATCH,'BackgroundColor',[1 0 0]) 2699 2689 2700 2690 %save interface state … … 2740 2730 set_civ_filenames(handles,compare,box_test) 2741 2731 %------------------------------------------------------------------------ 2732 filecell=[];%default 2742 2733 %get the filename root, nomenclature and numbers 2743 2734 filebase=get(handles.RootName,'String'); … … 3048 3039 set(handles.RUN, 'Enable','On') 3049 3040 set(handles.RUN,'BackgroundColor',[1 0 0]) 3050 set(handles.BATCH, 'Enable','On')3051 set(handles.BATCH,'BackgroundColor',[1 0 0])3052 filecell=[];3041 % set(handles.BATCH, 'Enable','On') 3042 % set(handles.BATCH,'BackgroundColor',[1 0 0]) 3043 filecell=[]; 3053 3044 cd(currentdir) 3054 3045 return … … 3160 3151 set(handles.RUN, 'Enable','On') 3161 3152 set(handles.RUN,'BackgroundColor',[1 0 0]) 3162 set(handles.BATCH, 'Enable','On')3163 set(handles.BATCH,'BackgroundColor',[1 0 0])3153 % set(handles.BATCH, 'Enable','On') 3154 % set(handles.BATCH,'BackgroundColor',[1 0 0]) 3164 3155 cd(currentdir) 3165 3156 return … … 5001 4992 path_to_uvmat=which ('uvmat');% check the path of uvmat 5002 4993 pathelp=fileparts(path_to_uvmat); 5003 helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html') 4994 helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html'); 5004 4995 if isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package') 5005 4996 else
Note: See TracChangeset
for help on using the changeset viewer.