Changeset 329 for trunk/src

Timestamp:

Dec 10, 2011, 2:24:45 PM (13 years ago)

Author:

sommeria

Message:

bugs repaired in series, default size of view_field changed. ';' added in proj_field

Location:

trunk/src

Files:

• proj_field.m (modified) (4 diffs)
• series.m (modified) (6 diffs)
• view_field.m (modified) (1 diff)

trunk/src/proj_field.m

@@ -171 +171 @@
 [ProjData,errormsg]=proj_heading(FieldData,ObjectData);
 ProjData.NbDim=0;
-%ProjData.ListDimName= {'nb_points'};
-%ProjData.DimValue=siz(1);  %nbre of projection points  
-
-
-% idimvar=0;
-[CellVarIndex,NbDimCell,VarTypeCell,errormsg]=find_field_indices(FieldData)
+[CellVarIndex,NbDimCell,VarTypeCell,errormsg]=find_field_indices(FieldData);
 if ~isempty(errormsg)
     errormsg=['error in proj_field/proj_points:' errormsg];
@@ -182 +177 @@
 end
 %LOOP ON GROUPS OF VARIABLES SHARING THE SAME DIMENSIONS
-% CellVarIndex=cells of variable index arrays
-% ivar_new=0; % index of the current variable in the projected field
-% icoord=0;
 for icell=1:length(CellVarIndex)
     if NbDimCell(icell)==1
@@ -194 +186 @@
     ivar_Y=VarType.coord_y;
     ivar_Z=VarType.coord_z;
-%     ivar_U=VarType.vector_x;
-%     ivar_V=VarType.vector_y;
-%     ivar_W=VarType.vector_z;
-%     ivar_C=VarType.scalar ;
     ivar_Anc=VarType.ancillary;
-%     test_anc=zeros(size(VarIndex));
     test_anc(ivar_Anc)=ones(size(ivar_Anc));
     ivar_F=VarType.warnflag;
@@ -205 +192 @@
     VarIndex([ivar_X ivar_Y ivar_Z ivar_Anc ivar_F ivar_FF])=[];% not projected variables removed frlom list
     if isempty(ivar_X)
-        test_grid=1;%test for input data on regular grid (e.g. image)coordinates
-      
+        test_grid=1;%test for input data on regular grid (e.g. image)coordinates      
     else
         if length(ivar_X)>1 || length(ivar_Y)>1 || length(ivar_Z)>1

trunk/src/series.m

@@ -125 +125 @@
     FieldCell{1}=param.list_fields{param.index_fields};
 end
-set(hObject,'WindowButtonDownFcn',{'mouse_alt_gui',handles}) % allows mouse action with right button (zoom for uicontrol display)
+set(hObject,'WindowButtonDownFcn',{'mouse_down'})%allows mouse action with right button (zoom for uicontrol display)
 NomType_Callback(hObject, eventdata, handles)
 
 %loads the information stored in prefdir to initiate  the list of ACTION functions
-fct_menu={'check_files';'aver_stat';'time_series';'merge_proj';'clean_civ_cmx'};
+fct_menu={'check_data_files';'aver_stat';'time_series';'merge_proj';'clean_civ_cmx'};
 transform_menu={'';'phys';'px';'phys_polar'};
 nb_builtin_ACTION=numel(fct_menu); %number of functions
@@ -194 +194 @@
 set(handles.transform_fct,'UserData',fct_handle)% store the list of path in UserData of ACTION
 
-% display the GUI for the default action 'check_files'
+% display the GUI for the default action 'check_data_files'
 ACTION_Callback(hObject, eventdata, handles) 
 
@@ -216 +216 @@
 RootFileCell=get(handles.RootFile,'String');
 oldfile=''; %default
-if isempty(RootPathCell)|isequal(RootPathCell,{''})%loads the previously stored file name and set it as default in the file_input box
+if isempty(RootPathCell)||isequal(RootPathCell,{''})%loads the previously stored file name and set it as default in the file_input box
      dir_perso=prefdir;
      profil_perso=fullfile(dir_perso,'uvmat_perso.mat');
      if exist(profil_perso,'file')
           h=load (profil_perso);
-         if isfield(h,'filebase')&ischar(h.filebase)
+         if isfield(h,'filebase')&&ischar(h.filebase)
                  oldfile=h.filebase;
          end
-         if isfield(h,'RootPath')&ischar(h.RootPath) 
+         if isfield(h,'RootPath')&&ischar(h.RootPath) 
                  oldfile=h.RootPath;
          end
@@ -743 +743 @@
 last_i_Callback(hObject, eventdata, handles)
 
-%------------------------------------------------------------
+%------------------------------------------------------------------------
 function RootPath_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 Val=get(handles.RootPath,'Value');
 synchronise_view(handles,Val)
 NomType_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------
-
+
+%------------------------------------------------------------------------
 function synchronise_view(handles,Val)
+%------------------------------------------------------------------------
 set(handles.RootPath,'Value',Val)
 set(handles.SubDir,'Value',Val)
@@ -762 +764 @@
 
 
-%---------------------------------------------------------
+%------------------------------------------------------------------------
 % Executes on carriage return on the subdir civ1 edit window
-%--------------------------------------------------------
 function SubDir_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 Val=get(handles.SubDir,'Value');
 synchronise_view(handles,Val)
 NomType_Callback(hObject, eventdata, handles)
 
-%--------------------------------------------------------------
-%function activated when a new filebase (image series) is introduced
-%------------------------------------------------------------
+%------------------------------------------------------------------------
+% --- function activated when a new filebase (image series) is introduced
 function RootFile_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 Val=get(handles.RootFile,'Value');
 synchronise_view(handles,Val)
@@ -813 +814 @@
 Val=get(handles.time_last,'Value');
 synchronise_view(handles,Val)
-
-%--------------------------------------------------------------
-%function activated by NomType
-%------------------------------------------------------------
 NomType_Callback(hObject, eventdata, handles)
 

trunk/src/view_field.m

@@ -77 +77 @@
     % handles_mouse.create=hhuvmat.create;
     handles_mouse.edit=hhuvmat.edit_object;
+    pos_view_field=get(hObject,'Position');
     pos_uvmat=get(huvmat,'Position');
     pos_view_field(1)=pos_uvmat(1)+pos_uvmat(3)/2;
     pos_view_field(2)=pos_uvmat(2)-pos_uvmat(3)/4;
-    pos_view_field(3:4)=pos_uvmat(3:4);
+%      pos_view_field(3:4)=pos_uvmat(3:4);
     set(hObject,'Position',pos_view_field)
 end