Changeset 84 for trunk/src/uvmat.m

Timestamp:

Apr 24, 2010, 2:07:22 PM (14 years ago)

Author:

sommeria

Message:

-update_imadoc: copy the timing information of the movie file avi in the new xml file when a geometry_calibration is performed
-set_grid: modified to produce grids in px coordiantes and to display the produced grid
-geometry_calib: display the point with max error
-civ: bug corrected for copying avi movies to png files
-uvmat: small bug fixes
-px_XYZ: introduce default values for Calib parameters

File:

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

trunk/src/uvmat.m

@@ -788 +788 @@
     nbfield=size(XmlData.Time,1);
     nburst=size(XmlData.Time,2);
+    %transform .Time to a column vector if it is a line vector the nomenclature uses a single index
+    if isequal(nbfield,1) && ~isequal(nburst,1)% .Time is a line vector
+        NomType=get(handles.FileIndex,'UserData');
+        if numel(NomType)>=2 &&(strcmp(NomType,'_i')||strcmp(NomType(1:2),'%0')||strcmp(NomType(1:2),'_%'))
+            XmlData.Time=(XmlData.Time)';
+            nbfield=nburst;
+            nburst=1;
+        end
+    end
 end
 last_i_cell=get(handles.last_i,'String');
@@ -822 +831 @@
             set(handles.pycm,'String',num2str(pixcmy))
         end
-        set(handles.transform_fct,'Value',2); % phys transform by default
+        if ~get(handles.FixedLimits,'Value')
+            set(handles.transform_fct,'Value',2); % phys transform by default if fixedLimits is off
+        end
         if isfield(GeometryCalib,'SliceCoord')
            siz=size(GeometryCalib.SliceCoord);
@@ -2122 +2133 @@
      switch FileType
         case 'movie'
-            A=read(UvData.MovieObject,num_i1);
+            try
+                A=read(UvData.MovieObject,num_i1);
+            catch
+                errormsg=lasterr;
+                return
+            end
         case 'avi'
-            mov=aviread(filename,num_i1);
+            try
+                mov=aviread(filename,num_i1);
+            catch
+                errormsg=lasterr;
+                return
+            end
             A=frame2im(mov(1));
         case 'vol'
@@ -2814 +2835 @@
 else
     set(handles.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
+    update_plot(handles);
 end
 
@@ -4208 +4230 @@
 % --- Executes on button press in grid.
 function grid_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
-
-UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface 
-
-%suppress the other options if grid is chosen
-set(handles.edit_vect,'Value',0)
-edit_vect_Callback(hObject, eventdata, handles)
-set(handles.edit,'BackgroundColor',[0.7 0.7 0.7])
-set(handles.edit_vect,'Value',0)  
-edit_vect_Callback(hObject, eventdata, handles)
-set(handles.edit,'BackgroundColor',[0.7 0.7 0.7])
-set(handles.list_object_1,'Value',1)      
-
-%prepare display of the set_grid GUI
-data.fixedtitle=1;
-FileName=read_file_boxes(handles);
-[hset_object,UvData.sethandles]=set_grid(FileName);% call the set_object interface
-set(handles.uvmat,'UserData',UvData);
+
 
 
@@ -4706 +4711 @@
 %-- open the GUI set_grid.fig to create grid
 function MenuGrid_Callback(hObject, eventdata, handles)
-set(handles.TOOLS_txt,'Visible','on')
-set(handles.frame_tools,'Visible','on')
-grid_Callback(hObject,eventdata,handles)
+%UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface 
+
+%suppress the other options if grid is chosen
+set(handles.edit_vect,'Value',0)
+edit_vect_Callback(hObject, eventdata, handles)
+set(handles.edit,'BackgroundColor',[0.7 0.7 0.7])
+set(handles.edit_vect,'Value',0)  
+edit_vect_Callback(hObject, eventdata, handles)
+set(handles.edit,'BackgroundColor',[0.7 0.7 0.7])
+set(handles.list_object_1,'Value',1)      
+
+%prepare display of the set_grid GUI
+FileName=read_file_boxes(handles);
+CoordList=get(handles.transform_fct,'String');
+val=get(handles.transform_fct,'Value');
+set_grid(FileName,CoordList{val});% call the set_object interface
+%set(handles.uvmat,'UserData',UvData);
 
 %----------------------------------------------------------------