Changeset 773

Timestamp:

May 10, 2014, 12:49:30 AM (11 years ago)

Author:

sommeria

Message:

help web link corrected

Location:

trunk/src

Files:

• geometry_calib.m (modified) (1 diff)
• series.fig (modified) (previous)
• series.m (modified) (5 diffs)
• set_object.m (modified) (1 diff)
• uvmat.m (modified) (9 diffs)

trunk/src/geometry_calib.m

@@ -805 +805 @@
 % --------------------------------------------------------------------
 function MenuHelp_Callback(hObject, eventdata, handles)
-web('http://servforge.legi.grenoble-inp.fr/projects/soft-uvmat/wiki/UvmatHelp#a8-Geometriccalibration')
-% path_to_uvmat=which('uvmat');% check the path of uvmat
-% pathelp=fileparts(path_to_uvmat);
-% helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
-% if isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package')
-% else
-%    addpath (fullfile(pathelp,'uvmat_doc'))
-%    web([helpfile '#geometry_calib'])
-% end
+web('http://servforge.legi.grenoble-inp.fr/projects/soft-uvmat/wiki/UvmatHelp#GeometryCalib')
 
 % --------------------------------------------------------------------

trunk/src/series.m

@@ -241 +241 @@
 
 %% introduce the input file name(s) if defined from input Param, TODO: avoid the file checking if Param.i1_series defined
-if isfield(Param,'FileName')&&~isempty(Param.FileName)
+if isfield(Param,'InputFile')
+    
     InputTable={};
+    %% fill the list of file series
+    SeriesData=Param.HiddenData;
+    InputTable=[{Param.InputFile.RootPath},{Param.InputFile.SubDir},{Param.InputFile.RootFile},{Param.InputFile.NomType},{Param.InputFile.FileExt}];
+    TimeTable=[{[]},{[]},{[]},{[]}];
+    if isfield(Param.InputFile,'RootPath_1')
+        InputTable=[InputTable;[{Param.InputFile.RootPath_1},{Param.InputFile.SubDir_1},{Param.InputFile.RootFile_1},{Param.InputFile.NomType_1},{Param.InputFile.FileExt_1}]];
+        TimeTable=[TimeTable; [{[]},{[]},{[]},{[]}]];
+    end
     set(handles.InputTable,'Data',InputTable)
-    display_file_name(handles,Param,'one')%refresh the input table
+    
+    %     display_file_name(handles,Param,'one')%refresh the input table
+    update_rootinfo(handles,Param.HiddenData.i1_series{1},Param.HiddenData.i2_series{1},Param.HiddenData.j1_series{1},Param.HiddenData.j2_series{1},...
+        Param.HiddenData.FileInfo{1},Param.HiddenData.MovieObject{1},1)
     if isfield(Param,'FileName_1')
-        Param.FileName=Param.FileName_1;
-        display_file_name(handles,Param,2)
+
+        %         display_file_name(handles,Param,2)
+        update_rootinfo(handles,Param.HiddenData.i1_series{2},Param.HiddenData.i2_series{2},Param.HiddenData.j1_series{2},Param.HiddenData.j2_series{2},...
+            Param.HiddenData.FileInfo{2},Param.HiddenData.MovieObject{2},2)
     end
 else
     set(handles.REFRESH,'BackgroundColor',[1 0 1])% set REFRESH button to magenta color to indicate that input refresh is needed
-end  
+end
 if isfield(Param,'incr_i')
     set(handles.num_incr_i,'String',num2str(Param.incr_i))
@@ -1198 +1212 @@
 function num_last_j_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-first_j=str2num(get(handles.num_first_j,'String'));
-last_j=str2num(get(handles.num_last_j,'String'));
-ref_j=ceil((first_j+last_j)/2);
-set(handles.num_ref_j,'String', num2str(ref_j))
-num_ref_j_Callback(hObject, eventdata, handles)
+% first_j=str2num(get(handles.num_first_j,'String'));
+% last_j=str2num(get(handles.num_last_j,'String'));
+% ref_j=ceil((first_j+last_j)/2);
+% set(handles.num_ref_j,'String', num2str(ref_j))
+% num_ref_j_Callback(hObject, eventdata, handles)
 SeriesData=get(handles.series,'UserData');
 if ~isfield(SeriesData,'Time')
@@ -2646 +2660 @@
 function MenuHelp_Callback(hObject, eventdata, handles)
 %-------------------------------------------------------------------
