Changeset 231 for trunk/src/uvmat.m

Timestamp:

Apr 5, 2011, 12:46:34 AM (14 years ago)

Author:

sommeria

Message:

interactive test for piv introduced various bug corrections

File:

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

trunk/src/uvmat.m

@@ -302 +302 @@
 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)
+
 
 %% check the path and date of modification of all functions in uvmat
@@ -324 +324 @@
             inputfile=input.InputFile;
         end
-        if isfield(Field,'TimeIndex')
-            set(handles.i1,num2str(Field.TimeIndex))
+        if isfield(input,'TimeIndex')
+            set(handles.i1,num2str(input.TimeIndex))
+        end
+        if isfield(input,'FieldsString')
+%             set(handles.Fields,'Value',1)
+            UvData.FieldsString=input.FieldsString;
         end
     elseif ischar(input)% file name introduced as input
@@ -335 +339 @@
             return
         end
-        Field.ListVarName={'A','coord_y','coord_x'};
-        Field.VarDimName={{'coord_y','coord_x'},'cord_y','coord_x'};
-        Field.A=input;
-        Field.coord_x=[0.5 size(input,2)-0.5];
-        Field.coord_y=[size(input,1)-0.5 0.5];
-    end
-    if ~isempty(inputfile)
-        %%%%% display the input field %%%%%%%
-        display_file_name(hObject, eventdata, handles,inputfile)
-        %%%%%%%
+        UvData.Field.ListVarName={'A','coord_y','coord_x'};
+        UvData.Field.VarDimName={{'coord_y','coord_x'},'cord_y','coord_x'};
+        UvData.Field.A=input;
+        UvData.Field.coord_x=[0.5 size(input,2)-0.5];
+        UvData.Field.coord_y=[size(input,1)-0.5 0.5];
         testinputfield=1;
     end
@@ -360 +359 @@
        end
    end
+end
+set(handles.uvmat,'UserData',UvData)
+if ~isempty(inputfile)
+    %%%%% display the input field %%%%%%%
+    display_file_name(hObject, eventdata, handles,inputfile)
+    %%%%%%%
+    testinputfield=1;
 end
 
@@ -856 +862 @@
 UvData.XmlData=XmlData;
 UvData.NewSeries=1;
-set(handles.uvmat,'UserData',UvData)
+
 
 %display warning message
@@ -867 +873 @@
 if ~testima
     testcivx=0;
-    hget_field=findobj('Name','get_field');
-%     if isequal(FileExt,'.nc')||isequal(FileExt,'.cdf')
-    if isempty(hget_field)
+    % hget_field=findobj('Name','get_field');
+    %     if isequal(FileExt,'.nc')||isequal(FileExt,'.cdf')
+    if isfield(UvData,'FieldsString') && isequal(UvData.FieldsString,{'get_field...'})% field menu defined as input (from get_field)
+        set(handles.Fields,'Value',1)
+        set(handles.Fields,'String',{'get_field...'})
+        UvData=rmfield(UvData,'FieldsString');
+    else
+        %if isempty(hget_field)
         Data=nc2struct(FileName,'ListGlobalAttribute','absolut_time_T0','civ');
         if ~isempty(Data.absolut_time_T0)&& ~isequal(Data.civ,0)%if the new input is Civx
@@ -878 +889 @@
             col_vec(1)=[];%remove 'velocity' option for vector color (must be a scalar)
             testcivx=1;
-        end 
-    else
-         hhget_field=guidata(hget_field);
-        if ~strcmp(get(hhget_field.inputfile,'String'),FileName)%delete any existing get_field GUI with file name different than the input
-            delete(hget_field)
-        end
-    end
-    if ~testcivx
+        end
+        %     else
+        %          hhget_field=guidata(hget_field);
+        %         if ~strcmp(get(hhget_field.inputfile,'String'),FileName)%delete any existing get_field GUI with file name different than the input
+        %             delete(hget_field)
+        %         end
+        %     end
+        if ~testcivx
             set(handles.Fields,'Value',1) % set menu to 'get_field...
             set(handles.Fields,'String',{'get_field...'})
