Changeset 1048 for trunk/src

Timestamp:

Jun 4, 2018, 8:00:50 PM (7 years ago)

Author:

sommeria

Message:

bugs corrected in plot profiles

Location:

trunk/src

Files:

• find_field_cells.m (modified) (3 diffs)
• plot_field.m (modified) (2 diffs)
• proj_field.m (modified) (13 diffs)
• series/civ_input.m (modified) (1 diff)
• series/extract_multitif_special.m (added)
• uvmat.m (modified) (2 diffs)

trunk/src/find_field_cells.m

@@ -328 +328 @@
         end
         for ivar=ind_coord_y
-              if check_coord_names(ivar)
+            if check_coord_names(ivar)
                     DimRank=find(strcmp(Data.VarDimName{ivar},DimCell_var));
                 check_coord=~isempty(DimRank);
@@ -396 +396 @@
                 CellInfo{icell}.CoordSize=numel(Data.(CellInfo{icell}.XName));
             case 'grid'
+                VarName=Data.ListVarName{CellInfo{icell}.VarIndex(1)};
                 if NbDim(icell)==3
-                    CellInfo{icell}.CoordSize=[numel(Data.(CellInfo{icell}.XName)) numel(Data.(CellInfo{icell}.YName)) numel(Data.(CellInfo{icell}.YName))];
+                    CellInfo{icell}.CoordSize=[size(Data.(VarName),3) size(Data.(VarName),2) size(Data.(VarName),1)];
                 else
-                    CellInfo{icell}.CoordSize=[numel(Data.(CellInfo{icell}.XName)) numel(Data.(CellInfo{icell}.YName))];
+                    CellInfo{icell}.CoordSize=[size(Data.(VarName),2) size(Data.(VarName),1)];
                 end
             case 'tps'
@@ -469 +470 @@
         Cell1DPlot{icell}.XIndex=ind_coord_x(icell);
         Cell1DPlot{icell}.XName=Data.ListVarName{ind_coord_x(icell)};
+        Cell1DPlot{icell}.YIndex=[];
+        Cell1DPlot{icell}.YIndex_discrete=[];
         DimCell_x=Data.VarDimName{ind_coord_x(icell)};
-        for ivar=[ind_coord_y ind_discrete]
+        for ivar=ind_coord_y 
             DimCell=Data.VarDimName{ivar};
             if  numel(DimCell)==1 && strcmp(DimCell_x{1},DimCell{1})
                 y_nbre(icell)=y_nbre(icell)+1;
                 Cell1DPlot{icell}.YIndex(y_nbre(icell))=ivar;
-                break
-            end
-        end
-    end
-    Cell1DPlot(find(y_nbre==0))=[];
+            end
+        end
+        for ivar=ind_discrete
+            DimCell=Data.VarDimName{ivar};
+            if  numel(DimCell)==1 && strcmp(DimCell_x{1},DimCell{1})
+                y_nbre(icell)=y_nbre(icell)+1;
+                Cell1DPlot{icell}.YIndex_discrete(y_nbre(icell))=ivar;
+            end
+        end
+    end
+    Cell1DPlot(y_nbre==0)=[];
     CellInfo=[CellInfo Cell1DPlot];
     NbDim=[NbDim ones(1,numel(Cell1DPlot))];

trunk/src/plot_field.m

@@ -410 +410 @@
 %loop on input  fields
 for icell=1:numel(CellInfo)
-    VarIndex=CellInfo{icell}.YIndex;%  indices of the selected variables in the list data.ListVarName
+    VarIndex=[CellInfo{icell}.YIndex CellInfo{icell}.YIndex_discrete];%  indices of the selected variables in the list data.ListVarName
     coord_x_index=CellInfo{icell}.XIndex;
     coord_x_name{icell}=data.ListVarName{coord_x_index};
@@ -442 +442 @@
             end
         end
-        if isfield(CellInfo{icell},'VarIndex_discrete')
+        if isfield(CellInfo{icell},'YIndex_discrete')&& ~isempty(CellInfo{icell}.YIndex_discrete)
             charplot_0='''+''';
         else

trunk/src/proj_field.m

@@ -539 +539 @@
 end
 % default output
-errormsg='';%default
 Xline=[];
 flux=0;
@@ -545 +544 @@
 liny=ObjectData.Coord(:,2);
 NbPoints=size(ObjectData.Coord,1);
-testfalse=0;
-ListIndex={};
 
 %% group the variables (fields of 'FieldData') in cells of variables with the same dimensions
@@ -556 +553 @@
 CellInfo=CellInfo(NbDim>=2); %keep only the 2D or 3D cells
 cell_select=true(size(CellInfo));
-
 for icell=1:length(CellInfo)
     if isfield(CellInfo{icell},'ProjModeRequest')
-%         if ~strcmp(CellInfo{icell}.ProjModeRequest, ProjMode)
-%             cell_select(icell)=0;
-%         end
         if strcmp(ProjMode,'interp_tps')&& ~strcmp(CellInfo{icell}.CoordType,'tps')
             cell_select(icell)=0;
@@ -567 +560 @@
     end
 end
