Changeset 75 for trunk/src

Timestamp:

Mar 31, 2010, 2:57:31 PM (15 years ago)

Author:

sommeria

Message:

plot_field: bug repaired for profiles
view_field: introduction of a edit uicontrol for text display (needs to be used)
rescaling of the figure to optimize space
uvmat: small bugs repaired, in particular for 3D fields
TODO: adapt proj_field for lines in 3D space

introduce volume objects and interpolate on 3D grid (griddata3)

Location:

trunk/src

Files:

• delete_object.m (modified) (1 diff)
• plot_field.m (modified) (1 diff)
• uvmat.m (modified) (8 diffs)
• view_field.fig (modified) (previous)
• view_field.m (modified) (1 diff)

trunk/src/delete_object.m

@@ -73 +73 @@
 set(hlist_object,'Value',length(list_str))
 hlist_object=findobj(huvmat,'Tag','list_object_2');%handles of the object liçst in the uvmat interface
-set(hlist_object,'String',[list_str {'...'}])
+set(hlist_object,'String',[list_str;{'...'}])
 set(hlist_object,'Value',length(list_str)+1)

trunk/src/plot_field.m

@@ -454 +454 @@
     end
 end
-if test_newplot && ~isequal(plotstr,'plot(')
-    plotstr=[plotstr '''tag'',''plot_line'');'];
+if test_newplot && ~isequal(plotstr,'hhh=plot(')
+    plotstr=[plotstr '''tag'',''plot_line'');']
                 %execute plot (instruction  plotstr)  
     eval(plotstr)

trunk/src/uvmat.m

@@ -1908 +1908 @@
 end
 UvData=get(handles.uvmat,'UserData');
-% if isfield(UvData,'Txt')
-%     UvData=rmfield(UvData,'Txt');%erase previous error message
-% end
+%UvData =structure containing information stored outside the uicontrol of uvmat
+%      .NewSeries: =1 for a new series (new root fiel introduced), 0 else
+%      .MovieObject: movie object representing an input movie
+%      .MovieObject_1: idem for a second input series (_1)
+%      .filename_1 : last second input file name (to deal with a constant second input without reading again the file)
+%      .VelType_1: last velocity type (civ1, civ2...) for the second input series
+%      .FieldName_1: last field name(velocity, vorticity...) for the second input series
+%      .NbDim: number of space dimensions of the input field
+%      .ZMin, .ZMax: range of the z coordinate
+%..... to complement
+
 if ishandle(handles.UVMAT_title) %remove title panel on uvmat
     delete(handles.UVMAT_title)
@@ -4707 +4715 @@
 % ------------------------------------------------------------------
 function Menuplane_Callback(hObject, eventdata, handles)
-% set(handles.create,'Visible','on')
-% set(handles.create,'Value',1)
-% PLANE_Callback(hObject,eventdata,handles)
 data.Style='plane';
 data.ProjMode='projection';%default
@@ -4750 +4755 @@
 end
 UvData=get(handles.uvmat,'UserData');
-[hset_object,UvData.sethandles]=set_object(data);% call the set_object interface
-%position the set_object GUI with respect to uvmat
-pos_uvmat=get(handles.uvmat,'Position');
-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
+% [hset_object,UvData.sethandles]=set_object(data);% call the set_object interface
+% %position the set_object GUI with respect to uvmat
+% pos_uvmat=get(handles.uvmat,'Position');
+% 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
 set(handles.edit,'Value',0); %suppress the object edit mode
 set(handles.edit,'BackgroundColor',[0.7,0.7,0.7])  
@@ -4764 +4769 @@
 set(handles.delete_object,'Visible','on')
 set(handles.uvmat_title,'Visible','on')
-set(handles.viw_field_title,'Visible','on')
+set(handles.view_field_title,'Visible','on')
 
 %------------------------------------------------------------------------
@@ -4770 +4775 @@
 function create_object(data,handles)
 %------------------------------------------------------------------------
-hset_object=findobj(allchild(0),'Name','set_object');
+hset_object=findobj(allchild(0),'tag','set_object');
 if ~isempty(hset_object)
     delete(hset_object)% delete existing version of set_object
@@ -4794 +4799 @@
     data.DX=max(meshx,meshy);
 end 
+if isfield(UvData,'NbDim')
+    data.NbDim=UvData.NbDim;
+end
 data.Coord=[0 0 0]; %default
 if isfield(data,'Style') && isequal(data.Style,'line')
@@ -4809 +4817 @@
 [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
-
 UvData.MouseAction='create_object';
 set(handles.uvmat,'UserData',UvData)
@@ -4823 +4823 @@
 set(handles.delete_object,'Visible','on')
 set(handles.uvmat_title,'Visible','on')
-set(handles.viw_field_title,'Visible','on')
+set(handles.view_field_title,'Visible','on')
 
 %------------------------------------------------------------------------

trunk/src/view_field.m

@@ -2534 +2534 @@
 
 
+
+
+
+function text_display_Callback(hObject, eventdata, handles)
+% hObject    handle to text_display (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of text_display as text
+%        str2double(get(hObject,'String')) returns contents of text_display as a double
+
+
+% --- Executes during object creation, after setting all properties.
+function text_display_CreateFcn(hObject, eventdata, handles)
+% hObject    handle to text_display (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    empty - handles not created until after all CreateFcns called
+
+% Hint: edit controls usually have a white background on Windows.
+%       See ISPC and COMPUTER.
+if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
+    set(hObject,'BackgroundColor','white');
+end
+
+