-web('http://servforge.legi.grenoble-inp.fr/projects/soft-uvmat/wiki/UvmatHelp#series')
+web('http://servforge.legi.grenoble-inp.fr/projects/soft-uvmat/wiki/UvmatHelp#Series')
 % path_to_uvmat=which ('uvmat');% check the path of uvmat
 % pathelp=fileparts(path_to_uvmat);
@@ -2781 +2795 @@
     set(handles.REFRESH,'BackgroundColor',[1 0 1]); %paint REFRESH button in magenta to indicate that it should be activated
 end
+
+
+
+% --------------------------------------------------------------------
+function MenuImportParam_Callback(hObject, eventdata, handles)
+%% use a starting file name for browserr
+InputTable=get(handles.InputTable,'Data');
+oldfile=InputTable{1,1};
+if isempty(oldfile)
+    % use a file name stored in prefdir
+    dir_perso=prefdir;
+    profil_perso=fullfile(dir_perso,'uvmat_perso.mat');
+    if exist(profil_perso,'file')
+        h=load (profil_perso);
+        if isfield(h,'RootPath') && ischar(h.RootPath)
+            oldfile=h.RootPath;
+        end
+    end
+end
+filexml=uigetfile_uvmat('pick a xml parameter file',oldfile,'.xml');% get the xml file containing processing parameters
+%proceed only if a file has been introduced by the browser
+if ~isempty(filexml)
+    Param=xml2struct(filexml);% read the input xml file as a Matlab structure
+    % ask to stop current Action if button RUN is in action (another process is already running)
+    if isequal(get(handles.RUN,'Value'),1)
+        answer= msgbox_uvmat('INPUT_Y-N','stop current Action process?');
+        if strcmp(answer,'Yes')
+            STOP_Callback(hObject, eventdata, handles)
+        else
+            return
+        end
+    end
+    Param.Action.RUN=0; %desactivate the input RUN=1
+    if ~isfield(Param,'InputTable')||~isfield(Param,'IndexRange')
+        msgbox_uvmat('ERROR','invalid config file: open a file in a folder ''/0_XML''')
+        return
+    end
+    Param=rmfield(Param,'InputTable');% do not refresh Input files and index range
+    Param=rmfield(Param,'IndexRange');  
+    fill_GUI(Param,handles.series)% fill the elements of the GUI series with the input parameters
+    SeriesData=get(handles.series,'UserData');
+    if isfield(Param,'InputFields')
+        ListField=Param.InputFields.FieldName;
+        set(handles.FieldName,'String',[ListField;{'get-field...'}])
+         set(handles.FieldName,'Value',1:numel(ListField))
+    end       
+    if isfield(Param,'ActionInput')%  introduce  parameters specific to an Action fct, for instance PIV parameters
+        set(handles.ActionInput,'Visible','on')
+        set(handles.ActionInput,'Value',0)
+        Param.ActionInput.ConfigSource=filexml;% record the source of config for future info
+        SeriesData.ActionInput=Param.ActionInput;
+    end
+    if isfield(Param,'ProjObject') %introduce projection object if relevant
+        SeriesData.ProjObject=Param.ProjObject;
+    end
+    set(handles.series,'UserData',SeriesData)
+    if isfield(Param,'CheckObject') && isequal(Param.CheckObject,1)
+        set(handles.ProjObject,'String',Param.ProjObject.Name)
+        set(handles.ViewObject,'Visible','on')
+        set(handles.EditObject,'Visible','on')
+        set(handles.DeleteObject,'Visible','on')
+    else     
+        set(handles.ProjObject,'String','')
+        set(handles.ProjObject,'Visible','off')
+        set(handles.ViewObject,'Visible','off')
+        set(handles.EditObject,'Visible','off')
+        set(handles.DeleteObject,'Visible','off')     
+    end     
+    set(handles.REFRESH,'BackgroundColor',[1 0 1]); %paint REFRESH button in magenta to indicate that it should be activated
+end
+
+
 
 %------------------------------------------------------------------------
@@ -3253 +3339 @@
 %       Indices: row and column indices of the cell(s) currently selecteds
 % handles    structure with handles and user data (see GUIDATA)
+
+

trunk/src/set_object.m

@@ -712 +712 @@
 function HELP_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-web('http://servforge.legi.grenoble-inp.fr/projects/soft-uvmat/wiki/UvmatHelp#a6-Projectionobjects:')
