Changeset 106 for trunk/src

Timestamp:

Jul 1, 2010, 12:01:37 AM (14 years ago)

Author:

sommeria

Message:

merge_proj and series.m: bug for use of mmreader corrected
struct2nc: bug for regularly meshed coordinates corrected (builtin netcdf lib)

Location:

trunk/src

Files:

• series.m (modified) (1 diff)
• series/merge_proj.m (modified) (2 diffs)
• struct2nc.m (modified) (1 diff)

trunk/src/series.m

@@ -2063 +2063 @@
          %get the object file 
          defaultname=get(handles.RootPath,'String');
+         if isempty(defaultname)
+            defaultname={''};
+         end
         [FileName, PathName, filterindex] = uigetfile( ...
        {'*.xml;*.mat', ' (*.xml,*.mat)';

trunk/src/series/merge_proj.m

@@ -64 +64 @@
     test_movie(iview)=0;
     if ~isequal(hhh,'')&& mmreader.isPlatformSupported()
-        if isequal(lower(FileExt{iview}),'.avi')
+        if isequal(lower(Series.FileExt{iview}),'.avi')
             MovieObject{iview}=mmreader(fullfile(Series.RootPath{iview},[Series.RootFile{iview} Series.FileExt{iview}]));
             test_movie(iview)=1;
@@ -158 +158 @@
 VelType_val=get(hseries.VelTypeMenu,'Value');
 VelType=VelType_str{VelType_val}; %the same for all views
-if isequal(FieldName,'get_field...')
+if strcmp(FieldName,'')
+    msgbox_uvmat('ERROR','no input field defined in FieldMenu')
+elseif strcmp(FieldName,'get_field...')
     hget_field=findobj(allchild(0),'Name','get_field');%find the get_field... GUI
     SubField=get_field('read_get_field',hObject,eventdata,hget_field); %read the names of the variables to plot in the get_field GUI

trunk/src/struct2nc.m

@@ -113 +113 @@
             VarDimIndex=Data.VarDimIndex{ivar}; %indices of the variable dimensions in the list of dimensions
             siz=size(VarVal);
-            VarDimName=Data.VarDimName{ivar};%NEW
-            if ischar(VarDimName)%NEW
-                VarDimName={VarDimName};%NEW
-            end%NEW
-            testrange=(numel(VarDimName)==1 && strcmp(VarDimName{1},ListVarName{ivar}) && numel(VarVal)==2); %NEW
+            VarDimName=Data.VarDimName{ivar};
+            if ischar(VarDimName)
+                VarDimName={VarDimName};
+            end
+            testrange=(numel(VarDimName)==1 && strcmp(VarDimName{1},ListVarName{ivar}) && numel(VarVal)==2);
             testline=isequal(length(siz),2) && isequal(siz(1),1)&& isequal(siz(2), Data.DimValue(VarDimIndex));
             testcolumn=isequal(length(siz),2) && isequal(siz(1), Data.DimValue(VarDimIndex))&& isequal(siz(2),1);
-            if ~testline && ~testcolumn && ~isequal(siz,Data.DimValue(VarDimIndex))
+            if ~testrange && ~testline && ~testcolumn && ~isequal(siz,Data.DimValue(VarDimIndex))
                 errormsg=['wrong dimensions declared for ' ListVarName{ivar} ' in struct2nc.m'];
                 break