Changeset 1023

Timestamp:

Dec 12, 2017, 7:18:01 PM (7 years ago)

Author:

sommeria

Message:

bug repaired for ordinary plots

Location:

trunk/src

Files:

• find_field_cells.m (modified) (1 diff)
• get_field.m (modified) (2 diffs)
• uvmat.m (modified) (4 diffs)

trunk/src/find_field_cells.m

@@ -300 +300 @@
 check_remove=false(size(CellInfo));
 for icell=1:numel(check_remove)
-    if isempty(CellInfo{icell})||(numel(CellInfo{icell}.VarIndex)==1 && check_coord(icell))
+    if isempty(CellInfo{icell})||(numel(CellInfo{icell}.VarIndex)==1 && numel(check_coord)>=icell && check_coord(icell))
         check_remove(icell)=1;
     end

trunk/src/get_field.m

@@ -196 +196 @@
     set(handles.scalar,'Max',1)
 end
+
+%% set default field options
+checknbdim=cellfun('size',Field.Display.VarDimName,2);
+if max(checknbdim)<=1
+    Field.MaxDim=1;% only 1D fields, considered as a time series by default
+end
 if Field.MaxDim>=2 && ~checkseries% case of 2D (or 3D) fields
     check_vec_input=0;
@@ -215 +221 @@
         set(handles.FieldOption,'Value',3)% set vector selection option
     else
+        
         set(handles.FieldOption,'Value',2)% set scalar selection option
     end

trunk/src/uvmat.m

@@ -3553 +3553 @@
     UvData.NewSeries=1;
 end
-%put W as background image by default if NbDim=2:
-% if  UvData.NewSeries && isequal(get(handles.SubField,'Value'),0) && isfield(Field{1},'W') && ~isempty(Field{1}.W) && ~isequal(Field{1}.NbDim,3);
-%         set(handles.SubField,'Value',1);
-%         set(handles.RootPath_1,'String','"')
-%         set(handles.RootFile_1,'String','"')
-%         set(handles.SubDir_1,'String','"');
-%          indices=fullfile_uvmat('','','','',NomType,num_i1,num_i2,num_j1,num_j2);
-%         set(handles.FileIndex_1,'String',indices)
-%         set(handles.FileExt_1,'String','"');
-%         set(handles.FieldName_1,'Visible','on');
-%         set(handles.FieldName_1,'Visible','on');
-%         set(handles.RootPath_1,'Visible','on')
-%         set(handles.RootFile_1,'Visible','on')
-%         set(handles.SubDir_1,'Visible','on');
-%         set(handles.FileIndex_1,'Visible','on');
-%         set(handles.FileExt_1,'Visible','on');
-%         set(handles.FieldName_1,'Visible','on');
-%         Field{1}.AName='w';
-% end
 
 %% display time value of the current file
@@ -3729 +3710 @@
 end
 
-%% get bounds and dimensions of the input field
-UvData.Field=find_field_bounds(UvData.Field);
 testnewseries=UvData.NewSeries;
 UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
 
 
-%% calculate tps coefficients if needed
-UvData.Field=tps_coeff_field(UvData.Field,check_proj_tps);
-
-%% reset the min and max of scalar if only the mask is displayed(TODO: check the need)
-% if isfield(UvData,'Mask')&& ~isfield(UvData,'A')
-%     set(handles.num_MinA,'String','0')
-%     set(handles.num_MaxA,'String','255')
-% end
-
-%% usual 1D (x,y) plots
-if UvData.Field.NbDim<=1
+%% usual (x,y) plot
+if strcmp(FieldName,'')
     set(handles.Objects,'Visible','off')
     set(handles.CheckFixAspectRatio,'Value',0)
+    coord_x_name=get(handles.Coord_x,'String');
+    check_x_name=find(strcmp(coord_x_name,UvData.Field.ListVarName));
+    UvData.Field.VarAttribute{check_x_name}.Role='coord_x';
     [PlotType,PlotParamOut,haxes]=plot_field(UvData.Field,handles.PlotAxes,read_GUI(handles.uvmat));
     UvData.PlotAxes=UvData.Field; %store data for further plot modifications
@@ -3764 +3737 @@
     end
     cla(handles.HistoAxes)% clear the curves and legend in histogram axes
+    UvData.Field.NbDim=1;
     set(handles.uvmat,'UserData',UvData)
+    
 %% 2D or 3D fieldname are generally projected
 else
+    UvData.Field=find_field_bounds(UvData.Field);
+
+%% get bounds and dimensions of the input field
+
+%% calculate tps coefficients if needed
+    UvData.Field=tps_coeff_field(UvData.Field,check_proj_tps);
+
+%% reset the min and max of scalar if only the mask is displayed(TODO: check the need)
+% if isfield(UvData,'Mask')&& ~isfield(UvData,'A')
+%     set(handles.num_MinA,'String','0')
+%     set(handles.num_MaxA,'String','255')
+% end
     set(handles.Objects,'Visible','on')
 
@@ -4454 +4441 @@
             case '1D plot'
                 YName=GetFieldData.PanelOrdinate.ordinate;
+                FieldList={''};          
             case 'civdata...'%reinitiate input, return to automatic civ data reading
                 display_file_name(handles,FileName,1)