Changeset 85 for trunk/src/civ.m

Timestamp:

Apr 25, 2010, 9:46:07 PM (14 years ago)

Author:

sommeria

Message:

uvmat;fig: cleaning out of buttons for mask record
view_field, write_plot_param: improve plot by view_field (projection)
uvmat: bug fixing for yellow coloring of buttons, improve switch from velocity to images
find_field_indices: bug fix for NbDim?
name_generator: help comments improved
civ: bugs corrected for BATCH button colouring

File:

• trunk/src/civ.m (modified) (9 diffs)

trunk/src/civ.m

@@ -528 +528 @@
     end
     if isfield(XmlData,'Time')
-        time=XmlData.Time
+        time=XmlData.Time;
         nbfield=size(time,1);
         nburst=size(time,2);
@@ -2149 +2149 @@
     else
          msgbox_uvmat('ERROR','for BATCH option, UBC file names, beginning by \\, are needed');
-         set(handles.BATCH, 'Enable','On')
-         set(handles.BATCH,'BackgroundColor',[1 0 0])
+%          set(handles.BATCH, 'Enable','On')
+%          set(handles.BATCH,'BackgroundColor',[1 0 0])
          return
     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]=...
        set_civ_filenames(handles,compare,box_test);
-
+if isempty(filecell)
+    return
+end
 %choice of batch priority
 ind_answer=2;
@@ -2209 +2211 @@
     nbslice_mask=get(handles.mask_fix1,'UserData'); % get the number of slices (= number of masks)
     %%%%%%%%%%%%%COMPLETER LE PROGRAMME FIX
-%     inf_sup=get(handles.inf_sup1,'Value');
+%     inf_sup=get(handles.inf_sup1,'Value');80
 %     fileref=get(handles.ref_fix1,'String');
 %     refpath=get(handles.ref_fix1,'UserData');
@@ -2680 +2682 @@
               display(['!' filename_bat ' &'])
             end
-%             if(isunix)
-%               cmdtodo=['. ' filename_bat ];%removed for Mathieu tests %' && rm -f ' filename_bat] ;
-%             else
-%                cmdtodo=[filename_bat];%removed for Mathieu tests %' && del /F /Q ' filename_bat' ;
-%             end
-%             count= fprintf(p1,'%s\n', cmdtodo);
         end
      end
 end
-% if ~sge
-%     fclose(p1);
-%     fclose(p0);
-%     delete(name_lock);
-% end
-
-set(handles.BATCH, 'Enable','On')
-set(handles.BATCH,'BackgroundColor',[1 0 0])
+% set(handles.BATCH, 'Enable','On')
+% set(handles.BATCH,'BackgroundColor',[1 0 0])
 
 %save interface state
@@ -2740 +2730 @@
     set_civ_filenames(handles,compare,box_test)
 %------------------------------------------------------------------------
+filecell=[];%default
 %get the filename root, nomenclature and numbers
 filebase=get(handles.RootName,'String');
@@ -3048 +3039 @@
                         set(handles.RUN, 'Enable','On')
                         set(handles.RUN,'BackgroundColor',[1 0 0])
-                        set(handles.BATCH, 'Enable','On')
-                    set(handles.BATCH,'BackgroundColor',[1 0 0])
-                    filecell=[];
+%                         set(handles.BATCH, 'Enable','On')
+%                         set(handles.BATCH,'BackgroundColor',[1 0 0])
+                        filecell=[];
                         cd(currentdir)
                         return
@@ -3160 +3151 @@
                         set(handles.RUN, 'Enable','On')
                         set(handles.RUN,'BackgroundColor',[1 0 0])
-                               set(handles.BATCH, 'Enable','On')
-                    set(handles.BATCH,'BackgroundColor',[1 0 0])
+%                                set(handles.BATCH, 'Enable','On')
+%                     set(handles.BATCH,'BackgroundColor',[1 0 0])
                         cd(currentdir)
                         return
@@ -5001 +4992 @@
 path_to_uvmat=which ('uvmat');% check the path of uvmat
 pathelp=fileparts(path_to_uvmat);
-helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html')
+helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
 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')
 else