Changeset 393 for trunk/src

Timestamp:

Apr 24, 2012, 10:45:02 AM (13 years ago)

Author:

sommeria

Message:

bugs corrected in series

Location:

trunk/src

Files:

• get_file_series.m (modified) (2 diffs)
• series.m (modified) (2 diffs)

trunk/src/get_file_series.m

@@ -67 +67 @@
 function [i1_series,i2_series,j1_series,j2_series]=find_file_indices(ref_i,ref_j,num1,num2,mode)
 i1_series=ref_i;%default
-i2_series=[];
-j2_series=[];
-if isempty(mode)
-    i1_series=ref_i;
-    j1_series=ref_j;
-    return
-end
 j1_series=[];
 if ~isempty(ref_j)
@@ -79 +72 @@
     j1_series=meshgrid(ref_i,ones(size(ref_j)));
 end
+i2_series=i1_series;
+j2_series=j1_series;
 
 switch mode
-    case 'Di='  % ='series(Di)')
-        i2_series=i1_series;
+    case 'Di='  %  case 'series(Di)')
         i1_series=i1_series-num1;
         i2_series=i2_series+num2;
-    case {'Dj=','-'}            %(mode,'series(Dj)')||isequal (mode,'bursts')
-        if isequal(mode,'-') %case of bursts (png_old or png_2D)
-           j1_series=num1*ones(size(i1_series));
-           j2_series=num2*ones(size(i1_series));
-        else
-            j2_series=j1_series;
-            j1_series=j1_series-num1;
-            j2_series=j2_series+num2;
-        end
+    case 'Dj='  %  case 'series(Dj)'
+        j1_series=j1_series-num1;
+        j2_series=j2_series+num2;
+    case '-'  % case 'bursts'
+        j1_series=num1*ones(size(i1_series));
+        j2_series=num2*ones(size(i1_series));
 end

trunk/src/series.m

@@ -891 +891 @@
 Series.PathProject=get(handles.PathCampaign,'String');
 % InputTable=get(handles.InputTable,'Data');
-RootPath=Series.InputTable(:,1);
-SubDir=Series.InputTable(:,2);
-RootFile=Series.InputTable(:,3);
-NomType=Series.InputTable(:,4);
-FileExt=Series.InputTable(:,5);
+% RootPath=Series.InputTable(:,1);
+% SubDir=Series.InputTable(:,2);
+% RootFile=Series.InputTable(:,3);
+% NomType=Series.InputTable(:,4);
+% FileExt=Series.InputTable(:,5);
 % if isempty(SeriesData)
 %     msgbox_uvmat('ERROR','no input file series')
@@ -925 +925 @@
     menu_index=get(handles.transform_fct,'Value');
     transform_list=get(handles.transform_fct,'UserData');
-    Series.transform_fct=transform_list{menu_index};% transform function handles
+    Series.FieldTransform.fct_handle=transform_list{menu_index};% transform function handles
 end