Changeset 41 for trunk/src/series.m

Timestamp:

Mar 10, 2010, 11:03:36 AM (14 years ago)

Author:

sommeria

Message:

-relabel_i_j: improve the question dlg box for image transform
-aver_stat,time_series,merge_proj: include modification of field transform and call of set_object.
-series: introduce a browser for set_object
-ima2vol: create volume images (png images of a slice concacened along y) for PIV 3D
-set_object: suppress TITLE, introduce Tooltip helps for parameters
-civ: fixed bug on BATCH sequences

File:

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

trunk/src/series.m

@@ -1295 +1295 @@
         end
 end
-%---------------------------------------------------
+
+%------------------------------------------------------------------------
 % --- Executes on button press in RUN.
-%------------------------------------------------------
 function RUN_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 %read root name and field type
 set(handles.RUN,'BusyAction','queue');
@@ -1311 +1311 @@
 end
 SeriesData=get(handles.figure1,'UserData');
-if isfield(SeriesData,'sethandles')
-    if iscell(SeriesData.sethandles)
-        Series.sethandles=SeriesData.sethandles{1};
-    else
-        Series.sethandles=SeriesData.sethandles;%retrieve the handles of the set_object interface (to define projection objects)
-    end
-end
+% if isfield(SeriesData,'sethandles')
+%     if iscell(SeriesData.sethandles)
+%         Series.sethandles=SeriesData.sethandles{1};
+%     else
+%         Series.sethandles=SeriesData.sethandles;%retrieve the handles of the set_object interface (to define projection objects)
+%     end
+% end
 
 %reinitiate waitbar position
@@ -1358 +1358 @@
 Series.CoordType='';%default
 if isequal(menu_coord_state,'on')
-    menu_coord=get(handles.transform_fct,'String');
+%     menu_coord=get(handles.transform_fct,'String');
     menu_index=get(handles.transform_fct,'Value');
-    Series.CoordType=menu_coord{menu_index};
-end
-Series.hseries=get(hObject,'Parent');
-if isequal(get(handles.ParamVal,'Visible'),'on')
-    ParamKey=get(handles.ParamKey,'String');
-    if ischar(ParamKey)
-        ParamKey{1}=ParamKey;
-    end
-    ParamString=get(handles.ParamVal,'String');
-    if ischar(ParamString)
-        for ilist=1:size(ParamString,1)
-            ParamVal{ilist}=ParamString(ilist,:);
-        end
-    else
-        ParamVal=ParamString;
-    end   
-end
+    transform_list=get(handles.transform_fct,'UserData');
+    Series.transform_fct=transform_list{menu_index};% transform function handles
+end
+Series.hseries=handles.figure1; % handles to the series GUI
+% if isequal(get(handles.ParamVal,'Visible'),'on')
+%     ParamKey=get(handles.ParamKey,'String');
+%     if ischar(ParamKey)
+%         ParamKey{1}=ParamKey;
+%     end
+%     ParamString=get(handles.ParamVal,'String');
+%     if ischar(ParamString)
+%         for ilist=1:size(ParamString,1)
+%             ParamVal{ilist}=ParamString(ilist,:);
+%         end
+%     else
+%         ParamVal=ParamString;
+%     end   
+% end
 
 %read the set of field numbers
@@ -1482 +1483 @@
 end
 
-% RUN RUN'
+% defining the ACTION function handle
 path_series=which('series');
 list_path=get(handles.ACTION,'UserData');
