Changeset 719 for trunk

Timestamp:

Feb 26, 2014, 9:33:47 PM (11 years ago)

Author:

sommeria

Message:

corrrections to series

File:

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

trunk/src/series.m

@@ -245 +245 @@
 %% introduce the input file name(s) if defined from input Param
 if isfield(Param,'FileName')&&~isempty(Param.FileName)
-    %InputTable={'','','','',''}; % refresh the file input table
-    InputTable={}
+    InputTable={};
     set(handles.InputTable,'Data',InputTable)
     if isfield(Param,'FileName_1')
@@ -318 +317 @@
 end
 %% launch the browser
-fileinput=uigetfile_uvmat('pick a file to append in the input table',oldfile);
-if ~isempty(fileinput)
-      display_file_name(handles,fileinput,'one')
+fileinput=uigetfile_uvmat('pick an input file in the series',oldfile);
+hh=dir(fileinput);
+if numel(hh)>1
+    msgbox_uvmat('ERROR','invalid input, probably a broken link');
+else
+    if ~isempty(fileinput)
+        display_file_name(handles,fileinput,'one')
+    end
 end
 
@@ -348 +352 @@
 %% launch the browser
 fileinput=uigetfile_uvmat('pick a file to append in the input table',oldfile);
-if ~isempty(fileinput)
+hh=dir(fileinput);
+if numel(hh)>1
+    msgbox_uvmat('ERROR','invalid input, probably a broken link');
+else
+    if ~isempty(fileinput)
         display_file_name(handles,fileinput,'append')
+    end
 end
 
@@ -936 +945 @@
 
 %% enable j index visibility
-%check_jindex=~isempty(find(~cellfun(@isempty,SeriesData.j1_series))); %look for non empty j indices
 status_j='on';%default
 if isempty(find(~cellfun(@isempty,SeriesData.j1_series), 1)); % case of empty j indices
     status_j='off'; % no j index needed
 elseif strcmp(get(handles.PairString,'Visible'),'on')
-        PairString=get(handles.PairString,'Data');       
-        check_burst=cellfun(@isempty,regexp(PairString,'^j'));%=0 for burst case, 1 otherwise
- %   check_nopair=cellfun(@isempty,PairString);
-    if isempty(find(check_burst, 1))% if all pair string begins by j (burst) 
+    PairString=get(handles.PairString,'Data');
+    check_burst=cellfun(@isempty,regexp(PairString,'^j'));%=0 for burst case, 1 otherwise
+    if isempty(find(check_burst, 1))% if all pair string begins by j (burst)
         status_j='off'; % no j index needed for bust case
     end
@@ -954 +961 @@
 Position=get(handles.FileStatus,'Position');
 set(handles.FileStatus,'Units','normalized')
-xI=0.5:Position(3)-0.5;
+%xI=0.5:Position(3)-0.5;
 nbview=numel(SeriesData.i1_series);
 j_max=cell(1,nbview);
@@ -964 +971 @@
     MaxIndex_i(iview)=max(find(j_max{iview}))-1;% max ref index i
     MinIndex_i(iview)=min(find(j_max{iview}))-1;% min ref index i
-%     pair_max{iview}=squeezSeriesData.i1_series{iview},[],1)); %max on pair index
-%     if (strcmp(get(handles.num_first_j,'Visible'),'off')&& size(pair_max{iview},2)~=1)
-%         pair_max{iview}=squeeze(max(pair_max{iview},[],1)); % consider only the i index
-%     end
 end
 MinIndex_i=min(MinIndex_i);
@@ -1967 +1970 @@
 update_waitbar(handles.Waitbar,0)
 
-%% default setting for the visibility of the GUI elements
-% set(handles.FieldTransform,'Visible','off')
-% set(handles.CheckObject,'Visible','off');
-% set(handles.ProjObject,'Visible','off');
-% set(handles.CheckMask,'Visible','off')
-% set(handles.Mask,'Visible','off')
-
 %% create the function handle for Action
 path_series=which('series');
@@ -2010 +2006 @@
     nb_netcdf=numel(find(strcmp('netcdf',SeriesData.FileType)));
 end
-%menu={''};
 if numel(iview_civ)>=1
     menu=set_veltype_display(SeriesData.FileInfo{iview_civ(1)}.CivStage,SeriesData.FileType{iview_civ(1)});
@@ -2065 +2060 @@
             set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
 end
+
+%% hide j index if useful (for civ in burst mode)
+if isfield(ParamOut,'Hide_j_index')&&isequal(ParamOut.Hide_j_index,'on')
+    status_j='off';% no j index visible
+else
+    status_j='on';%default
+    if isempty(find(~cellfun(@isempty,SeriesData.j1_series), 1)); % case of empty j indices
+        status_j='off'; % no j index needed
+    elseif strcmp(get(handles.PairString,'Visible'),'on')
+        PairString=get(handles.PairString,'Data');
+        check_burst=cellfun(@isempty,regexp(PairString,'^j'));%=0 for burst case, 1 otherwise
+        if isempty(find(check_burst, 1))% if all pair string begins by j (burst)
+            status_j='off'; % no j index needed for bust case
+        end
+    end
+end
+enable_j(handles,status_j) % no j index needed
 
 %% NbSlice visibility