Changeset 1009 for trunk/src/uvmat.m

Timestamp:

Jul 22, 2017, 7:20:02 PM (8 years ago)

Author:

sommeria

Message:

various bugs fixed

File:

• trunk/src/uvmat.m (modified) (5 diffs)

trunk/src/uvmat.m

@@ -1748 +1748 @@
 [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileInfo,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
 errormsg='';
-if isempty(i1_series)
+if isempty(RootFile)
     fileinput=uigetfile_uvmat('pick an input file',fullfile(RootPath,SubDir));
     hh=dir(fileinput);
@@ -3819 +3819 @@
     end
 
+    %% introduce default  projection objects in 3D
+    for imap=1:numel(IndexObj)
+        iobj=IndexObj(imap);
+        if numel(UvData.ProjObject)<iobj
+            break
+        end
+        if UvData.Field.NbDim==3
+            UvData.ProjObject{iobj}.NbDim=3;%test for 3D objects
+            if ~isfield(UvData.ProjObject{iobj},'RangeZ')
+            UvData.ProjObject{iobj}.RangeZ=UvData.Field.CoordMesh;%main plotting plane
+            end
+            if iobj==1 && ~(isfield(UvData.ProjObject{iobj},'Coord') && size(UvData.ProjObject{iobj}.Coord,2)>=3 && UvData.ProjObject{iobj}.Coord(1,3)<UvData.Field.ZMax && UvData.ProjObject{iobj}.Coord(1,3)>UvData.Field.ZMin)
+                 UvData.ProjObject{iobj}.Coord(1,3)=(UvData.Field.ZMin+UvData.Field.ZMax)/2;%section at a middle plane chosen
+            end
+        end
+    end
+   
+    set(handles.uvmat,'UserData',UvData)
+    
     %% loop on the projection objects: one or two
     for imap=1:numel(IndexObj)
@@ -3824 +3843 @@
         if numel(UvData.ProjObject)<iobj
             break
-        end
-        if UvData.Field.NbDim==3
-            UvData.ProjObject{iobj}.NbDim=3;%test for 3D objects
-            if ~isfield(UvData.ProjObject{iobj},'RangeZ')
-            UvData.ProjObject{iobj}.RangeZ=UvData.Field.CoordMesh;%main plotting plane
-            end
-            if iobj==1 && ~(isfield(UvData.ProjObject{iobj},'Coord') && size(UvData.ProjObject{iobj}.Coord,2)>=3 && UvData.ProjObject{iobj}.Coord(1,3)<UvData.Field.ZMax && UvData.ProjObject{iobj}.Coord(1,3)>UvData.Field.ZMin)
-                 UvData.ProjObject{iobj}.Coord(1,3)=(UvData.Field.ZMin+UvData.Field.ZMax)/2;%section at a middle plane chosen
-            end
         end
         [ObjectData,errormsg]=proj_field(UvData.Field,UvData.ProjObject{iobj});% project field on the object
@@ -3872 +3882 @@
             ObjectData.A=feval(AClass,ObjectData.A);
         end
-        set(handles.uvmat,'UserData',UvData)
+
         if ~isempty(ObjectData)
             if imap==2 && isempty(view_field_handle)
@@ -4362 +4372 @@
                     ParamIn.vec_color='Civ2_C';
             end
+        else
+            ParamIn.TimeAttrName=get(handles.TimeName,'String');
+            ParamIn.Coord_x=get(handles.Coord_x,'String');
+            ParamIn.Coord_y=get(handles.Coord_y,'String');
+            ParamIn.Coord_z=get(handles.Coord_z,'String');
         end