@@ -1489 +1490 @@
 if ~isequal(fct_path,path_series)
     eval(['spath=which(''' action ''');']) %spath = current path of the selected function ACTION
-    if ~isequal(spath,fct_path)& exist(fct_path,'dir')
+    if ~exist(fct_path,'dir')
+        msgbox_uvmat('ERROR',['The prescibed function path ' fct_path ' does not exist'])
+        return
+    end
+    if ~isequal(spath,fct_path)
         addpath(fct_path)% add the prescribed path if not the current one
     end
 end
-% fct_path
-eval(['h_fun=@' action ';'])
+eval(['h_fun=@' action ';'])%create a function handle for ACTION
 if ~isequal(fct_path,path_series)
         rmpath(fct_path)% add the prescribed path if not the current one    
 end
 
+% RUN ACTION
 Series.Action=action;%name of the processing programme
 set(handles.RUN,'BackgroundColor',[0.831 0.816 0.784])
 drawnow
 if length(RootPath)>1
-%    feval(action,num_i1_cell,num_i2_cell,num_j1_cell,num_j2_cell,Series);
     h_fun(num_i1_cell,num_i2_cell,num_j1_cell,num_j2_cell,Series);
 else
     h_fun(num_i1,num_i2,num_j1,num_j2,Series);
-%     feval(action,num_i1,num_i2,num_j1,num_j2,Series);
 end
 set(handles.RUN,'BackgroundColor',[1 0 0])
@@ -1525 +1528 @@
 % saveas(gcbf,namefigfull);%save the interface with name namefigfull (A CHANGER EN FICHIER  .xml)
 
-%----------------------------------------------------
+%------------------------------------------------------------------------
 function STOP_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 set(handles.RUN, 'BusyAction','cancel')
 set(handles.RUN,'BackgroundColor',[1 0 0])
 
-%----------------------------------------------
-
-%----------------------------------------------------
+
+%------------------------------------------------------------------------
 function first_i_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 last_i_Callback(hObject, eventdata, handles)
 
-%----------------------------------------------
+%------------------------------------------------------------------------
 function last_i_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 %     hseries=get(handles.last_i,'parent');
 first_i=str2num(get(handles.first_i,'String'));
@@ -1550 +1555 @@
 displ_time(handles,SeriesData.Time{1});
 
-%-------------------------------------------------------
+%------------------------------------------------------------------------
 function first_j_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
  last_j_Callback(hObject, eventdata, handles)
 
-%-------------------------------------------------------
+%------------------------------------------------------------------------
 function last_j_Callback(hObject, eventdata, handles)
-   % hseries=get(handles.last_i,'parent');
+%------------------------------------------------------------------------
 first_j=str2num(get(handles.first_j,'String'));
 last_j=str2num(get(handles.last_j,'String'));
 ref_j=ceil((first_j+last_j)/2);
 set(handles.ref_j,'String', num2str(ref_j))
-
 ref_j_Callback(hObject, eventdata, handles)
 SeriesData=get(handles.figure1,'UserData');
@@ -1570 +1575 @@
 
 
-
-
-%-------------------------------------------------------
+%------------------------------------------------------------------------
 function ref_i_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 mode_list=get(handles.mode,'String');
 mode_value=get(handles.mode,'Value');
@@ -1593 +1597 @@
 end
 
-%----------------------------------------------------
+%------------------------------------------------------------------------
 function ref_j_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 mode_list=get(handles.mode,'String');
 mode_value=get(handles.mode,'Value');
@@ -1611 +1616 @@
 end
 
-%----------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on selection change in ACTION.
 function ACTION_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 global nb_builtin
 list_ACTION=get(handles.ACTION,'String');% list menu fields
@@ -1710 +1716 @@
 set(handles.transform_fct,'Enable','off')
 %set the displayed GUI item needed for input parameters
-%list_input=feval(ACTION);% input list asked by the selected function
 if ~isequal(path_series,PathName)
     addpath(PathName)
@@ -1720 +1725 @@
 
 varargout=h_function();
-%varargout=feval(ACTION);% input list asked by the selected function
 Param_list={};
-% RootPath=get(handles.RootPath,'String');
-% RootFile=get(handles.RootFile,'String');
 
 %nb_series=length(RootFile);
@@ -1839 +1841 @@
 end
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on selection change in FieldMenu.
-%-------------------------------------------------------------------
 function FieldMenu_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 field_str=get(handles.FieldMenu,'String');
 field_index=get(handles.FieldMenu,'Value');
@@ -1868 +1869 @@
 end
 
-%------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on selection change in FieldMenu_1.
-%-----------------------------------------------------
 function FieldMenu_1_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 field_str=get(handles.FieldMenu_1,'String');
 field_index=get(handles.FieldMenu_1,'Value');
@@ -1896 +1897 @@
      update_menu(handles.FieldMenu_1,scalar)
 end   
-
-
-% %group the variables (fields of 'FieldData') in cells of variables with the same dimensions
-% %%%%%%%%%%%%%%%%%%%%%%% Function independante maintenant
-% %-----------------------------------------------------------------
-% [CellVarIndex,NbDim,VarTypeCell]=find_field_indices(Data{1});
-% %LOOP ON GROUPS OF VARIABLES SHARING THE SAME DIMENSIONS
-% % CellVarIndex=cells of variable index arrays
-% ivar_new=0; % index of the current variable in the projected field
-% icoord=0;
-% for icell=1:length(CellVarIndex)
-%     if NbDim(icell)==1
-%         continue
-%     end
-%     VarIndex=CellVarIndex{icell};%  indices of the selected variables in the list FieldData.ListVarName
-%     VarType=VarTypeCell{icell};
-%     ivar_X=VarType.coord_x;
-%     ivar_Y=VarType.coord_y;
-%     ivar_FF=VarType.errorflag;
-%     if isempty(ivar_X)
-%         test_grid=1;%test for input data on regular grid (e.g. image)coordinates
-%     else
-%         if length(ivar_Y)~=1
-%                 warndlg_uvmat('y coordinate missing in proj_field.m','ERROR')
-%                 return
-%         end
-%         test_grid=0;
-%     end
-% %    DimIndices=Data{1}.VarDimIndex{VarIndex(1)};%indices of the dimensions of the first variable (common to all variables in the cell)
-%     %case of input fields with unstructured coordinates
-%     if ~test_grid
-%         for ivar=VarIndex
-%             VarName=MergeData.ListVarName{ivar};
-%             for iview=1:nbview
-%                 eval(['MergeData.' VarName '=[MergeData.' VarName '; Data{iview}.' VarName ';'])
-%             end
-%         end
-%     %case of fields defined on a structured  grid 
-%     else  
-% %        DimValue=MergeData.DimValue(DimIndices);%set of dimension values
-%         testFF=0;
-%         for iview=2:nbview
-% %             if ~isequal(DimValue,Data{iview}.DimValue(DimIndices))
-% %                 MergeData.Txt='ERROR: attempt at merging structured fields with different sizes';
-% %                 return
-% %             end
-%             for ivar=VarIndex
-%                 VarName=MergeData.ListVarName{ivar};
-%                 if isfield(MergeData,'VarAttribute')
-%                     if length(MergeData.VarAttribute)>=ivar && isfield(MergeData.VarAttribute{ivar},'Role') && isequal(MergeData.VarAttribute{ivar}.Role,'errorflag')
-%                         testFF=1;
-%                     end
-%                 end
-%                 eval(['MergeData.' VarName '=MergeData.' VarName '+ Data{iview}.' VarName ';'])
-%             end
-%         end
-%         if testFF
-%             nbaver=nbview-MergeData.FF;
-%             indgood=find(nbaver>0);
-%             for ivar=VarIndex
-%                 VarName=MergeData.ListVarName{ivar};
-%                 eval(['MergeData.' VarName '(indgood)=double(MergeData.' VarName '(indgood))./nbaver(indgood);'])
-%             end 
-%         else
-%             for ivar=VarIndex
-%                 VarName=MergeData.ListVarName{ivar};
-%                 eval(['MergeData.' VarName '=double(MergeData.' VarName ')./nbview;'])
-%             end    
-%         end
-%     end
-% end
-%     
 
 %-----------------------------
@@ -2045 +1974 @@
 end
 
- 
-%-----------------------------------------------------------
-% find the times corresponding to the first and last indices of a series
-%
+%------------------------------------------------------------------------
+% ---- find the times corresponding to the first and last indices of a series
 function displ_time(handles,times)
+%------------------------------------------------------------------------
 hseries=get(handles.last_i,'parent');
 SeriesData=get(hseries,'UserData');%
@@ -2146 +2074 @@
 set(handles.time_last,'String',time_last_cell);
 
-%-------------------------------------------------------------------- 
-% --- Executes on selection change in VelTypeMenu.
-function VelTypeMenu_Callback(hObject, eventdata, handles)
-% VelTypeList=get(handles.VelTypeMenu,'String');
-% VelTypeIndex=get(handles.VelTypeMenu,'Value');
-% VelTypeCell=get(handles.VelType,'String');
-% VelTypeCell{1}=VelTypeList{VelTypeIndex};
-% set(handles.VelType,'String',VelTypeCell)
-
-
-%--------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on button press in GetObject.
 function GetObject_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 hseries=get(handles.GetObject,'parent');
 SeriesData=get(hseries,'UserData');
@@ -2169 +2088 @@
          [SeriesData.hset_object,SeriesData.sethandles]=set_object(DataInit); %open the set_object interface
      else
-         DataInit.TITLE='POINTS';%default option
-         [SeriesData.hset_object,SeriesData.sethandles]=set_object(DataInit); %open the set_object interface
+         %get the object file 
+         defaultname=get(handles.RootPath,'String');
+        [FileName, PathName, filterindex] = uigetfile( ...
+       {'*.xml;*.mat', ' (*.xml,*.mat)';
+       '*.xml',  '.xml files '; ...
+        '*.mat',  '.mat matlab files '}, ...
+        'Pick a file',defaultname{1});
+        fileinput=[PathName FileName];%complete file name 
+        testblank=findstr(fileinput,' ');%look for blanks
+        if ~isempty(testblank)
+            msgbox_uvmat('ERROR','forbidden input file name: contain blanks')
+            return
+        end
+        sizf=size(fileinput);
+        if (~ischar(fileinput)||~isequal(sizf(1),1)),return;end
+        %read the file
+        t=xmltree(fileinput);
+        data=convert(t);
+        if ~isfield(data,'Style')
+             data.Style='points';
+        end
+        if ~isfield(data,'ProjMode')
+             data.ProjMode='projection';
+        end
+        transform_menu=get(handles.transform_fct,'String');
+        ichoice=get(handles.transform_fct,'Value');
+        if isequal(transform_menu{ichoice},'px');
+            data.CoordType='px';
+        else
+            data.CoordType='phys';
+        end
+        data.desable_plot=1;
+        [SeriesData.hset_object,SeriesData.sethandles]=set_object(data);% call the set_object interface
      end 
 else
     set(handles.GetObject,'BackgroundColor',[0 1 0])%put activated buttons to green
-    if isfield(SeriesData,'hset_object')&& ishandle(SeriesData.hset_object)
-        close(SeriesData.hset_object)
-    end
+%     if isfield(SeriesData,'hset_object')&& ishandle(SeriesData.hset_object)
+%         close(SeriesData.hset_object)
+%     end
 end
 set(hseries,'UserData',SeriesData)
@@ -2184 +2134 @@
 value=get(handles.GetMask,'Value');
 if value
-    errordlg('not implemented yet')
+    msgbox_uvmat('ERROR','not implemented yet')
 end
 %--------------------------------------------------------------
 
-%--------------------------------------------------------------------------
+%-------------------------------------------------------------------
 %'uv_ncbrowser': interactively calls the netcdf file browser 'get_field.m'
 function ncbrowser_uvmat(hObject, eventdata)
+%-------------------------------------------------------------------
      bla=get(gcbo,'String');
      ind=get(gcbo,'Value');
@@ -2198 +2149 @@
      get_field(filename)
 
-% --------------------------------------------------------------------
+% ------------------------------------------------------------------
 function MenuHelp_Callback(hObject, eventdata, handles)
-
+%-------------------------------------------------------------------
 path_to_uvmat=which ('uvmat');% check the path of uvmat
 pathelp=fileparts(path_to_uvmat);
@@ -2210 +2161 @@
 end
 
-
+%-------------------------------------------------------------------
 % --- Executes on selection change in transform_fct.
 function transform_fct_Callback(hObject, eventdata, handles)
-
+%-------------------------------------------------------------------
 global nb_transform