+web('http://servforge.legi.grenoble-inp.fr/projects/soft-uvmat/wiki/UvmatHelp#ProjObject')
 % path_to_uvmat=which ('uvmat');% check the path of uvmat
 % pathelp=fileparts(path_to_uvmat);

trunk/src/uvmat.m

@@ -649 +649 @@
 [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,FileInfo,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
 % initiate the input file series and inputfilerefresh the current field view: 
-errormsg=update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,1);
+errormsg=update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileInfo,MovieObject,1);
 % inputfilerefresh the second series if selected
 if get(handles.SubField,'Value')
@@ -658 +658 @@
     end
     % detect the file type, get the movie object if relevant, and look for the corresponding file series:
-    [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
+    [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,FileInfo,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
     % initiate the input file series and inputfilerefresh the current field view:
-    errormsg=update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,2);
+    errormsg=update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileInfo,MovieObject,2);
 end
 
@@ -830 +830 @@
 
         % initiate input file series and inputfilerefresh the current field view:     
-        update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,index);
+        update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileInfo,MovieObject,index);
 
 end
@@ -860 +860 @@
 % --- Update information about a new field series (indices to scan, timing,
 %     calibration from an xml file, then inputfilerefresh current plots
-function errormsg=update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,VideoObject,index)
+function errormsg=update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileInfo,VideoObject,index)
 %------------------------------------------------------------------------
 errormsg=''; %default error msg
@@ -877 +877 @@
 UvData.NewSeries=1; %flag for REFRESH: begin a new series
 UvData.FileName_1='';% name of the current second field (used to detect a  constant field during file scanning)
-UvData.FileType{index}=FileType;
+UvData.FileType{index}=FileInfo.FileType;
+UvData.FileInfo{index}=FileInfo;
 UvData.i1_series{index}=i1_series;
 UvData.i2_series{index}=i2_series;
@@ -991 +992 @@
 %% Define timing
 % time not set by the input file: images or civ data: indicate that time is read from the xml file
+FileType=FileInfo.FileType;
 if isfield(XmlData,'Time')&& ~isempty(XmlData.Time) && ...
         (strcmp(FileType,'image')|| strcmp(FileType,'multimage'))%||strcmp(FileType,'civdata')||strcmp(FileType,'civx'))
@@ -5508 +5510 @@
 function MenuSeries_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-Param=read_param(handles);
+Param=read_GUI(handles.uvmat);
 Param.HiddenData=get(handles.uvmat,'UserData');
 series(Param); %run the series interface
@@ -5514 +5516 @@
 % --------------------------------------------------------------------
 function MenuPIV_Callback(hObject, eventdata, handles)
-    Param=read_param(handles);
+Param=read_GUI(handles.uvmat);
 Param.HiddenData=get(handles.uvmat,'UserData');
 hseries=series(Param);
@@ -5532 +5534 @@
 civ(FileName);% interface de civ(not in the uvmat file)
 
