Changeset 1154 for trunk/src/series.m

Timestamp:

Jul 7, 2024, 11:22:00 PM (3 months ago)

Author:

sommeria

Message:

various improvements

File:

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

trunk/src/series.m

@@ -572 +572 @@
         PairString=get(handles.PairString,'Data');
         if numel(PairString)>=iview
-            checkpair=strfind(PairString{iview},'j=');
-            if checkpair
-                j1=str2double(PairString{iview}(4));
-                j2=str2double(PairString{iview}(6));
-            end
+                r=regexp(PairString{iview},'(?<num1>\d+)-(?<num2>\d+)' ,'names');
+                if ~isempty(r)
+                j1=str2double(r.num1);
+                j2=str2double(r.num2);
+                end
         end
         InputFile=fullfile_uvmat('','',InputTable{iview,3},InputTable{iview,5},InputTable{iview,4},i1,[],j1,j2);
@@ -1400 +1400 @@
     errormsg='input field name(s) not defined, select add_field...';
     return
+end
+[status,result]=system(['svn info ' Param.Action.ActionPath]);
+if status==0
+    t=regexp(result,'R.vision\s*:\s*(?<rev>\d+)','names');%detect 'revision' or 'Revision' in the text
+    if ~isempty(t)
+        Param.UvmatRevision=t.rev; %version nbre of the current package
+    end
 end
 
@@ -2305 +2312 @@
         return
     end
-    [tild,ActionName,ActionExt]=fileparts(FileName);
+    [~,ActionName,ActionExt]=fileparts(FileName);
 
     % insert the choice in the menu ActionName
@@ -2397 +2404 @@
 %% 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
-Param.Action.RUN=0;
-Param.SeriesData=SeriesData;
+Param.Action.RUN=0;% indicate that we are in the mode of parameter input, not program run
+Param.SeriesData=SeriesData;% info stored in 'UserData' of the fig 'series'
 ParamOut=h_fun(Param); % run the selected Action function to get the relevant input
 
@@ -2465 +2472 @@
         ind_var=get(handles.FieldName,'Value'); % indices of previously selected variables
         for ilist=1:numel(ind_var)
-            if isempty(find(strcmp(FieldList{ind_var(ilist)},ListVarName)))
+            if isempty(find(strcmp(FieldList{ind_var(ilist)},ListVarName), 1))
                 FieldList={}; % previous choice not consistent with new input field
                 set(handles.FieldName,'Value',1)
@@ -2471 +2478 @@
             end
         end
-        if ~isempty(FieldList)iview_netcdf
-            if isempty(find(strcmp(get(handles.Coord_x,'String'),ListVarName)))||...
-                    isempty(find(strcmp(get(handles.Coord_y,'String'),ListVarName)))
+        if ~isempty(FieldList)
+            if isempty(find(strcmp(get(handles.Coord_x,'String'),ListVarName), 1))||...
+                    isempty(find(strcmp(get(handles.Coord_y,'String'),ListVarName), 1))
                 FieldList={};
                 set(handles.Coord_x,'String','')
@@ -2479 +2486 @@
             end
             Coord_z=get(handles.Coord_z,'String');
-            if ~isempty(Coord_z) && isempty(find(strcmp(Coord_z,ListVarName)))REFRESH
+            if ~isempty(Coord_z) && isempty(find(strcmp(Coord_z,ListVarName), 1))
                 FieldList={};
                 set(handles.Coord_z,'String','')
@@ -2489 +2496 @@
     end
     set(handles_coord,'Visible','on')
-    if isempty(find(strcmp('add_field...',FieldList)))
+    if isempty(find(strcmp('add_field...',FieldList), 1))
         FieldList=[FieldList;{'add_field...'}];%add 'add_field...' to the menu FieldName if it is not already
     end
@@ -2496 +2503 @@
         set(handles.Field_text_1,'Visible','on')
         if CheckPivData_1==0        % not civ input made
-            FieldList_1={'add_field...'}
+            FieldList_1={'add_field...'};
             ListVarName=SeriesData.FileInfo{iview_netcdf(2)}.ListVarName;
             ind_var=get(handles.FieldName,'Value'); % indices of previously selected variables
             for ilist=1:numel(ind_var)
