Index: trunk/src/PARAM.xml.default
===================================================================
--- trunk/src/PARAM.xml.default (revision 1036)
+++ trunk/src/PARAM.xml.default (revision 1037)
@@ -2,5 +2,4 @@
-${MCRROOT712}
bin/civ
@@ -14,6 +13,4 @@
-oar
-${MCRROOT712}
bin/civ
bin/civ1
@@ -23,5 +20,3 @@
bin/patch_up
-XML_SCHEMAS
Index: trunk/src/browse_data.m
===================================================================
--- trunk/src/browse_data.m (revision 1036)
+++ trunk/src/browse_data.m (revision 1037)
@@ -87,5 +87,5 @@
%% initialize the GUI
-if ~(exist('DataSeries','var') && ischar(DataSeries) && exist(DataSeries,'dir'))
+if isempty(regexp(DataSeries,'^http:'))&& ~(exist('DataSeries','var') && ischar(DataSeries) && exist(DataSeries,'dir'))
DataSeries=pwd;% current dir is the starting data series by default
end
@@ -210,6 +210,6 @@
%------------------------------------------------------------------------
errormsg='';
-if exist(Campaign,'dir')
- ListStruct=dir(Campaign); %list files and dirs
+if ~isempty(regexp(Campaign,'^http'))|| exist(Campaign,'dir')
+ ListStruct=dir_uvmat(Campaign); %list files and dirs
if numel(ListStruct)>1000% A campaign folder must contain maily a list of 'experiment' sub-folders
errormsg=[Campaign ' contains too many items (>1000) to be a Campaign folder'];
Index: trunk/src/dir_uvmat.m
===================================================================
--- trunk/src/dir_uvmat.m (revision 1036)
+++ trunk/src/dir_uvmat.m (revision 1037)
@@ -27,11 +27,18 @@
%=======================================================================
-function [ ListFiles] = dir_uvmat(DirName)
+function [ ListFiles,errormsg] = dir_uvmat(DirName)
+errormsg='';
if regexp(DirName,'^http://')
catalog=[DirName,'/catalog.xml'];
+ try
str=urlread(catalog);
- ListFiles=(regexp(str,'xlink:title="(?[^"]+)"','names'))';
+ catch ME
+ ListFiles=[];
+ errormsg=ME.message;
+ return
+ end
+ ListFiles=(regexp(str,'xlink:title="(?[^"]+)"','names'))';%list subfolders
NumDir=numel(ListFiles);
- ListFiles=[ListFiles;(regexp(str,'dataset name="(?[^"]+)"','names'))'];
+ ListFiles=[ListFiles;(regexp(str,'dataset name="(?[^"]+)"','names'))'];% append files to the list
for ilist=1:numel(ListFiles)
ListFiles(ilist).date=0;
@@ -43,4 +50,5 @@
ListFiles(ilist).isdir=true;
end
+ ListFiles(NumDir+1)=[];
else
ListFiles=dir(DirName);
Index: trunk/src/editxml.m
===================================================================
--- trunk/src/editxml.m (revision 1036)
+++ trunk/src/editxml.m (revision 1037)
@@ -55,5 +55,4 @@
% varargin command line arguments to editxml (see VARARGIN)
-% set(handles.replicate,'String',['copy';'<---'])
if nargin
CurrentFile=varargin{1};
@@ -61,12 +60,7 @@
CurrentFile=[];
end
-% if exist('varargin') & length(varargin)>=1
-% CurrentFile=cell2mat(varargin{1});
-% else
-% CurrentFile=[];
-% end
+
% Choose default command line output for editxml
handles.output = hObject;
-% set(hObject,'Units','pixel')
if exist(CurrentFile,'file')
[PathName,Nme,FileExt]=fileparts(CurrentFile);
@@ -118,16 +112,5 @@
DataIn.CurrentUid=[DataIn.CurrentUid NewRootUid];%record new current uid
DataIn.xs_CurrentUid=[DataIn.xs_CurrentUid xs_node];%record the new curent schema uid
- end
-
-% %update the import file display
-% if isfield(DataIn,'h_ref')&ishandle(DataIn.h_ref)
-% tag0_ref=find(t_ref,['/' path '/' xs_element.key]);
-% node_ref=list.index(ind);
-% if length(tag0_ref)1
-% xs_nodeup=DataIn.xs_UpUid
xs_nodeup=DataIn.xs_CurrentUid(end-1);
DataIn.xs_CurrentUid(end)=[];%uid of the root element in the schema
@@ -245,27 +226,4 @@
update_list(handles,path,xs_element,element,DataIn.CurrentUid(end),xs_subelem,subelem);
set(handles.list_element,'Value',element_index);
-
-%
-% % --- Executes on button press in inport_file.
-% function inport_file_Callback(hObject, eventdata, handles)
-% CurrentFile=get(handles.RefFile,'String');
-% if isempty(CurrentFile)|isequal(CurrentFile,'')
-% CurrentFile=get(handles.CurrentFile,'String')
-% end
-% [FileName, PathName]=uigetfile( ...
-% {'*.xml', '(*.xml)';
-% '*.xml', '.xml files '; ...
-% '*.*', 'All Files (*.*)'}, ...
-% 'Pick a file',CurrentFile); %file browser
-% fileinput=fullfile(PathName,FileName);
-% sizf=size(fileinput);
-% if (~ischar(fileinput)|~isequal(sizf(1),1)),return;end% keep only character strings as input file name
-% if exist(fileinput,'file')
-% set(handles.RefFile,'Visible','on')
-% set(handles.replicate,'Visible','on')
-% set(handles.RefFile,'String',fileinput)
-% RefFile_Callback(handles.RefFile, eventdata, handles)
-% end
-
%------------------------------------------------------
@@ -287,5 +245,4 @@
if (~ischar(CurrentFile)||~isequal(sizf(1),1)),return;end% keep only character strings as input file name
if exist(CurrentFile,'file')
-% set(handles.CurrentAttributes,'UserDataIn',PathName); %store the path to the xml file
[CurPath,CurName,CurExt]=fileparts(CurrentFile);
if isequal(CurExt,'.xls')
@@ -333,11 +290,4 @@
%Path to shemas:
path_uvmat=fileparts(which('editxml'));% check the path detected for source file uvmat
- % path_UVMAT=fileparts(path_uvmat); %path to UVMAT
- % xmlparam=fullfile(path_UVMAT,'PARAM.xml');
- % xmlparam='PARAM.xml'; %will find PARAM.xml whose path is set in priority
- % if exist(xmlparam,'file')
- % tparam=xmltree(xmlparam);
- % sparam=convert(tparam);
- % if isfield(sparam,'SchemaPath')
schemafile=[fullfile(path_uvmat,'xml_shemas',head_name) '.xsd'];
if ~exist(schemafile,'file')
@@ -347,20 +297,6 @@
xs=xmltree(schemafile);
else
-% msgbox_uvmat('WARNING','The xml schema is not found, check the file PARAM.xml')
-% [FileName, PathName]=uigetfile( ...
-% {'*.xsd', '(*.xsd)';
-% '*.xsd', '.xsd files '; ...
-% '*.*', 'All Files (*.*)'}, ...
-% 'Pick a .xsd schema' ,schemafile); %file browser
-% if ischar(PathName) && ischar(FileName) && exist(fullfile(PathName,FileName),'file')
-% DataIn.Schema=fullfile(PathName,FileName);
-% xs=xmltree(DataIn.Schema);%open the associated schema file
-% else
xs=[];
-%
-
- end
- % end
- % end
+ end
end
DataIn.CurrentUid=1;
@@ -533,8 +469,6 @@
xs_subelem(k).minOccurs=1; %default
xs_subelem(k).maxOccurs=1; %default
-% pref{k}=[]; %default
if isequal(node_content.name,'xs:element')
attr=node_content.attributes;
-% attr{:}.key
for l=1:length(attr)
if isequal(attr{l}.key,'name')
@@ -561,5 +495,4 @@
end
end
-
end
end
@@ -576,5 +509,4 @@
node1=children(xs,node_type(i));
node2=find(xs,node1,'name','xs:restriction');
-% nodename1=find(xs,
node3=children(xs,node2);
node4=find(xs,node3,'name','xs:enumeration');
@@ -621,9 +553,6 @@
element.attr_val='';%default
element.val='';
-% element.type='';
-% element.testmanual=testmanual %inheritates the input manual editing flag by default
subelem=[]; %default
attrup=[];
-% node=[];
% %find the element properties in the xml file
@@ -635,5 +564,5 @@
element.val=[];
else
- element.val=elem_contents.value
+ element.val=elem_contents.value;
end
end
@@ -643,8 +572,6 @@
element.attr_key{iattr}=elem_attr{iattr}.key ;
element.attr_val{iattr}=elem_attr{iattr}.val;
-% attrup=setfield(attrup,elem_attr{iattr}.key,elem_attr{iattr}.val);
breakdetect=find(elem_attr{iattr}.key=='/'| elem_attr{iattr}.key==':'| elem_attr{iattr}.key=='.');% find '/'
if isempty(breakdetect)
-% comline=['attrup.' elem_attr{iattr}.key '=' elem_attr{iattr}.val ';']
eval(['attrup.' elem_attr{iattr}.key '=''' elem_attr{iattr}.val ''';'])
end
@@ -678,6 +605,4 @@
iline=0;
for k=1:length(xs_subelem)%node2: list of subelements in the sub-sequence
-% attr=attributes(xs,'get',node2(i),1);%
-% element=attr.val;%name of the element
tag=find(t,['/' path '/' xs_element.key '/' xs_subelem(k).key]);%look for the corresponding element node in the .xml tree
struct_element=get(t,tag);%get the content of the element
@@ -687,5 +612,4 @@
subelem(iline).xsindex=k;
subelem(iline).index=0;
-% subelem(iline).testmanual=element.testmanual;% inheritates the manual editing flag by default
if isequal(xs_subelem(k).minOccurs,'0')
subelem(iline).val='[]';%element value not mandatory in the schema
@@ -693,5 +617,4 @@
subelem(iline).val='[MISSING]';%element value mandatory in the schema
end
-% subelem(iline).attrup=attrup; %inheritated attributes
elseif isequal(length(struct_element),1)
contents=get(t,struct_element.contents);
@@ -700,5 +623,4 @@
subelem(iline).xsindex=k;
subelem(iline).index=1;
-% subelem(iline).testmanual=element.testmanual;%
if isfield(contents,'value') & ~isempty(contents.value)
subelem(iline).val=contents.value;
@@ -710,12 +632,9 @@
subelem(iline).val='[MISSING]';%element value mandatory in the schema
end
-% subelem(iline).attrup=attrup; %inheritated attributes
if isfield(struct_element,'attributes')
element_attr=struct_element.attributes;
attr_display=[];
for iattr=1:length(element_attr)
-% attr_display{iline}=[attr_display ' , ' element_attr{iattr}.key ' = ' element_attr{iattr}.val];
subelem(iline).val=[subelem(iline).val attr_display ' , ' element_attr{iattr}.key ' = ' element_attr{iattr}.val];
-% subelem(iline).attrup=setfield(subelem(iline).attrup,element_attr{iattr}.key,element_attr{iattr}.val);
end
end
@@ -726,5 +645,4 @@
subelem(iline).index=subindex;%index of the element
subelem(iline).xsindex=k;
-% subelem(iline).testmanual=element.testmanual;%
if isfield(contents,'value')& ~isempty(contents.value)
subelem(iline).val=contents.value;
@@ -734,12 +652,9 @@
subelem(iline).val='[]';
end
-% subelem(iline).attrup=attrup; %inheritated attributes
if isfield(struct_element{subindex},'attributes')
element_attr=struct_element{subindex}.attributes;
attr_display=[];
for iattr=1:length(element_attr)
-% attr_display{iline}=[attr_display ' , ' element_attr{iattr}.key ' = ' element_attr{iattr}.val];
subelem(iline).val=[subelem(iline).val attr_display ' , ' element_attr{iattr}.key ' = ' element_attr{iattr}.val];
-% subelem(iline).attrup=setfield(subelem(iline).attrup,element_attr{iattr}.key,element_attr{iattr}.val);
end
end
@@ -757,22 +672,8 @@
set(handles.export_list,'String','')%flush the export list
set(handles.CurrentElement,'String',[path '/' xs_element.key])
-% title_element.key=[path '/' xs_element.key];
-% if ~isempty(path)
-% xsnode_index=get(handles.list_element,'UserDataIn');
-% ind=get(handles.list_element,'Value');
-% title_element.index=xsnode_index(2,ind);
-% else
-% title_element.index=1;
-% end
-% title_element.xsnode=xs_element.uid;
-% title_element.node=node;
-% set(handles.CurrentFile,'UserDataIn',title_element)%element corresponding to the title
set(handles.CurrentAnnotation,'String',xs_element.annot)
attr_col=[];
testedit=0;% cannot edit elements by default
for iattr=1:length(element.attr_key)
-% if isequal(element.attr_key{iattr},'source') & isequal(element.attr_val{iattr},'manual')
-% testedit=1;
-% end
attr_col=strvcat(attr_col,[element.attr_key{iattr} ' = ' element.attr_val{iattr}]);
end
@@ -792,5 +693,4 @@
end
node(iline)=xs_subelem(xsindex).node;
-% testmanual(iline)=subelem(iline).testmanual;
ikey=xs_subelem(xsindex).key;
if xs_subelem(xsindex).testsub
@@ -812,5 +712,4 @@
set(handles.element_value,'Visible','off')
else % we edit an element
-
export_list=get(handles.export_list,'String');%export list
testadd=1;
@@ -840,13 +739,8 @@
testedit=0;% cannot edit element by default
for iattr=1:length(element.attr_key)
-% if isequal(element.attr_key{iattr},'source') & isequal(element.attr_val{iattr},'manual')
-% testedit=1;
-% end
attr_col=strvcat(attr_col,[element.attr_key{iattr} ' = ' element.attr_val{iattr}]);
end
set(handles.element_attrib,'String',attr_col)
set(handles.element_key,'String',xs_element.key)
-
-
if isempty(xs_element.enum)
set(handles.element_value,'Value',1)
@@ -890,18 +784,18 @@
CurrentFile=get(handles.CurrentFile,'String');
if isfield(DataIn,'Schema')
-if ~isempty(DataIn.Schema)% update ref to schema
- attrxsd=attributes(t,'get',1);
- setest=0;
- for iattr=1:length(attrxsd)
- if isequal(attrxsd{iattr}.key,'xsi:noNamespaceSchemaLocation')
- t= attributes(t,'set',1,iattr,'xsi:noNamespaceSchemaLocation',DataIn.Schema);
- setest=1;
- end
- end
- if setest==0;
- t=attributes(t,'add',1,'xmlns:xsi','http://www.w3.org/2001/XMLSchema-instance');
- t= attributes(t,'add',1,'xsi:noNamespaceSchemaLocation',DataIn.Schema);
- end
-end
+ if ~isempty(DataIn.Schema)% update ref to schema
+ attrxsd=attributes(t,'get',1);
+ setest=0;
+ for iattr=1:length(attrxsd)
+ if isequal(attrxsd{iattr}.key,'xsi:noNamespaceSchemaLocation')
+ t= attributes(t,'set',1,iattr,'xsi:noNamespaceSchemaLocation',DataIn.Schema);
+ setest=1;
+ end
+ end
+ if setest==0;
+ t=attributes(t,'add',1,'xmlns:xsi','http://www.w3.org/2001/XMLSchema-instance');
+ t= attributes(t,'add',1,'xsi:noNamespaceSchemaLocation',DataIn.Schema);
+ end
+ end
end
copyfile(CurrentFile,[CurrentFile '.bak']);
@@ -939,11 +833,4 @@
% Hints: contents = get(hObject,'String') returns element_attr_val contents as cell array
% contents{get(hObject,'Value')} returns selected item from element_attr_val
-
-
-% --- Executes on button press in ADD.
-function ADD_Callback(hObject, eventdata, handles)
-% hObject handle to ADD (see GCBO)
-% eventdata reserved - to be defined in a future version of MATLAB
-% handles structure with handles and user data (see GUIDATA)
%----------------------------------------
@@ -999,5 +886,4 @@
for iattr_up=1:nbattrib_up
attr= attributes(t,'get',uidparent,iattr_up);
-% if isequal(attr.key,'source')&isequal(attr.val,'directory')% look for 'source' attribute
if isequal(attr.key,'DirName')
cur_file=fullfile(attr.val,cur_file);
@@ -1031,6 +917,4 @@
end
end
- %elseif isequal(attr.val,'dir') A FAIRE : check directory
- %else A FAIRE: edit the element
end
end
@@ -1042,5 +926,4 @@
if ~testsimple
list_element=[];
-% Data.CurrentUid=[Data.CurrentUid root_uid]%record new current uid
for iline=1:length(list_uid)
element=get(t,list_uid(iline));
@@ -1097,5 +980,4 @@
index(iline)=indexcur;
node(iline)=xs_subelem(xsindex).node;
-% testmanual(iline)=subelem(iline).testmanual;
ikey=xs_subelem(xsindex).key;
if xs_subelem(xsindex).testsub
@@ -1114,74 +996,4 @@
set(hh,'UserData',RefDataIn)
-%
-% function RefFile_Callback(hObject, eventdata, handles)
-% global t_ref xs
-% t_ref=xmltree(get(hObject,'String'));%open the xml file fileinput
-% heditxml=get(hObject,'parent');
-% DataIn=get(get(hObject,'parent'),'UserData');
-% % set(heditxml,'Units','pixel')
-% figpos=get(heditxml,'Position')
-% % title_element=get(handles.element_cur,'UserDataIn');
-% % xs_node=xsnode_index(1,ind);
-% % index_chosen=xsnode_index(2,ind);
-% if isfield(DataIn,'fig_ref')&ishandle(DataIn.fig_ref)
-% figure(DataIn.fig_ref);
-% else
-% DataIn.fig_ref=figure;
-% end
-% set(DataIn.fig_ref,'Name',get(hObject,'String'))
-% set(DataIn.fig_ref,'MenuBar','none')
-% newfigpos=[figpos(1)+figpos(3) figpos(2)+0.4*figpos(4) 0.5*figpos(3) 0.3*figpos(4)];
-% set(DataIn.fig_ref,'Units','normalized')
-% set(DataIn.fig_ref,'Position',newfigpos)
-% DataIn.h_ref=uicontrol('Style','listbox', 'Max',2,'Units','pixel','Position', [0 0 newfigpos(3) newfigpos(4)], ...
-% 'FontName','FixedWidth','Tag','listbox');
-% if isfield(DataIn,'xs_CurrentUid');
-% xs_CurrentUid=DataIn.xs_CurrentUid(end);
-% else
-% DataIn.xs_CurrentUid=find(xs,'/xs:schema/xs:element');%uid of the root element in the schema
-% end
-% [nodeup,path,xs_element,xs_subelem]=scan_schema(xs,xs_CurrentUid(end));
-% xs_element.key
-% tag0=find(t_ref,['/' path '/' xs_element.key]);
-% if length(tag0)>=1
-% CurrentRefNode=tag0(1);%chose the first occurence of the element
-% else
-% CurrentRefNode=0;
-% end
-% [ref_element,ref_subelem]=get_xml(t_ref,path,xs_element,CurrentRefNode,xs_subelem);
-% update_ref_list(DataIn.h_ref,xs_element,ref_element,CurrentRefNode,xs_subelem,ref_subelem);
-% siztext=size(get(DataIn.h_ref,'String'));
-% set(DataIn.h_ref,'Value',[1:siztext(1)]); %select the whole list by default
-% set(heditxml,'UserData',DataIn)
-% set(handles.ref_data,'Value',siztext(1)); %select the whole list by default
-% 'TESTimport'
-% title_element=get(handles.element_cur,'UserDataIn')
-% xs_node=title_element.xsnode;%uid of the element in the schema
-% node=title_element.node;
-% t=flush(t,node);%removes the corresponding subtree in t
-% [nodeup,path,xs_element,xs_subelem]=scan_schema(xs,xs_node);%scan the schema
-% tag0=find(t_import,['/' path '/' xs_element.key])
-% if isempty(tag)
-% errordlg(['element /' path '/' xs_element.key ' not found in' fileinput])
-% return
-% end
-% % [element_import,node_import]=get_xml(t_import,path,xs_element,1,xs_subelem);% read the corresponding xml data
-% node2_import=children(t_import,tag0);
-% % t_import=branch(t_import,node_import);% extract branch of the new file
-% % %removes the corresponding subtree in t
-% for inode=1:length(node2_import)
-% struct=get(t_import,node2_import(inode))
-% if isfield(struct,'type') & isfield(struct,'name')%if the node is an elmeent type
-% node3_import=children(t_import,node2_import(inode))
-% [t,newuid]=add(t,node,struct.type,struct.name);
-% for inode2=1:length(node3_import)
-% struct2=get(t_import,node3_import(inode2))
-% if isequal(struct2.type,'chardata')
-% t=add(t,newuid,'chardata',struct2.value);
-% end
-% end
-% end
-% end
% --- Executes on button press in replicate.
function replicate_Callback(hObject, eventdata, handles)
@@ -1191,7 +1003,7 @@
export_val=get(handles.export_list,'UserData');
heditxml=get(handles.replicate,'parent');
-Data=get(heditxml,'UserData')
-
-hdataview=findobj(allchild(0),'Name','dataview')
+Data=get(heditxml,'UserData');
+
+hdataview=findobj(allchild(0),'Name','dataview');
if isempty(hdataview)
hdataview=dataview;
@@ -1215,5 +1027,4 @@
ListRecords=ListRecords(Value);
end
-% uvmat('runplus_Callback',hObject,eventdata,handleshaxes)
[ListDevices,ListRecords,ListXml,List]=ListDir(CurrentPath,ListExperiments,ListDevices,ListRecords);
ListXml=get(hhdataview.ListXml,'String');
@@ -1268,8 +1079,4 @@
end
end
-% [Title,test]=check_heading(Currentpath,Campaign,ExpName,DeviceName,[],FileName,SubCampaignTest);
-% if test
-% [List.Experiment{iexp}.Device{idevice}.xmlfile{ixml} ' , Heading updated']
-% end
end
elseif isfield(List.Experiment{iexp}.Device{idevice},'Record')
@@ -1285,8 +1092,4 @@
end
end
-% [Title,test]=check_heading(Currentpath,Campaign,ExpName,DeviceName,RecordName,FileName,SubCampaignTest);
-% if test
-% [FileName ' , Heading updated']
-% end
end
end
@@ -1350,5 +1153,5 @@
[element,subelem]=get_xml(t,path,xs_element,DataIn.CurrentUid(end),xs_subelem);
update_list(handles,path,xs_element,element,DataIn.CurrentUid(end),xs_subelem,subelem);
-% t=set_xml(t,xs_DataIn,subelem)
+
%edit list of subelments:
@@ -1538,9 +1341,3 @@
-% --- Executes on button press in pushbutton9.
-function pushbutton9_Callback(hObject, eventdata, handles)
-% hObject handle to pushbutton9 (see GCBO)
-% eventdata reserved - to be defined in a future version of MATLAB
-% handles structure with handles and user data (see GUIDATA)
-
-
+
Index: trunk/src/read_xls.m
===================================================================
--- trunk/src/read_xls.m (revision 1036)
+++ trunk/src/read_xls.m (revision 1037)
@@ -101,26 +101,5 @@
ExpDocName=fullfile(ExpPath,[ExpName '.xml']);% full name of the .xml file ExpDoc
if exist(ExpDocName,'file')
- hh=editxml({ExpDocName})
-% [FileName, PathName, filterindex] = uigetfile( ...
-% {'*.xml','(*.xml)';
-% '*.xml', '.xml files ';
-% '*.*', 'All Files (*.*)'}, ...
-% 'Pick a file',ExpDocName);
-% fileinput=[PathName FileName];%complete file name
-% sizf=size(fileinput);
-% if (~ischar(fileinput)|~isequal(sizf(1),1)),return;end
-% [path,name,ext]=fileparts(fileinput);
-% if isequal(ext,'.civ') | isequal(ext,'.log') | isequal(ext,'.cmx') isequal(ext,'.txt')
-% edit(fileinput)
-% elseif isequal(ext,'.xml')
-% varargin{1}=fileinput;
-% editxml(varargin)
-% elseif isequal(ext,'.fig')
-% open(fileinput)
-% elseif isequal(ext,'.xls')
-% xlsdisplay(fileinput)
-% else
-% uvmat({fileinput})
-% end
+ hh=editxml({ExpDocName});
else
answer=questdlg({['ExpDoc file ' ExpDocName ' does not exist, create the experiment?'];''})
Index: trunk/src/series.m
===================================================================
--- trunk/src/series.m (revision 1036)
+++ trunk/src/series.m (revision 1037)
@@ -486,5 +486,5 @@
InputTable=get(handles.InputTable,'Data');
if ~isempty(InputTable)
-oldfile=fullfile(InputTable{1,1},InputTable{1,2});
+oldfile=[InputTable{1,1} InputTable{1,2}];
else
% use a file name stored in prefdir
Index: trunk/src/series.xml.default
===================================================================
--- trunk/src/series.xml.default (revision 1036)
+++ trunk/src/series.xml.default (revision 1037)
@@ -12,5 +12,3 @@
cluster_command
-
-
Index: trunk/src/uigetfile_uvmat.m
===================================================================
--- trunk/src/uigetfile_uvmat.m (revision 1036)
+++ trunk/src/uigetfile_uvmat.m (revision 1037)
@@ -73,6 +73,6 @@
end
-hfig=findobj(allchild(0),'tag',option);
-if isempty(hfig)
+hfig=findobj(allchild(0),'tag',option);%look for existing browser fig
+if isempty(hfig)% create the browser fig if it does not exist
set(0,'Unit','points')
ScreenSize=get(0,'ScreenSize');% get the size of the screen, to put the fig on the upper right
@@ -149,5 +149,10 @@
function OK_Callback(option,filter_ext,hObject,event)
set(hObject,'backgroundColor',[1 1 0])% indicate button activation
-hfig=get(hObject,'parent');%handle of the fig
+fig_struct=get(hObject,'parent');
+if isstruct(fig_struct);%recent Matlab
+ hfig=fig_struct.Number;
+else
+ hfig=fig_struct;
+end
htitlebox=findobj(hfig,'tag','titlebox'); % display the current dir name
DirName=get(htitlebox,'String');
@@ -192,10 +197,4 @@
end
set(hObject,'backgroundColor',[0 1 0])% indicate end button activatio
-fig_struct=get(hObject,'parent');
-if isstruct(fig_struct);%recent Matlab
-uiresume(fig_struct.Number)
-else
- uiresume(fig_struct)
-end
%------------------------------------------------------------------------