Changeset 178 for trunk

Timestamp:

Jan 7, 2011, 6:28:11 PM (14 years ago)

Author:

sommeria

Message:

condition on status in civ, change of viw_field by uvmat, bug correction in uvmat in case of input file

Location:

trunk/src

Files:

• civ.m (modified) (5 diffs)
• uvmat.m (modified) (4 diffs)

trunk/src/civ.m

@@ -783 +783 @@
 set(handles.BATCH,'Enable','On')
 set(handles.BATCH,'BackgroundColor',[1 0 0])
+if isfield(handles,'status')
 set(handles.status,'Value',0);%suppress status display
 status_Callback(hObject, eventdata, handles)
+end
 
 %% store the root input filename for future opening
@@ -1563 +1565 @@
 
 % start status callback to visualise results
+if isfield(handles,'status')
 set(handles.status,'Value',1);%suppress status display
 status_Callback(hObject, eventdata, handles)
+end
 
 %------------------------------------------------------------------------
@@ -1578 +1582 @@
 
 % start status callback to visualise results
+if isfield(handles,'status')
 set(handles.status,'Value',1);%suppress status display
 status_Callback(hObject, eventdata, handles)
+end
 %------------------------------------------------------------------------
 % --- Lauch command called by RUN and BATCH: remote processing
@@ -1633 +1639 @@
 
 %% reinitialise status callback 
+if isfield(handles,'status')
 set(handles.status,'Value',0);%suppress status display
 status_Callback(hObject, eventdata, handles)
+end
 
 %% set the list of files and check them
@@ -4715 +4723 @@
      ind_dot=findstr(filename,'...');
      filename=filename(1:ind_dot-1);
-      filename=fullfile(rootroot,filename);
+      filename=fullfile(rootroot,filename)
       if exist(filename,'file')%visualise the vel field if it exists
-        [Field,VelTypeOut]=read_civxdata(filename);
-        view_field(Field)
+        %[Field,VelTypeOut]=read_civxdata(filename);
+        %view_field(Field)
+        uvmat(filename)
+        set(gcbo,'Value',1)
       end
 

trunk/src/uvmat.m

@@ -304 +304 @@
 set(handles.transform_fct,'String',menu_str)
 set(handles.transform_fct,'UserData',fct_handle)% store the list of path in UserData of ACTION
- 
+set(handles.uvmat,'UserData',UvData)
 %initiates menu of vector colors 
 list_menu=calc_field;
@@ -347 +347 @@
         display_file_name(hObject, eventdata, handles,inputfile)
         testinputfield=1;
-    else
-        UvData.TestInputFile=0;
+%     else
+%         UvData.TestInputFile=0;
     end
     if ~isempty(Field)
@@ -356 +356 @@
         
         % set the colorbar position on the interface:
-        UvData.PosColorbar=[0.805 0.022 0.019 0.445];
+       % UvData.PosColorbar=[0.805 0.022 0.019 0.445];
     elseif ischar(input)
         scan_i_Callback(handles.scan_i, eventdata, handles);        
@@ -374 +374 @@
    end
 end
-UvData.NewSeries=1;
-set(hObject,'UserData',UvData)
+% UvData.NewSeries=1;
+set(handles.uvmat,'UserData',UvData)
 if testinputfield
     %delete drawn objects