-                if isempty(find(strcmp(FieldList{ind_var(ilist)},ListVarName)))
+                if isempty(find(strcmp(FieldList{ind_var(ilist)},ListVarName), 1))
                     %FieldList_1={}; % previous choice not consistent with new input field
                     set(handles.FieldName_1,'Value',1)
@@ -2507 +2514 @@
             end
             warn_coord=0;
-            if isempty(find(strcmp(get(handles.Coord_x,'String'),ListVarName)))||...
-                    isempty(find(strcmp(get(handles.Coord_y,'String'),ListVarName)))
+            if isempty(find(strcmp(get(handles.Coord_x,'String'),ListVarName), 1))||...
+                    isempty(find(strcmp(get(handles.Coord_y,'String'),ListVarName), 1))
                 warn_coord=1;
             end
-            if ~isempty(Coord_z) && isempty(find(strcmp(Coord_z,ListVarName)))
+            if ~isempty(Coord_z) && isempty(find(strcmp(Coord_z,ListVarName), 1))
                 FieldList_1={'add_field...'};
                 warn_coord=1;
@@ -2547 +2554 @@
 %% Check whether alphabetical sorting of input Subdir is allowed by the Action fct  (for multiples series entries)
 if isfield(ParamOut,'AllowInputSort')&&isequal(ParamOut.AllowInputSort,'on')&& size(Param.InputTable,1)>1
-    [tild,iview]=sort(Param.InputTable(:,2)); % subdirectories sorted in alphabetical order
+    [~,iview]=sort(Param.InputTable(:,2)); % subdirectories sorted in alphabetical order
     set(handles.InputTable,'Data',Param.InputTable(iview,:));
     MinIndex_i=get(handles.MinIndex_i,'Data');
@@ -2632 +2639 @@
 
 %% NbSlice visibility
-% if isfield(ParamOut,'OutputFileMode')&& strcmp(ParamOut.OutputFileMode,'NbSlice')
-%     ParamOut.NbSlice='on';
-% end
 if isfield(ParamOut,'NbSlice') && (strcmp(ParamOut.NbSlice,'on')||isnumeric(ParamOut.NbSlice))
     set(handles.num_NbSlice,'Visible','on')
@@ -2690 +2694 @@
 end
 set(handles.CheckMask,'Visible',MaskVisible);
+set(handles.MaskTable,'Visible',MaskVisible);
+
 %% Setting of expected iteration time
 if isfield(ParamOut,'CPUTime')
@@ -2698 +2704 @@
 InputTable=get(handles.InputTable,'Data');
 [OutputPath,Device,DeviceExt]=fileparts(InputTable{1,1});
-[OutputPath,Experiment,ExperimentExt]=fileparts(OutputPath);
+[~,Experiment,ExperimentExt]=fileparts(OutputPath);
 set(handles.Device,'String',[Device DeviceExt])
 set(handles.Device,'Visible','on')
@@ -2710 +2716 @@
 
 %% definition of the subdirectory containing the output files
-
 if  ~(isfield(SeriesData,'ActionName') && strcmp(ActionName,SeriesData.ActionName))
     OutputDirExt='.series'; % default
@@ -2752 +2757 @@
 set(handles.OutputDirExt,'Visible',OutputDirVisible)
 set(handles.OutputSubDir,'Visible',OutputDirVisible)
-% set(handles.OutputDir_title,'Visible',OutputDirVisible)
 SeriesData.ActionName=ActionName; % record ActionName for next use
 
@@ -2776 +2780 @@
 %% definition of an additional parameter set, determined by an ancillary GUI
 if isfield(ParamOut,'ActionInput')
-%     set(handles.ActionInput,'Visible','on')
     ParamOut.ActionInput.Program=ActionName; % record the program in ActionInput
     SeriesData.ActionInput=ParamOut.ActionInput;
 else
-%     set(handles.ActionInput,'Visible','off')
     if isfield(SeriesData,'ActionInput')
         SeriesData=rmfield(SeriesData,'ActionInput');