-            col_vec={'get_field...'}; 
-    end       
-    set(handles.col_vec,'String',col_vec)
-%     else
-%         msgbox_uvmat('ERROR',['invalid input file extension ' FileExt])
-%         return
-%     end
-end
+            col_vec={'get_field...'};
+        end
+        set(handles.col_vec,'String',col_vec)
+        %     else
+        %         msgbox_uvmat('ERROR',['invalid input file extension ' FileExt])
+        %         return
+        %     end
+    end
+end
+set(handles.uvmat,'UserData',UvData)
 
 %% set index navigation options and refresh plots
@@ -2533 +2546 @@
     end
 else
-    % create a default projection menuplane
-    %UvData.Object{1}.Style='none';%main plotting plane
-    UvData.Object{1}.ProjMode='projection';%main plotting plane
-    UvData.Object{1}.DisplayHandle_uvmat=[]; %plane not visible in uvmat
-    set(handles.list_object_1,'Value',1);
-    set(handles.list_object_1,'String',{''});
+    % create a default projection
+%     UvData.Object{1}.ProjMode='projection';%main plotting plane
+%     UvData.Object{1}.DisplayHandle_uvmat=[]; %plane not visible in uvmat
+%     set(handles.list_object_1,'Value',1);
+%     set(handles.list_object_1,'String',{''});
 end
 % if ~isfield(UvData.Object{1},'plotaxes')
@@ -2573 +2585 @@
 % second projection object (view_field display)
 IndexObj_2=get(handles.list_object_2,'Value');%selected projection object for the second view
+if IndexObj_2==0
+    IndexObj_2=1;
+end
 if isequal(get(handles.list_object_2,'Visible'),'on') && IndexObj_2 <= numel(UvData.Object)&& ~isempty(UvData.Object{IndexObj_2})
     IndexObj(2)=IndexObj_2;
@@ -3949 +3964 @@
 list_object=get(handles.list_object_1,'String');
 set(handles.list_object_1,'Value',1)
-set(handles.list_object_1,'String',list_object(1))
+set(handles.list_object_1,'String',{''})
 set(handles.list_object_2,'Value',2)
-set(handles.list_object_2,'String',[list_object(1);{'...'}])
+set(handles.list_object_2,'String',{''})
 list_object_2_Callback(hObject, eventdata, handles)
 
@@ -4317 +4332 @@
 IndexObj=get(handles.list_object_1,'Value');
 str_1=list_str{IndexObj};
-val_2=get(handles.list_object_2,'Value');
-str_2=get(handles.list_object_2,'String');
-if isequal(val_2,IndexObj)% if the first selection is equal to the second, it will suppress the second
-    set(handles.list_object_2,'Value',numel(str_2))%select the end of the list ('...')
-    list_object_2_Callback(hObject, eventdata, handles)
-end
+% val_2=get(handles.list_object_2,'Value');
+% str_2=get(handles.list_object_2,'String');
+% if isequal(val_2,IndexObj)% if the first selection is equal to the second, it will suppress the second
+%     set(handles.list_object_2,'Value',numel(str_2))%select the end of the list ('...')
+%     list_object_2_Callback(hObject, eventdata, handles)
+% end
 update_object(handles,IndexObj,1,str_1)
 
@@ -4331 +4346 @@
 list_str=get(handles.list_object_2,'String');
 IndexObj=get(handles.list_object_2,'Value');
-if ischar(list_str) || strcmp(list_str{IndexObj},'...')
+if ischar(list_str) || isempty(list_str{IndexObj})% || strcmp(list_str{IndexObj},'...')
     hview_field=findobj(allchild(0),'Tag','view_field');
     if ~isempty(hview_field)
@@ -4386 +4401 @@
     PlotHandles=guidata(hview_field);
 end
-plot_field(ProjData,PlotHandles.axes3,PlotHandles);
+%plot_field(ProjData,PlotHandles.axes3,PlotHandles);
 set(handles.uvmat,'UserData',UvData)
 hother=findobj('Tag','proj_object');%find all the proj objects
@@ -4670 +4685 @@
             end
         end
-    end
-    
+    end 
     %mask name
     RootPath=get(handles.RootPath,'String');
@@ -4687 +4701 @@
 
     %display the mask
-    figure;
+    hfigmask=figure;
+    set(hfigmask,'Name','mask image')
     vec=linspace(0,1,256);%define a linear greyscale colormap
     map=[vec' vec' vec'];