Changeset 399 for trunk/src/uvmat.m

Timestamp:

Apr 27, 2012, 12:28:47 PM (12 years ago)

Author:

sommeria

Message:

implementation of thin plate interpolation (proj on planes with mode 'filter'), rationalisation of variable formats in civ_matlab

File:

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

trunk/src/uvmat.m

@@ -310 +310 @@
         end
         if isfield(input,'FieldsString')
-%             set(handles.Fields,'Value',1)
             UvData.FieldsString=input.FieldsString;
         end
@@ -486 +485 @@
     handles_NomType=handles.NomType;
     handles_FileExt=handles.FileExt;
-    handles_Fields=handles.Fields;
+%     handles_Fields=handles.Fields;
 elseif index==2
     handles_RootPath=handles.RootPath_1;
@@ -494 +493 @@
     handles_NomType=handles.NomType_1;
     handles_FileExt=handles.FileExt_1;
-    handles_Fields=handles.Fields_1;
+%     handles_Fields=handles.Fields_1;
     set(handles.RootPath_1,'Visible','on')
     set(handles.RootFile_1,'Visible','on')
@@ -504 +503 @@
 
 %% detect root name, nomenclature and indices in the input file name:
-%[RootPath,SubDir]=fileparts_uvmat(fileinput);
 [FilePath,FileName,FileExt]=fileparts(fileinput);
 % detect the file type, get the movie object if relevant, and look for the corresponding file series:
 % the root name and indices may be corrected by including the first index i1 if a corresponding xml file exists
 [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject,i1,i2,j1,j2]=find_file_series(FilePath,[FileName FileExt]);
-% if strcmp(NomType,'*')% movies will be opened at the first frame
-%     i1=1;
-%     i2=[];
-%     j1=[];
-%     j2=[];
-% end  
 
 %% open the file or fill the GUI uvmat according to the detected file type
@@ -1964 +1956 @@
     FieldName=[];%default
     VelType=[];%default
-    FileExt=get(handles.FileExt,'String');
+   % FileExt=get(handles.FileExt,'String');
     FileType=UvData.FileType{1};
     switch FileType
@@ -2234 +2226 @@
    UvData.Field=Field{1};
 end
+UvData.Field.FieldList={FieldName}; % TODO: to generalise, used for proj_field with tps interpolation
 
 %% get bounds and mesh (needed for mouse action and to open set_object)
@@ -3818 +3811 @@
 AxeData=UvData.axes3;% retrieve the current plotted data
 PlotParam=read_GUI(handles.uvmat);
-[PP,PlotParamOut]= plot_field(AxeData,handles.axes3,PlotParam);
+[tild,PlotParamOut]= plot_field(AxeData,handles.axes3,PlotParam);
 write_plot_param(handles,PlotParamOut); %update the auto plot parameters
 
@@ -3826 +3819 @@
 %-------------------------------------------------------------------
 UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface 
-test=get(handles.edit_object,'Value');
-if test
+if get(handles.edit_object,'Value')
     set(handles.edit_object,'BackgroundColor',[1,1,0])  
     %suppress the other options 
@@ -3838 +3830 @@
         set(hhgeometry_calib.edit_append,'BackgroundColor',[0.7 0.7 0.7])
     end
+    hset_object=findobj(allchild(0),'Tag','set_object');
+    if isempty(hset_object)% open the GUI set_object with data of the currently selected object
+        ViewObject_Callback(hObject, eventdata, handles)
+        hset_object=findobj(allchild(0),'Tag','set_object');
+    end
+    hhset_object=guidata(hset_object);
+    set(hhset_object.PLOT,'enable','on');
 else 
     UvData.MouseAction='none';
-    set(handles.edit_object,'BackgroundColor',[0.7,0.7,0.7])   
-end
-set(handles.uvmat,'UserData',UvData);
-hset_object=findobj(allchild(0),'Tag','set_object');
-if ~isempty(hset_object)
-    hhset_object=guidata(hset_object);
-    if test
-        set(hhset_object.PLOT,'enable','on');
-    else
-       set(hhset_object.PLOT,'enable','off'); 
+    set(handles.edit_object,'BackgroundColor',[0.7,0.7,0.7])  
+    hset_object=findobj(allchild(0),'Tag','set_object');
+    if ~isempty(hset_object)% open the 
+        hhset_object=guidata(hset_object);
+        set(hhset_object.PLOT,'enable','off'); 
     end
 end
@@ -4567 +4561 @@
 end
 
+%------------------------------------------------------------------------
 % --- Executes on button press in ViewObject.
 function ViewObject_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 IndexObj=get(handles.ListObject,'Value');
 IndexObj=IndexObj(end); %keeps only the secodn value