Changeset 961 for trunk/src/uvmat.m

Timestamp:

Jun 28, 2016, 9:05:33 AM (8 years ago)

Author:

sommeria

Message:

NomType? level introduced

File:

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

trunk/src/uvmat.m

@@ -991 +991 @@
                 data.RangeY=UvData.Field.CoordMesh;
             case 'plane_z'
-                data.Angle=[0 0 0];
-                data.DX=10*UvData.Field.CoordMesh;
-                data.DY=10*UvData.Field.CoordMesh;
+                data.Angle=[90 0];
+                data.DX=UvData.Field.CoordMesh;
+                data.DY=UvData.Field.CoordMesh;
                 data.RangeZ=UvData.Field.CoordMesh;
             otherwise
@@ -2355 +2355 @@
 NomType=get(handles.NomType,'String');
 indices=get(handles.FileIndex,'String');
-[tild,tild,tild,i1,i2,j1,j2]=fileparts_uvmat(indices);% the indices for the second series taken from FileIndex
-switch index_rank
-    case 1
-        indices=fullfile_uvmat('','','','',NomType,stra2num(get(handles.i1,'String')),i2,j1,j2);
-%        set(handles.i1,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
-    case 2
-        indices=fullfile_uvmat('','','','',NomType,i1,stra2num(get(handles.i2,'String')),j1,j2);
-%        set(handles.i2,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
-    case 3
-        indices=fullfile_uvmat('','','','',NomType,i1,i2,stra2num(get(handles.j1,'String')),j2);
-%        set(handles.j1,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
-    case 4
-        indices=fullfile_uvmat('','','','',NomType,i1,i2,j1,stra2num(get(handles.j2,'String')));
-%        set(handles.j2,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
+if strcmp(NomType,'level')
+    indices=get(handles.i1,'String');
+else
+    [tild,tild,tild,i1,i2,j1,j2]=fileparts_uvmat(indices);% the indices for the second series taken from FileIndex
+    switch index_rank
+        case 1
+            indices=fullfile_uvmat('','','','',NomType,stra2num(get(handles.i1,'String')),i2,j1,j2);
+        case 2
+            indices=fullfile_uvmat('','','','',NomType,i1,stra2num(get(handles.i2,'String')),j1,j2);
+        case 3
+            indices=fullfile_uvmat('','','','',NomType,i1,i2,stra2num(get(handles.j1,'String')),j2);
+        case 4
+            indices=fullfile_uvmat('','','','',NomType,i1,i2,j1,stra2num(get(handles.j2,'String')));
+    end
 end
 set(handles.FileIndex,'String',indices)
-%set(handles.FileIndex,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
+
 % update the second index if relevant
 if strcmp(get(handles.FileIndex_1,'Visible'),'on')
@@ -2944 +2944 @@
         set(handles.j2,'String',num2stra(j2,NomType,2));
     end
+    if strcmp(NomType,'level')
+       indices=num2str(i1); 
+    else
     indices=fullfile_uvmat('','','','',NomType,i1,i2,j1,j2);
+    end
     set(handles.FileIndex,'String',indices);
     if ~isempty(filename_1)
@@ -3151 +3155 @@
 if isempty(i2), set(handles.i2,'String',''); end % suppress the second i index display if not used
 if isempty(j2), set(handles.j2,'String',''); end % suppress the second j index display if not used
+if strcmp(get(handles.NomType,'String'),'level')
+    jindex=str2num(get(handles.j1,'String'));
+    filename=[fullfile(RootPath,SubDir,['level' num2str(jindex)],RootFile) FileIndex FileExt];% build the input file name (first line)
+else
 filename=[fullfile(RootPath,SubDir,RootFile) FileIndex FileExt];% build the input file name (first line)
+end
 filename_1='';%default second file name
 FileIndex_1='';