Changeset 72 for trunk/src/uvmat.m

Timestamp:

Mar 30, 2010, 11:03:42 AM (14 years ago)

Author:

sommeria

Message:

ima2vol: write image volumes in 16 bits (test for civ_3D)
plot-text removed: put as a sub-function of plot_field
uvmat: movie stops in case of error in reding files
bug fixes for reading 3D vel fields

File:

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

trunk/src/uvmat.m

@@ -1603 +1603 @@
 
 while get(handles.speed,'Value')~=0 & isequal(get(handles.RunMovie,'BusyAction'),'queue') % enable STOP command
-        runpm(hObject,eventdata,handles,increment)
+        errormsg=runpm(hObject,eventdata,handles,increment);
+        if ~isempty(errormsg)
+            return
+        end
         pause(1.02-get(handles.speed,'Value'))% wait for next image
 end
@@ -1622 +1625 @@
 
 %------------------------------------------------------------------
-function runpm(hObject,eventdata,handles,increment)
+function errormsg=runpm(hObject,eventdata,handles,increment)
 %------------------------------------------------------------------
 %check for mùovie pair status
@@ -2411 +2414 @@
         %Zvar=DimVarIndex(DimIndex(1));
          %Zvar=DimVarIndex(1);
-         Zvar=VarType{imax}.coord_3;
-        if Zvar~=0 % z is a dimension variable
-            ZName=UvData.Field.ListVarName{Zvar};
+%          Zvar=VarType{imax}.coord_3;
+        if isfield(VarType{imax},'coord_3')&& ~isequal(VarType{imax}.coord_3,0) % z is a dimension variable
+            ZName=UvData.Field.ListVarName{VarType{imax}.coord_3}
             eval(['UvData.ZMax=max(UvData.Field.' ZName ');'])
             eval(['UvData.ZMin=min(UvData.Field.' ZName ');'])
@@ -2486 +2489 @@
     ZBounds(1)=UvData.ZMin; %minimum for the Z slider
     ZBounds(2)=UvData.ZMax;%maximum for the Z slider
+    UvData.Object{1}.Name='1-PLANE';
+    UvData.Object{1}.enable_plot=1;
     set_object(UvData.Object{1},PlotHandles,ZBounds);
     set(handles.list_object_1,'Value',1);
@@ -4759 +4764 @@
 UvData.MouseAction='create_object';
 set(handles.uvmat,'UserData',UvData)
+set(handles.delete_object,'Visible','on')
+set(handles.uvmat_title,'Visible','on')
+set(handles.viw_field_title,'Visible','on')
 
 %------------------------------------------------------------------------
@@ -4803 +4811 @@
 [hset_object,UvData.sethandles]=set_object(data,PlotHandles);% call the set_object interface
 
-pos_uvmat=get(handles.uvmat,'Position');
-%position the set_object GUI with respect to uvmat
-if isfield(UvData,'SetObjectOrigin')
-    pos_set_object(1:2)=UvData.SetObjectOrigin + pos_uvmat(1:2);
-    pos_set_object(3:4)=UvData.SetObjectSize .* pos_uvmat(3:4);
-    set(hset_object,'Position',pos_set_object)
-end
+% pos_uvmat=get(handles.uvmat,'Position');
+% %position the set_object GUI with respect to uvmat
+% if isfield(UvData,'SetObjectOrigin')
+%     pos_set_object(1:2)=UvData.SetObjectOrigin + pos_uvmat(1:2);
+%     pos_set_object(3:4)=UvData.SetObjectSize .* pos_uvmat(3:4);
+%     set(hset_object,'Position',pos_set_object)
+% end
 
 UvData.MouseAction='create_object';
@@ -4815 +4823 @@
 set(handles.zoom,'Value',0)
 zoom_Callback(handles.uvmat, [], handles)
+set(handles.delete_object,'Visible','on')
+set(handles.uvmat_title,'Visible','on')
+set(handles.viw_field_title,'Visible','on')
 
 %------------------------------------------------------------------------