-function Param=read_param(handles)
-    
-[RootPath,SubDir,RootFile,FileIndex,FileExt]=read_file_boxes(handles);
-Param.FileName=[fullfile(RootPath,SubDir,RootFile) FileIndex FileExt];%first input file name
-if isequal(get(handles.SubField,'Value'),1)
-    [RootPath_1,SubDir_1,RootFile_1,FileIndex_1,FileExt_1]=read_file_boxes_1(handles);
-    FileName_1=[fullfile(RootPath_1,SubDir_1,RootFile_1) FileIndex_1 FileExt_1];
-    if ~isequal(FileName_1,Param.FileName)
-        Param.FileName_1=FileName_1;%second input file name if relevant
-    end
-end
-Param.NomType=get(handles.NomType,'String');
-Param.NomType_1=get(handles.NomType_1,'String');
-Param.CheckFixPair=get(handles.CheckFixPair,'Value');
-UvData=get(handles.uvmat,'UserData');
-if isfield(UvData,'XmlData')&& isfield(UvData.XmlData{1},'Time')
-    Param.Time=UvData.XmlData{1}.Time;
-end
-if isequal(get(handles.scan_i,'Value'),1)
-    Param.incr_i=str2num(get(handles.num_IndexIncrement,'String'));
-elseif isequal(get(handles.scan_j,'Value'),1)
-    Param.incr_j=str2num(get(handles.num_IndexIncrement,'String'));
-end
-
-%% transfer fields and coordinate names
-Param.list_fields=get(handles.FieldName,'String');% list menu fields
-FieldName=Param.list_fields{get(handles.FieldName,'Value')};
-ind_image=find(strcmp('image',Param.list_fields));
-if ~isempty(ind_image) && numel(Param.list_fields)>1
-    Param.list_fields(ind_image)=[]; %suppress  'image' option
-end
-Param.index_fields=find(strcmp(FieldName,Param.list_fields));% selected string index
-Param.list_fields_1=get(handles.FieldName_1,'String');% list menu fields
-if ischar(Param.list_fields_1),Param.list_fields_1={Param.list_fields_1};end
-FieldName_1=Param.list_fields_1{get(handles.FieldName_1,'Value')};
-ind_image=find(strcmp('image',Param.list_fields_1));
-if ~isempty(ind_image) && numel(Param.list_fields_1)>1
-    Param.list_fields_1(ind_image)=[]; %suppress  'image' option
-end
-Param.index_fields_1=find(strcmp(FieldName_1,Param.list_fields_1));% selected string index
-TransformList=get(handles.TransformName,'String');
-Param.TransformName=TransformList{get(handles.TransformName,'Value')};
-Param.Coord_x_str=get(handles.Coord_x,'String');
-%Param.Coord_x_val=get(handles.Coord_x,'Value');
-Param.Coord_y_str=get(handles.Coord_y,'String');
+% function Param=read_param(handles)
+%     
+% [RootPath,SubDir,RootFile,FileIndex,FileExt]=read_file_boxes(handles);
+% Param.FileName=[fullfile(RootPath,SubDir,RootFile) FileIndex FileExt];%first input file name
+% if isequal(get(handles.SubField,'Value'),1)
+%     [RootPath_1,SubDir_1,RootFile_1,FileIndex_1,FileExt_1]=read_file_boxes_1(handles);
+%     FileName_1=[fullfile(RootPath_1,SubDir_1,RootFile_1) FileIndex_1 FileExt_1];
+%     if ~isequal(FileName_1,Param.FileName)
+%         Param.FileName_1=FileName_1;%second input file name if relevant
+%     end
+% end
+% Param.NomType=get(handles.NomType,'String');
+% Param.NomType_1=get(handles.NomType_1,'String');
+% Param.CheckFixPair=get(handles.CheckFixPair,'Value');
+% UvData=get(handles.uvmat,'UserData');
+% if isfield(UvData,'XmlData')&& isfield(UvData.XmlData{1},'Time')
+%     Param.Time=UvData.XmlData{1}.Time;
+% end
+% if isequal(get(handles.scan_i,'Value'),1)
+%     Param.incr_i=str2num(get(handles.num_IndexIncrement,'String'));
+% elseif isequal(get(handles.scan_j,'Value'),1)
+%     Param.incr_j=str2num(get(handles.num_IndexIncrement,'String'));
+% end
+% 
+% %% transfer fields and coordinate names
+% Param.list_fields=get(handles.FieldName,'String');% list menu fields
+% FieldName=Param.list_fields{get(handles.FieldName,'Value')};
+% ind_image=find(strcmp('image',Param.list_fields));
+% if ~isempty(ind_image) && numel(Param.list_fields)>1
+%     Param.list_fields(ind_image)=[]; %suppress  'image' option
+% end
+% Param.index_fields=find(strcmp(FieldName,Param.list_fields));% selected string index
+% Param.list_fields_1=get(handles.FieldName_1,'String');% list menu fields
+% if ischar(Param.list_fields_1),Param.list_fields_1={Param.list_fields_1};end
+% FieldName_1=Param.list_fields_1{get(handles.FieldName_1,'Value')};
+% ind_image=find(strcmp('image',Param.list_fields_1));
+% if ~isempty(ind_image) && numel(Param.list_fields_1)>1
+%     Param.list_fields_1(ind_image)=[]; %suppress  'image' option
+% end
+% Param.index_fields_1=find(strcmp(FieldName_1,Param.list_fields_1));% selected string index
+% TransformList=get(handles.TransformName,'String');
+% Param.TransformName=TransformList{get(handles.TransformName,'Value')};
+% Param.Coord_x_str=get(handles.Coord_x,'String');
+% %Param.Coord_x_val=get(handles.Coord_x,'Value');
+% Param.Coord_y_str=get(handles.Coord_y,'String');
 
 % --------------------------------------------------------------------