-if isempty(find(cell_select))
+if isempty(find(cell_select,1))
     errormsg=[' invalid projection mode ''' ProjMode ''': use ''interp_tps'' to interpolate spatial derivatives'];
     return
@@ -598 +591 @@
 end
 CheckClosedLine=~isempty(find(strcmp(ObjectData.Type,{'rectangle','ellipse','polygon'})));
-
-%     x = a \ \cosh \mu \ \cos \nu
-%
-%     y = a \ \sinh \mu \ \sin \nu
 
 %% angles of the polyline and boundaries of action for mode 'projection'
@@ -694 +683 @@
         %case of unstructured coordinates
         case 'scattered'
-            %             XName= FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)};
-            %             YName= FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
             coord_x=FieldData.(FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)});
             coord_y=FieldData.(FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)});
             
-            if isequal(ProjMode,'projection')
+            if strcmp(ProjMode,'projection')
                 if width==0
                     errormsg='range of the projection object is missing';
@@ -707 +694 @@
                 ProjData.VarDimName=[ProjData.VarDimName FieldData.ListVarName(CellInfo{icell}.CoordIndex(end))];
                 nbvar=numel(ProjData.ListVarName);
+                ProjData.VarAttribute{nbvar}.Role='coord_x';
                 ProjData.VarAttribute{nbvar}.long_name='abscissa along line';
                 % select the (non false) input data located in the band of projection
@@ -742 +730 @@
                     ProjData.VarDimName=[ProjData.VarDimName {XName}];
                     nbvar=numel(ProjData.ListVarName);
+                    ProjData.VarAttribute{nbvar}.Role='coord_x';
                     ProjData.VarAttribute{nbvar}.long_name='abscissa along line';
                     check_abscissa=1; % define abcissa only once
@@ -769 +758 @@
                         end
                     end
-                    ProjData.VarAttribute{ivar+nbvar}.Role='continuous';% will promote plots of the profiles with continuous lines
+                    ProjData.VarAttribute{ivar+nbvar}.Role='coord_y';% will promote plots of the profiles with continuous lines
                     ProjData.(ListFieldProj{ivar})=ProjVar{ivar};
                 end
@@ -778 +767 @@
                 NbCentres=FieldData.(FieldData.ListVarName{CellInfo{icell}.NbCentres_tps});
                 SubRange=FieldData.(FieldData.ListVarName{CellInfo{icell}.SubRange_tps});
-                if isfield(CellInfo{icell},'VarIndex_vector_x_tps')&&isfield(CellInfo{icell},'VarIndex_vector_y_tps')
-                    FieldVar=cat(3,FieldData.(FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_x_tps}),FieldData.(FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_y_tps}));
+                if isfield(CellInfo{icell},'VarIndex_vector_x')&&isfield(CellInfo{icell},'VarIndex_vector_y')
+                    FieldVar=cat(3,FieldData.(FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_x}),FieldData.(FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_y}));
                 end
                 [DataOut,VarAttribute,errormsg]=calc_field_tps(Coord,NbCentres,SubRange,FieldVar,CellInfo{icell}.FieldName,cat(3,XI,YI));
@@ -786 +775 @@
                 ProjData.X=Xproj;
                 nbvar=numel(ProjData.ListVarName);
+                ProjData.VarAttribute{nbvar}.Role='coord_x';
                 ProjData.VarAttribute{nbvar}.long_name='abscissa along line';
                 ProjVarName=(fieldnames(DataOut))';
@@ -799 +789 @@
                         end
                     end
-                    ProjData.VarAttribute{ivar+nbvar}.Role='continuous';% will promote plots of the profiles with continuous lines
+                    ProjData.VarAttribute{ivar+nbvar}.Role='coord_y';% will promote plots of the profiles with continuous lines
                     ProjData.(ProjVarName{ivar})=DataOut.(ProjVarName{ivar});
                 end
@@ -1107 +1097 @@
 %error=0;%default
 %flux=0;
-%testfalse=0;
-%ListIndex={};
 
 %% group the variables (fields of 'FieldData') in cells of variables with the same dimensions

trunk/src/series/civ_input.m

@@ -337 +337 @@
 
 %% set default choice of pair mode
-PairIndex=[];
+PairIndex=1;
 if isfield(Param,'ActionInput') && isfield(Param.ActionInput,'PairIndices')
     PairIndex=find(strcmp(Param.ActionInput.PairIndices.ListPairMode,PairMenu));

trunk/src/uvmat.m

@@ -4164 +4164 @@
     test_v=0;
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% A REMETTRE
-%     if ~isempty(menu_histo)
-%         set(handles.HistoMenu,'Value',1)
-%         set(handles.HistoMenu,'String',menu_histo)
-%         set(handles.Histogram,'Visible','on')
-%         set(handles.HistoMenu,'Visible','on')
-%         set(handles.HistoAxes,'Visible','on')
-%         HistoMenu_Callback(handles.HistoMenu, [], handles)% plot first histogram
-%     end
+    if ~isempty(menu_histo)
+        set(handles.HistoMenu,'Value',1)
+        set(handles.HistoMenu,'String',menu_histo)
+        set(handles.Histogram,'Visible','on')
+        set(handles.HistoMenu,'Visible','on')
+        set(handles.HistoAxes,'Visible','on')
+        HistoMenu_Callback(handles.HistoMenu, [], handles)% plot first histogram
+    end
 end
 % open the set_object for interactive plane projection in 3D case
@@ -4262 +4262 @@
             end
         end
+        Histo.VarAttribute{1}.Role='coord_x';
+        Histo.VarAttribute{2}.Role='coord_y';
         if ~isempty(units)
             Histo.VarAttribute{1}.units=units;