Changeset 100 for trunk/src


Ignore:
Timestamp:
Jun 8, 2010, 8:19:10 PM (11 years ago)
Author:
sommeria
Message:

nc2struct.m: convert variables to double after reading (civ gives single)
series.m: prob of initialisation solved
civ.m: gestion of button 'experimental' for new patch

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src

    • Property svn:ignore
      •  

        old new  
         1@xmltree
         2PARAM.xml
        13PARAM_WIN.xml
         4XML_SCHEMAS
         5bin
         6toolbox_calib
         7uvmat_doc
  • trunk/src/civ.m

    r97 r100  
    21372137    end
    21382138end
    2139 test_interp=get(handles.test_interp,'Value');
    2140 if ~test_interp && isfield(sparam,'PatchBin')
     2139%test_interp=get(handles.test_interp,'Value');
     2140test_interp=0;
     2141if  isfield(sparam,'PatchBin')
    21412142    if ~exist(sparam.PatchBin,'file')
    21422143         sparam.PatchBin=fullfile(path_UVMAT,sparam.PatchBin);
    21432144    end
    21442145end
    2145 if test_interp && isfield(sparam,'PatchNewBin')
    2146     if ~exist(sparam.PatchNewBin,'file')
    2147          sparam.PatchNewBin=fullfile(path_UVMAT,sparam.PatchNewBin);
    2148     end
    2149 end
     2146% if test_interp && isfield(sparam,'PatchNewBin')
     2147%     if ~exist(sparam.PatchNewBin,'file')
     2148%          sparam.PatchNewBin=fullfile(path_UVMAT,sparam.PatchNewBin);
     2149%     end
     2150% end
    21502151if isfield(sparam,'FixBin')
    21512152%     fixBin=sparam.FixBin;
     
    45034504set(handles.nx_patch1_title,'Visible','on')
    45044505set(handles.ny_patch1_title,'Visible','on')
    4505 if ~isempty(patch_newBin)
    4506     set(handles.test_interp,'Visible','on');
    4507 end
     4506% if ~isempty(patch_newBin)
     4507%     set(handles.test_interp,'Visible','on');
     4508% end
    45084509set(handles.get_gridpatch1,'Visible','on')
    45094510set(handles.grid_patch1,'string','none');
     
    45244525set(handles.nx_patch1_title,'Visible','off')
    45254526set(handles.ny_patch1_title,'Visible','off')
    4526 set(handles.test_interp,'Visible','off')
     4527%set(handles.test_interp,'Visible','off')
    45274528set(handles.get_gridpatch1,'Visible','off')
    45284529set(handles.grid_patch1,'Visible','off')
  • trunk/src/nc2struct.m

    r89 r100  
    256256                VarName(indstr)=[];
    257257            end
    258             eval(['Data.' VarName '=netcdf.getVar(nc,var_index(ivar)-1);'])%read the variable data
     258            eval(['Data.' VarName '=double(netcdf.getVar(nc,var_index(ivar)-1));'])%read the variable data
    259259            %eval(['siz=size(Data.' VarName ');'])
    260260           % if numel(siz)<=2
  • trunk/src/series.m

    r89 r100  
    702702    nb_field2=max(floor((max(num_j1)+max(num_j2))/2));
    703703end
    704 if isempty(nb_field)
     704if isempty(nb_field)||isnan(nb_field)
    705705    nb_field_str='?';
    706706    nb_field_str2='?';
     
    12621262            num1=num1(ind);       
    12631263        end
    1264         set(handles.first_i,'String',num2str(num1(1)));
    1265         set(handles.last_i,'String',num2str(num1(end)));
     1264        if ~isempty(num1)
     1265            set(handles.first_i,'String',num2str(num1(1)));
     1266            set(handles.last_i,'String',num2str(num1(end)));
     1267        end
    12661268        testupdate=1;
    12671269        elseif isequal(mode,'series(Dj)')
Note: See TracChangeset for help on using the changeset viewer.