Changeset 393


Ignore:
Timestamp:
Apr 24, 2012, 10:45:02 AM (9 years ago)
Author:
sommeria
Message:

bugs corrected in series

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/get_file_series.m

    r391 r393  
    6767function [i1_series,i2_series,j1_series,j2_series]=find_file_indices(ref_i,ref_j,num1,num2,mode)
    6868i1_series=ref_i;%default
    69 i2_series=[];
    70 j2_series=[];
    71 if isempty(mode)
    72     i1_series=ref_i;
    73     j1_series=ref_j;
    74     return
    75 end
    7669j1_series=[];
    7770if ~isempty(ref_j)
     
    7972    j1_series=meshgrid(ref_i,ones(size(ref_j)));
    8073end
     74i2_series=i1_series;
     75j2_series=j1_series;
    8176
    8277switch mode
    83     case 'Di='  % ='series(Di)')
    84         i2_series=i1_series;
     78    case 'Di='  %  case 'series(Di)')
    8579        i1_series=i1_series-num1;
    8680        i2_series=i2_series+num2;
    87     case {'Dj=','-'}            %(mode,'series(Dj)')||isequal (mode,'bursts')
    88         if isequal(mode,'-') %case of bursts (png_old or png_2D)
    89            j1_series=num1*ones(size(i1_series));
    90            j2_series=num2*ones(size(i1_series));
    91         else
    92             j2_series=j1_series;
    93             j1_series=j1_series-num1;
    94             j2_series=j2_series+num2;
    95         end
     81    case 'Dj='  %  case 'series(Dj)'
     82        j1_series=j1_series-num1;
     83        j2_series=j2_series+num2;
     84    case '-'  % case 'bursts'
     85        j1_series=num1*ones(size(i1_series));
     86        j2_series=num2*ones(size(i1_series));
    9687end
  • trunk/src/series.m

    r376 r393  
    891891Series.PathProject=get(handles.PathCampaign,'String');
    892892% InputTable=get(handles.InputTable,'Data');
    893 RootPath=Series.InputTable(:,1);
    894 SubDir=Series.InputTable(:,2);
    895 RootFile=Series.InputTable(:,3);
    896 NomType=Series.InputTable(:,4);
    897 FileExt=Series.InputTable(:,5);
     893% RootPath=Series.InputTable(:,1);
     894% SubDir=Series.InputTable(:,2);
     895% RootFile=Series.InputTable(:,3);
     896% NomType=Series.InputTable(:,4);
     897% FileExt=Series.InputTable(:,5);
    898898% if isempty(SeriesData)
    899899%     msgbox_uvmat('ERROR','no input file series')
     
    925925    menu_index=get(handles.transform_fct,'Value');
    926926    transform_list=get(handles.transform_fct,'UserData');
    927     Series.transform_fct=transform_list{menu_index};% transform function handles
     927    Series.FieldTransform.fct_handle=transform_list{menu_index};% transform function handles
    928928end
    929929
Note: See TracChangeset for help on using the changeset viewer.