Index: /trunk/src/series.m =================================================================== --- /trunk/src/series.m (revision 995) +++ /trunk/src/series.m (revision 996) @@ -133,4 +133,5 @@ %% Read the parameter file series.xml, or created from series.xml.default if it does not exist +SeriesData=[]; [path_series,name,ext]=fileparts(which('series'));% path to the GUI series xmlfile=fullfile(path_series,'series.xml'); @@ -140,13 +141,4 @@ if exist(xmlfile,'file') SeriesData.SeriesParam=xml2struct(xmlfile); -% if ismember(RunMode,{'cluster_oar','cluster_pbs','cluster_sge'}) && isfield(s,'BatchParam') -% if isfield(s.BatchParam,'NbCoreDefault') -% NbCoreDefault=s.BatchParam.NbCoreDefault; -% end -% elseif ismember(RunMode,{'background','local'}) && isfield(s,'RunParam') -% if isfield(s.RunParam,'NbCore') -% NbCoreDefault=s.RunParam.NbCoreDefault; -% end -% end end @@ -291,5 +283,5 @@ %% introduce the input file name(s) if defined from input Param, -set(handles.series,'UserData',[])% initiate Userdata +set(handles.series,'UserData',SeriesData)% initiate Userdata if isfield(Param,'InputFile') @@ -593,5 +585,4 @@ end set(handles.InputLine,'String',num2str(iline)); -% set(handles.InputTable,'UserData',iline); %------------------------------------------------------------------------ @@ -678,12 +669,12 @@ set(handles.TimeTable,'Data',TimeTable(1:nbview,:)); -%% enable field and veltype menus, in accordance with the current action -ActionName_Callback([],[], handles) - %% set length of waitbar displ_time(handles) - set(handles.REFRESH,'BackgroundColor',[1 0 0])% set REFRESH button to red color (indicate activation finished) set(handles.series,'Pointer','arrow') % set the mouse pointer to 'watch' + +%% enable field and veltype menus, in accordance with the current action +ActionInput_Callback([],[], handles) + %------------------------------------------------------------------------ @@ -1438,4 +1429,8 @@ %% settings of the button RUN +if ~isequal(get(handles.ActionInput,'BackgroundColor'),[1 0 0]) + msgbox_uvmat('ERROR','first activate the button ActionInput') + return +end set(handles.RUN,'BusyAction','queue'); % activation of STOP button will set BusyAction to 'cancel' set(handles.RUN, 'Enable','Off')% avoid further RUN action until the current one is finished @@ -1573,16 +1568,11 @@ NbCore=1; % no need to split the calculation case 'cluster_oar' - NbCoreDefault=SeriesData.SeriesParam.ClusterParam{1}.NbCoreDefault;%proposed number of cores (for cluster) - %%%%% TEST A REMETTRE%%%%% - % if strcmp(ActionExt,'.m')% case of Matlab function (uncompiled) -% NbCore=1; % one core used only (limitation of Matlab licences) -% answer=msgbox_uvmat('INPUT_Y-N','Number of cores =1: select the compiled version .sh for multi-core processing. Proceed with the .m version?'); -% if ~strcmp(answer,'Yes') -% errormsg='Action launch interrupted by user'; -% return -% end -% extra_oar=''; - % else - answer=inputdlg({'Number of cores (max 36)','extra oar options'},'oarsub parameter',1,{num2str(NbCoreDefault),''}); + NbCoreDefault=SeriesData.OarParam.NbCoreDefault;%proposed number of cores (for cluster) + if strcmp(ActionExt,'.m')% case of Matlab function (uncompiled) + warning_string=', preferably use .sh option to save Matlab licences'; + else + warning_string=''; + end + answer=inputdlg({['Number of cores (max 36)' warning_string],'extra oar options'},'oarsub parameter',1,{num2str(NbCoreDefault),''}); if isempty(answer) errormsg='Action launch interrupted by user'; @@ -1684,5 +1674,5 @@ last_i=Param.IndexRange.last_i; end -if isfield(Param.IndexRange,'first_j') +if isfield(Param.IndexRange,'incr_j') first_j=Param.IndexRange.first_j; last_j=Param.IndexRange.last_j; @@ -2145,5 +2135,5 @@ end if exist(OutputDir,'dir') - [SUCCESS,MESSAGE,MESSAGEID] = fileattrib (OutputDir) + [SUCCESS,MESSAGE,MESSAGEID] = fileattrib (OutputDir); if MESSAGE.GroupWrite~=1 [success,msg] = fileattrib(OutputDir,'+w','g','s'); % allow writing access for the group of users, recursively in the folder @@ -2293,41 +2283,4 @@ update_waitbar(handles.Waitbar,0) -%% create the function handle for Action -if ~exist(ActionPath,'dir') - msgbox_uvmat('ERROR',['The prescribed function path ' ActionPath ' does not exist']); - return -end -current_dir=pwd; % current working dir -cd(ActionPath) -h_fun=str2func(ActionName); -cd(current_dir) - -% -% checkaddpath=0; -% path_series=which('series'); -% %eval(['spath=which(''' ActionName ''');']) %spath = current path of the selected function ACTION -% spath=fileparts(which(ActionName)); % spath = current path of the selected function ACTION -% if ~exist(ActionPath,'dir') -% msgbox_uvmat('ERROR',['The prescribed function path ' ActionPath ' does not exist']); -% return -% end -% if ~strcmp(spath,ActionPath) -% if strcmp(pwd,spath) -% msgbox_uvmat('ERROR',[ 'a function called ' ActionName ' on your working space oversets the selected one']); -% return -% else -% addpath(ActionPath)% add the prescribed path if not the current one -% checkaddpath=1; -% end -% end -% eval(['h_fun=@' ActionName ';'])%create a function handle for ACTION -% if checkaddpath && ~isequal(ActionPath,path_series) -% rmpath(ActionPath)% add the prescribed path if not the current one -% end - -%% Activate the Action fct to adapt the configuration of the GUI series and bring specific parameters in SeriesData -Param=read_GUI_series(handles); % read the parameters from the GUI series -ParamOut=h_fun(Param); % run the selected Action function to get the relevant input - %% Put the first line of the selected Action fct as tooltip help try @@ -2337,4 +2290,29 @@ set(handles.ActionName,'ToolTipString',InputText{1}{1})% put the first line of the selected function as tooltip help end +set(handles.ActionName,'BackgroundColor',[1 1 1]) +set(handles.ActionInput,'BackgroundColor',[1 0 1])% set ActionInput button to magenta color to indicate that input refr + + +% --- Executes on button press in ActionInput. +function ActionInput_Callback(hObject, eventdata, handles) + +set(handles.ActionInput,'BackgroundColor',[1 1 0]) + +%% create the function handle for Action +ActionPath=get(handles.ActionPath,'String'); +ActionList=get(handles.ActionName,'String'); +ActionName= ActionList{get(handles.ActionName,'Value')}; % selected function name +if ~exist(ActionPath,'dir') + msgbox_uvmat('ERROR',['The prescribed function path ' ActionPath ' does not exist']); + return +end +current_dir=pwd; % current working dir +cd(ActionPath) +h_fun=str2func(ActionName); +cd(current_dir) + +%% Activate the Action fct to adapt the configuration of the GUI series and bring specific parameters in SeriesData +Param=read_GUI_series(handles); % read the parameters from the GUI series +ParamOut=h_fun(Param); % run the selected Action function to get the relevant input @@ -2542,5 +2520,4 @@ %% NbSlice visibility -%NbSliceVisible='off'; % default if isfield(ParamOut,'NbSlice') && (strcmp(ParamOut.NbSlice,'on')||isnumeric(ParamOut.NbSlice)) set(handles.num_NbSlice,'Visible','on') @@ -2549,7 +2526,4 @@ set(handles.num_NbSlice,'Visible','off') set(handles.NbSlice_title,'Visible','off') - % set(handles.num_NbProcess,'String',get(handles.num_NbSlice,'String'))% the nbre of processes is imposed as the nbre of slices - % else - % set(handles.num_NbProcess,'String','')% free nbre of processes end if isnumeric(ParamOut.NbSlice) @@ -2559,8 +2533,4 @@ set(handles.num_NbSlice,'Enable','on'); % NbSlice can be modified on the GUI series end -% set(handles.num_NbSlice,'Visible',NbSliceVisible) -% set(handles.NbSlice_title,'Visible',NbSliceVisible) - - %% Visibility of FieldTransform menu @@ -2612,4 +2582,5 @@ OutputSubDirMode=ParamOut.OutputSubDirMode; end +InputTable=get(handles.InputTable,'Data'); switch OutputSubDirMode case 'auto'; % default @@ -2665,9 +2636,9 @@ %% definition of an additional parameter set, determined by an ancillary GUI if isfield(ParamOut,'ActionInput') - set(handles.ActionInput,'Visible','on') +% set(handles.ActionInput,'Visible','on') ParamOut.ActionInput.Program=ActionName; % record the program in ActionInput SeriesData.ActionInput=ParamOut.ActionInput; else - set(handles.ActionInput,'Visible','off') +% set(handles.ActionInput,'Visible','off') if isfield(SeriesData,'ActionInput') SeriesData=rmfield(SeriesData,'ActionInput'); @@ -2675,5 +2646,5 @@ end set(handles.series,'UserData',SeriesData) -set(handles.ActionName,'BackgroundColor',[1 1 1]) +set(handles.ActionInput,'BackgroundColor',[1 0 0]) %------------------------------------------------------------------------ @@ -3300,6 +3271,6 @@ 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) +% 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; @@ -3770,3 +3741,7 @@ % --- Executes on button press in DiskQuota. function DiskQuota_Callback(hObject, eventdata, handles) -system('quota -s -g -A') +SeriesData=get(handles.series,'UserData'); +system(SeriesData.SeriesParam.DiskQuotaCmd) + + + Index: /trunk/src/series.xml.default =================================================================== --- /trunk/src/series.xml.default (revision 995) +++ /trunk/src/series.xml.default (revision 996) @@ -1,15 +1,12 @@ - -cluster_oar!-- Cluster name to be displayed in the menu -s=system('oarstat')!-- Matlab command for detecting the cluster -16!-- proposed number of cores by default - - -cluster_pbs!-- Cluster name to be displayed in the menu - - -cluster_sge!-- Cluster name to be displayed in the menu -CheckString>[s,w]=system('oarstat') - + quota -s -g -A + + 16 + 20 + 500 + oarstat |grep N=UVmat + + + Index: /trunk/src/series/civ_series.m =================================================================== --- /trunk/src/series/civ_series.m (revision 995) +++ /trunk/src/series/civ_series.m (revision 996) @@ -439,6 +439,6 @@ end end - par_civ1.ImageWidth=size(par_civ1.ImageA,2);%FileInfo_A.Width; - par_civ1.ImageHeight=size(par_civ1.ImageA,1);%FileInfo_A.Height; + par_civ1.ImageWidth=size(par_civ1.ImageA,2); + par_civ1.ImageHeight=size(par_civ1.ImageA,1); list_param=(fieldnames(Param.ActionInput.Civ1))'; list_param(strcmp('TestCiv1',list_param))=[];% remove the parameter TestCiv1 from the list