Changeset 570

Timestamp:

Feb 20, 2013, 8:28:09 AM (12 years ago)

Author:

sommeria

Message:

bugs corrected in browse_data

Location:

trunk/src

Files:

• browse_data.fig (modified) (previous)
• browse_data.m (modified) (4 diffs)
• check_files.m (modified) (2 diffs)
• update_project.fig (deleted)
• update_project.m (deleted)

trunk/src/browse_data.m

@@ -92 +92 @@
         set(handles.CreateMirror,'String','create_mirror')
     end
-    SourceDir_Callback([],[], handles)
+    scan_campaign(handles,Campaign)
+%     SourceDir_Callback([],[], handles)
    set(handles.edit_xml,'Visible','off')
    set(handles.HELP,'Visible','off')
@@ -177 +178 @@
 
 %------------------------------------------------------------------------
-function SourceDir_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-set(handles.SourceDir,'BackgroundColor',[1 1 0])
+function scan_campaign(handles,Campaign)
+%------------------------------------------------------------------------
+%set(handles.SourceDir,'BackgroundColor',[1 1 0])
 drawnow
-SourceDir=get(handles.SourceDir,'String');
-MirrorDir=get(handles.MirrorDir,'String');
+%SourceDir=get(handles.SourceDir,'String');
+%MirrorDir=get(handles.MirrorDir,'String');
 ExpName={''};
-if exist(SourceDir,'dir')
-    hdir=dir(SourceDir); %list files and dirs
+if exist(Campaign,'dir')
+    hdir=dir(Campaign); %list files and dirs
     idir=0;
     for ilist=1:length(hdir)
@@ -193 +194 @@
                 idir=idir+1;
                 ExpName{idir}=hdir(ilist).name;
-                mirror=fullfile(MirrorDir,ExpName{idir});
-                if ~exist(mirror,'dir')
-                   mkdir(mirror)
-                end
             end
-            % look for the list of 'devices'
-        else
-            %warning for isolated files
         end
     end
     set(handles.ListExperiments,'String',[{'*'};ExpName'])
     set(handles.ListExperiments,'Value',1)
-    ListExperiments_Callback(hObject, eventdata, handles)
-else
-    msgbox_uvmat('ERROR',['The input ' SourceDir ' is not a directory'])
-end
-set(handles.SourceDir,'BackgroundColor',[1 1 1])
+    ListExperiments_Callback([],[], handles)
+else
+    msgbox_uvmat('ERROR',['The input ' Campaign ' is not a directory'])
+end
+%set(handles.SourceDir,'BackgroundColor',[1 1 1])
 
 
@@ -233 +227 @@
     idir=0;
     for ilist=1:length(hdir)
-         if ~isequal(hdir(ilist).name(1),'.')
-        source=fullfile(SourcePath,ListExperiments{iexp},hdir(ilist).name);
-        mirror=fullfile(MirrorPath,ListExperiments{iexp},hdir(ilist).name);
-        if ~exist(mirror)
-            system(['ln -s ' source ' ' mirror])
+        if ~isequal(hdir(ilist).name(1),'.')
+            source=fullfile(SourcePath,ListExperiments{iexp},hdir(ilist).name);
+            if ~isempty(MirrorPath)
+                mirror=fullfile(MirrorPath,ListExperiments{iexp},hdir(ilist).name);
+                if ~exist(mirror)
+                    system(['ln -s ' source ' ' mirror])
+                end
+            end
+            check_list=strcmp(hdir(ilist).name,ListDevices);
+            if isempty(find(check_list))
+                ListDevices=[ListDevices;hdir(ilist).name];
+            end
         end
-        check_list=strcmp(hdir(ilist).name,ListDevices);
-        if isempty(find(check_list))
-            ListDevices=[ListDevices;hdir(ilist).name];
-        end    
-         end
     end
 end

trunk/src/check_files.m

@@ -32 +32 @@
 svn_info.status=[];
 list_fct={...
+    'browse_data';...% function for scanning directories in a project/campaign
+    'browse_data.fig';...% GUI corresponding to dataview
     'calc_field_interp';...% defines fields (velocity, vort, div...) from civx data and calculate them
     'calc_field_tps';...% defines fields (velocity, vort, div...) and calculate them
@@ -45 +47 @@
     'create_grid';...% called by the GUI geometry_calib to create a physical grid
     'create_grid.fig';...% GUI corresponding to create_grid.m
-    'datatree_browser';...% function for scanning directories in a project
-    'datatree_browser.fig';...% GUI corresponding to dataview
     'delete_object';...%delete a projection object, defined by its index in the Uvmat list or by its graphic handle
     'displ_uvmat';...