Changeset 483 for trunk/src/uvmat.m

Timestamp:

Jun 26, 2012, 11:50:19 PM (12 years ago)

Author:

sommeria

Message:

civ set to accept automatic input in the absence of PARAM.xml. Still problem with run time address
zoom improved to deal with elongated plots
better link between PIV and images in uvmat.

File:

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

trunk/src/uvmat.m

@@ -3084 +3084 @@
 FileName=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
 [tild,tild,tild,i1,i2,j1,j2,tild,NomType]=fileparts_uvmat(['xxx' get(handles.FileIndex,'String') FileExt]);
-% NomTypeNew=NomType;%default
 if isequal(field,'image')
-%     if isequal(NomType,'_1-2_1')||isequal(NomType,'_1_1-2')
-%         NomTypeNew='_1_1';
-%     elseif isequal(NomType,'#_ab')
-%         NomTypeNew='#a';
-%     elseif isequal(NomType,'_1-2')
-%         NomTypeNew='_1';
-%     end
-    imagename=fullfile_uvmat(RootPath,SubDir,RootFile,'.png',NomType,i1,[],j1,[]);
+    SubDirBase=regexprep(SubDir,'\..*','');%take the root part of SubDir, before the first dot '.'
+    imagename=fullfile_uvmat(RootPath,SubDirBase,RootFile,'.png',NomType,i1,[],j1,[]);
     if ~exist(imagename,'file')
         [FileName,PathName] = uigetfile( ...
@@ -3197 +3190 @@
     case 'image'
         % guess the image name corresponding to the current netcdf name (no unique correspondance)
-        imagename=fullfile_uvmat(RootPath_1,'',RootFile_1,'.png',get(handles.NomType,'String'),i1,[],j1);
+        SubDirBase=regexprep(SubDir_1,'\..*','');%take the root part of SubDir, before the first dot '.'
+        imagename=fullfile_uvmat(RootPath_1,SubDirBase,RootFile_1,'.png',get(handles.NomType,'String'),i1,[],j1);
         if ~exist(imagename,'file') % browse for images if it is not found
             [FileName,PathName] = uigetfile( ...