Changeset 883 for trunk/src/series.m

Timestamp:

Mar 13, 2015, 8:19:39 PM (9 years ago)

Author:

sommeria

Message:

bugs corrected in series, transform functions with input parameters introduced, civ/deformation corrected (sign)

File:

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

trunk/src/series.m

@@ -639 +639 @@
     set(handles.series,'UserData',[])%refresh the stored info
 end
-for iview=1:size(InputTable,1)
+nbview=size(InputTable,1);
+for iview=1:nbview
     RootPath=fullfile(InputTable{iview,1},InputTable{iview,2});
     if ~exist(RootPath,'dir')
         i1_series=[];
-        %RootPath=fileparts(RootPath); %will try the upper folder
         RootFile='';
     else %scan the input folder
@@ -662 +662 @@
     end
 end
+
+%% update MinIndex_i and MaxIndex_i if the input table content has been reduced in line nbre
+MinIndex_i_table=get(handles.MinIndex_i,'Data');%retrieve the min indices in the table MinIndex
+set(handles.MinIndex_i,'Data',MinIndex_i_table(1:nbview,:));
+MinIndex_j_table=get(handles.MinIndex_j,'Data');%retrieve the min indices in the table MinIndex
+set(handles.MinIndex_j,'Data',MinIndex_j_table(1:nbview,:));
+MaxIndex_i_table=get(handles.MaxIndex_i,'Data');%retrieve the min indices in the table MinIndex
+set(handles.MaxIndex_i,'Data',MaxIndex_i_table(1:nbview,:));
+MaxIndex_j_table=get(handles.MaxIndex_j,'Data');%retrieve the min indices in the table MinIndex
+set(handles.MaxIndex_j,'Data',MaxIndex_j_table(1:nbview,:));
+PairString=get(handles.PairString,'Data');%retrieve the min indices in the table MinIndex
+set(handles.PairString,'Data',PairString(1:nbview,:));
+TimeTable=get(handles.TimeTable,'Data');%retrieve the min indices in the table MinIndex
+set(handles.TimeTable,'Data',TimeTable(1:nbview,:));
+
 %% enable field and veltype menus, in accordance with the current action
 ActionName_Callback([],[], handles)
@@ -766 +781 @@
     SeriesData.Time={};
 end
-   SeriesData.i1_series(iview+1:end)=[];
+if isfield(SeriesData,'i1_series')
+    SeriesData.i1_series(iview+1:end)=[];
     SeriesData.i2_series(iview+1:end)=[];
     SeriesData.j1_series(iview+1:end)=[];
@@ -773 +789 @@
     SeriesData.FileInfo(iview+1:end)=[];
     SeriesData.Time(iview+1:end)=[];
- InputTable(iview,:)=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}];
+end
+InputTable(iview,:)=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}];
 if iview >1
     set(handles.InputLine,'String',num2str(iview))
@@ -1411 +1428 @@
 Param=read_GUI_series(handles);%displayed parameters
 SeriesData=get(handles.series,'UserData');%hidden parameters
+if isfield(SeriesData,'TransformInput')
+    Param.TransformInput=SeriesData.TransformInput;
+end
 if ~isfield(SeriesData,'i1_series')
     errormsg='The input field series needs to be refreshed: press REFRESH';
@@ -2403 +2423 @@
 end
 set(handles.OutputSubDir,'String',SubDirOut)
+set(handles.OutputSubDir,'BackgroundColor',[1 1 1])% set edit box to white color to indicate refreshment
 set(handles.OutputDirExt,'Visible',OutputDirVisible)
 set(handles.OutputSubDir,'Visible',OutputDirVisible)
@@ -2971 +2992 @@
 set(handles.TransformName,'UserData',TransformPathList);
 
+%% create the function handle of the selected fct
+if ~isempty(TransformName)
+    current_dir=pwd;%current working dir
+    cd(TransformPathList{TransformIndex})
+    transform_handle=str2func(TransformName);
+    cd(current_dir)
+    Field.Action.RUN=0;% indicate that the transform fct is called only to get input param
+    DataOut=feval(transform_handle,Field,[]);% execute the transform fct to get the required conditions
+    if isfield(DataOut,'TransformInput')%  used to add transform parameters at selection of the transform fct
+        SeriesData=get(handles.series,'UserData');
+        SeriesData.TransformInput=DataOut.TransformInput;
+        set(handles.series,'UserData',SeriesData)
+    end
+end
+
 %------------------------------------------------------------------------
 % --- fct activated by the upper bar menu ExportConfig
@@ -3034 +3070 @@
     Param.ActionInput.ConfigSource=filexml;% record the source of config for future info
     SeriesData.ActionInput=Param.ActionInput;
+end
+if isfield(Param,'TransformInput')%  introduce  parameters specific to a transform fct
+    SeriesData.TransformInput=Param.TransformInput;
 end
 if isfield(Param,'ProjObject') %introduce projection object if relevant
@@ -3471 +3510 @@
     set(handles.InputTable,'Data',InputTable);
 end
+set(handles.REFRESH,'BackgroundColor',[1 0 1])% set REFRESH button to magenta color to indicate that input refr