Changeset 1179 for trunk/src/editxml.m

Timestamp:

Mar 23, 2025, 11:13:38 AM (4 weeks ago)

Author:

sommeria

Message:

a few bug repairs and cleaning

File:

• trunk/src/editxml.m (modified) (12 diffs)

trunk/src/editxml.m

@@ -862 +862 @@
 filedat=[];
 if ~isempty(list_uid)
-    filedat=get(t,list_uid(1))
-    if isfield(filedat,'type') & isequal(filedat.type,'chardata') &isfield(filedat,'value')
+    filedat=get(t,list_uid(1));
+    if isfield(filedat,'type') && isequal(filedat.type,'chardata') && isfield(filedat,'value')
         testsimple=1;%simple element
     end
@@ -876 +876 @@
     if isequal(attr.key,'source')% look for 'source' attribute
         if isequal(attr.val,'file')%if the source is 'file', look for the path and open it
-           if isfield(filedat,'type') & isequal(filedat.type,'chardata') &isfield(filedat,'value')
+           if isfield(filedat,'type') && isequal(filedat.type,'chardata') && isfield(filedat,'value')
                cur_file=filedat.value;
                uidparent=root_uid;%initialization
@@ -882 +882 @@
                     uidparent=parent(t,uidparent);
                     dirdat=get(t,uidparent);
-                    if isfield(dirdat,'type') & isequal(dirdat.type,'element') & isfield(dirdat,'name')
+                    if isfield(dirdat,'type') && isequal(dirdat.type,'element') && isfield(dirdat,'name')
                         nbattrib_up= attributes(t,'length',uidparent);
                         for iattr_up=1:nbattrib_up
@@ -893 +893 @@
                end
                RootPath=fileparts(CurrentFile);%path to the current .xml file
-               cur_file=fullfile(RootPath,cur_file)
+               cur_file=fullfile(RootPath,cur_file);
                set(handles.CurrentAttributes,'UserData',cur_file)%will be searched by uvmat
-               [path,fil,ext]=fileparts(cur_file);
+               [~,~,ext]=fileparts(cur_file);
                if ~exist(cur_file,'file')
                    msgbox_uvmat('ERROR',['non-existent link file' cur_file]) % A FAIRE: propose to updtate the .xml file
@@ -909 +909 @@
                    CurrentFile_Callback(handles.CurrentFile, [], handles)
                else
-                   if isequal(get(heditxml,'Tag'),'browser'); %if editxml has been called as a browser
+                   if isequal(get(heditxml,'Tag'),'browser') %if editxml has been called as a browser
                        set(heditxml,'Tag','idle')% signal for uvmat browser
                    else
@@ -925 +925 @@
 %list subtree
 if ~testsimple
-    list_element=[];
+    list_element=cell(length(list_uid));
     for iline=1:length(list_uid)
         element=get(t,list_uid(iline));
-        if isfield(element,'type')&isequal(element.type,'element')
+        if isfield(element,'type')&& isequal(element.type,'element')
              list_element{iline,2}=element.name;
              child_uid=children(t,list_uid(iline));
              subelem=get(t,child_uid);
-             if isfield(subelem,'type')& isfield(subelem,'value') & isequal(subelem.type,'chardata')
+             if isfield(subelem,'type')&& isfield(subelem,'value') && isequal(subelem.type,'chardata')
                 data_read=subelem.value;
                 list_element{iline,3}=['= ' data_read];
             end
-            if iscell(subelem)|(isfield(subelem,'type')&isequal(subelem.type,'element'))
+            if iscell(subelem)||(isfield(subelem,'type')&& isequal(subelem.type,'element'))
                 list_element{iline,1}='+ ';%sign for subtree existence
             else
@@ -965 +965 @@
 function update_ref_list(hh,xs_element,element,node,xs_subelem,subelem)
 %-----------------------------
-pref_col='';
+%pref_col='';
 key_col='';
-equal_sign='';
+%equal_sign='';
 val_col='';
 for iline=1:length(subelem)
@@ -1000 +1000 @@
 global xs  t
 
-export_list=get(handles.export_list,'String');
-export_val=get(handles.export_list,'UserData');
+%export_list=get(handles.export_list,'String');
+%export_val=get(handles.export_list,'UserData');
 heditxml=get(handles.replicate,'parent');
 Data=get(heditxml,'UserData');
@@ -1007 +1007 @@
 hdataview=findobj(allchild(0),'Name','dataview');
 if isempty(hdataview)
-    hdataview=dataview;
     return
 end
@@ -1027 +1026 @@
     ListRecords=ListRecords(Value);
 end
-[ListDevices,ListRecords,ListXml,List]=dir_scan(CurrentPath,ListExperiments,ListDevices,ListRecords);
+[~,~,~,List]=dir_scan(CurrentPath,ListExperiments,ListDevices,ListRecords);
 ListXml=get(hhdataview.ListXml,'String');
 Value=get(hhdataview.ListXml,'Value');
@@ -1065 +1064 @@
                                 % fill the root elements if absent
                                 for index=2:length(uidlist)
-                                    name_t=get(t,uidlist(index),'name')
-                                    findstr=[findstr '/' name_t]
-                                    uid=find(t_export,findstr)
+                                    name_t=get(t,uidlist(index),'name');
+                                    findstr=[findstr '/' name_t];
+                                    uid=find(t_export,findstr);
                                     if isempty(uid)
                                         [t_export,uid_export(index)]=add(t_export,uid_export(index-1),'element',name_t);
@@ -1088 +1087 @@
                             for ilistxml=1:length(ListXml)
                                 if isequal(FileName,ListXml{ilistxml})
-                                    xmlfullname=fullfile(CurrentPath,ExpName,DeviceName,RecordName,FileName)
+                                    xmlfullname=fullfile(CurrentPath,ExpName,DeviceName,RecordName,FileName);
                                     break
                                 end