Changeset 686 for trunk/src/uvmat.m

Timestamp:

Sep 19, 2013, 11:07:39 AM (11 years ago)

Author:

sommeria

Message:

further cleaning

File:

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

trunk/src/uvmat.m

@@ -922 +922 @@
     drawnow
     [XmlDataRead,warntext]=imadoc2struct(XmlFileName);
-    if ~isempty(warntext)
-        msgbox_uvmat('WARNING',warntext)
-    end
     if ~isempty(XmlDataRead)
-        ImaDoc_str=['view ' DocExt];  % DocExt= '.xml' or .civ (obsolete case)
-        %XmlData=XmlDataRead;     
+        ImaDoc_str=['view ' DocExt];  % DocExt= '.xml' or .civ (obsolete case)    
             if isfield(XmlDataRead,'TimeUnit')&& ~isempty(XmlDataRead.TimeUnit)
                 TimeUnit=XmlDataRead.TimeUnit;
@@ -1050 +1046 @@
 if ~isempty(TimeUnit)
     if index==2 && isfield(UvData,'TimeUnit') && ~strcmp(UvData.TimeUnit,TimeUnit)
-        msgbox_uvmat('WARNING',['time unit for second file series ' TimeUnit ' inconsistent with first series'])
+        warntext=['time unit for second file series ' TimeUnit ' inconsistent with first series'];
     else
         UvData.TimeUnit=TimeUnit;
@@ -1059 +1055 @@
 
 %display warning message
-if ~isequal(warntext,'')
+if ~isempty(warntext)
     msgbox_uvmat('WARNING',warntext);
 end