Changeset 622 for trunk/src/uvmat.m

Timestamp:

Apr 29, 2013, 11:35:27 AM (12 years ago)

Author:

sommeria

Message:

mouse system for uvmat imrpoved

File:

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

trunk/src/uvmat.m

@@ -34 +34 @@
 %                       .PosGeometryCalib: size of set_object
 %                       .NbBuiltin: nbre of functions always displayed in TransformName menu
-%          .Object: cell array of structures representing the current projection objects, as produced by 'set_object.m'={[]} by default
+%          .ProjObject: cell array of structures representing the current projection objects, as produced by 'set_object.m'={[]} by default
 %          .NewSeries: =0/1 flag telling whether a new field series has been opened
 %          .FileName_1: name of the current second field (used to detect a  constant field during file scanning)
@@ -126 +126 @@
 %              .Phi, .Theta, .Psi : Euler angles
 %              .X,.Y,.U,.V.... : field data projected on the object
-%              .IndexObj: index in the list of UvData.Object
+%              .IndexObj: index in the list of UvData.ProjObject
            %during plotting
 %               .plotaxes: handles of the current axes used to plot the  result of field projection on the object
@@ -214 +214 @@
 set(handles.FieldName,'Value',1)
 set(handles.FieldName,'string',{''})
-UvData.Object={[]};
+UvData.ProjObject={[]};
 
 %% TRANSFORM menu: builtin fcts
@@ -1809 +1809 @@
 function movie_pair_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+
 %% stop movie action if the movie_pair button is off
 if ~get(handles.movie_pair,'value')
@@ -2065 +2066 @@
 check_proj_tps=0;
 if  (strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'civx'))
-    for iobj=1:numel(UvData.Object)
-        if isfield(UvData.Object{iobj},'ProjMode')&& strcmp(UvData.Object{iobj}.ProjMode,'interp_tps')
+    for iobj=1:numel(UvData.ProjObject)
+        if isfield(UvData.ProjObject{iobj},'ProjMode')&& strcmp(UvData.ProjObject{iobj}.ProjMode,'interp_tps')
             check_proj_tps=1;
             break
@@ -2547 +2548 @@
     end
     % default projection plane
-    if isempty(UvData.Object{1})
-        UvData.Object{1}.Type='plane';%main plotting plane
-        UvData.Object{1}.ProjMode='projection';%main plotting plane
-        UvData.Object{1}.DisplayHandle.uvmat=[]; %plane not visible in uvmat
-        UvData.Object{1}.DisplayHandle.view_field=[]; %plane not visible in uvmat
+    if isempty(UvData.ProjObject{1})
+        UvData.ProjObject{1}.Type='plane';%main plotting plane
+        UvData.ProjObject{1}.ProjMode='projection';%main plotting plane
+        UvData.ProjObject{1}.DisplayHandle.uvmat=[]; %plane not visible in uvmat
+        UvData.ProjObject{1}.DisplayHandle.view_field=[]; %plane not visible in uvmat
     end
     %% 3D case (menuvolume)
@@ -2563 +2564 @@
         end
         if test_set_object% reinitiate the GUI set_object
-            delete_object(1);% delete the current projection object in the list UvData.Object, delete its graphic representations and update the list displayed in handles.ListObject and 2
-            UvData.Object{1}.NbDim=NbDim;%test for 3D objects
-            UvData.Object{1}.RangeZ=UvData.Field.CoordMesh;%main plotting plane
-            UvData.Object{1}.Coord(1,3)=(UvData.Field.ZMin+UvData.Field.ZMax)/2;%section at a middle plane chosen
-            UvData.Object{1}.Angle=[0 0 0];
-            UvData.Object{1}.HandlesDisplay=plot(0,0,'Tag','proj_object');% A REVOIR
-            UvData.Object{1}.Name='1-PLANE';
-            UvData.Object{1}.enable_plot=1;
-            set_object(UvData.Object{1},handles,ZBounds);
+            delete_object(1);% delete the current projection object in the list UvData.ProjObject, delete its graphic representations and update the list displayed in handles.ListObject and 2
+            UvData.ProjObject{1}.NbDim=NbDim;%test for 3D objects
+            UvData.ProjObject{1}.RangeZ=UvData.Field.CoordMesh;%main plotting plane
+            UvData.ProjObject{1}.Coord(1,3)=(UvData.Field.ZMin+UvData.Field.ZMax)/2;%section at a middle plane chosen
+            UvData.ProjObject{1}.Angle=[0 0 0];
+            UvData.ProjObject{1}.HandlesDisplay=plot(0,0,'Tag','proj_object');% A REVOIR
+            UvData.ProjObject{1}.Name='1-PLANE';
+            UvData.ProjObject{1}.enable_plot=1;
+            set_object(UvData.ProjObject{1},handles,ZBounds);
             set(handles.ListObject,'Value',1);
             set(handles.ListObject,'String',{'1-PLANE'});
@@ -2582 +2583 @@
             XmlData=UvData.XmlData{1};
             if isfield(XmlData,'PlanePos')
-                UvData.Object{1}.Coord=XmlData.PlanePos(UvData.ZIndex,:);
+                UvData.ProjObject{1}.Coord=XmlData.PlanePos(UvData.ZIndex,:);
             end
             if isfield(XmlData,'PlaneAngle')
                 siz=size(XmlData.PlaneAngle);
                 indangle=min(siz(1),UvData.ZIndex);%take first angle if a single angle is defined (translating scanning)
-                UvData.Object{1}.PlaneAngle=XmlData.PlaneAngle(indangle,:);
+                UvData.ProjObject{1}.PlaneAngle=XmlData.PlaneAngle(indangle,:);
             end
         elseif isfield(UvData,'ZIndex')
-            UvData.Object{1}.ZObject=UvData.ZIndex;
+            UvData.ProjObject{1}.ZObject=UvData.ZIndex;
         end
     end
@@ -2631 +2632 @@
         set(handles.ListObject,'Value',1)
         set(handles.ListObject,'String',{'plane'})
-        UvData.Object{1}.Type='plane';%main plotting plane
-        UvData.Object{1}.ProjMode='projection';%main plotting plane
-        UvData.Object{1}.DisplayHandle.uvmat=[]; %plane not visible in uvmat
-        UvData.Object{1}.DisplayHandle.view_field=[]; %plane not visible in uvmat
+        UvData.ProjObject{1}.Type='plane';%main plotting plane
+        UvData.ProjObject{1}.ProjMode='projection';%main plotting plane
+        UvData.ProjObject{1}.DisplayHandle.uvmat=[]; %plane not visible in uvmat
+        UvData.ProjObject{1}.DisplayHandle.view_field=[]; %plane not visible in uvmat
         set(handles.ListObject_1,'Value',1)
         set(handles.ListObject_1,'String',{'plane'})
     end
     IndexObj(1)=get(handles.ListObject_1,'Value');%selected projection object for main view
-    if IndexObj(1)> numel(UvData.Object)
+    if IndexObj(1)> numel(UvData.ProjObject)
         IndexObj(1)=1;%select the first object if the selected one does not exist
         set(handles.ListObject_1,'Value',1)
@@ -2682 +2683 @@
     for imap=1:numel(IndexObj)
         iobj=IndexObj(imap);
-        if numel(UvData.Object)<iobj
+        if numel(UvData.ProjObject)<iobj
             break
         end
-        [ObjectData,errormsg]=proj_field(UvData.Field,UvData.Object{iobj});% project field on the object
+        [ObjectData,errormsg]=proj_field(UvData.Field,UvData.ProjObject{iobj});% project field on the object
         if ~isempty(errormsg)
             return
@@ -2879 +2880 @@
 end
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- translate coordinate to matrix index
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function [indx,indy]=pos2ind(x0,rangx0,nxy)
 indx=1+round((nxy(2)-1)*(x0-rangx0(1))/(rangx0(2)-rangx0(1)));% index x of pixel  
 indy=1+round((nxy(1)-1)*(y12-rangy0(1))/(rangy0(2)-rangy0(1)));% index y of pixel
 
-
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on button press in 'CheckZoom'.
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function CheckZoom_Callback(hObject, eventdata, handles)
 
-if (get(handles.CheckZoom,'Value') == 1); 
-    set(handles.CheckZoom,'BackgroundColor',[1 1 0])
+if get(handles.CheckZoom,'Value') 
     set(handles.CheckFixLimits,'Value',1)% propose by default fixed limits for the plotting axes
-    set(handles.CheckFixLimits,'BackgroundColor',[1 1 0]) 
-else
-    set(handles.CheckZoom,'BackgroundColor',[0.7 0.7 0.7])
-end
-
-%-------------------------------------------------------------------
+    set(handles.CheckZoomFig,'Value',0)%desactivate zoom fig
+end
+
+%------------------------------------------------------------------------
+% --- Executes on button press in CheckZoomFig.
+%------------------------------------------------------------------------
+function CheckZoomFig_Callback(hObject, eventdata, handles)
+
+if get(handles.CheckZoomFig,'Value')
+    set(handles.CheckZoom,'value',0)
+end
+
+%------------------------------------------------------------------------
 % --- Executes on button press in 'CheckFixLimits'.
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function CheckFixLimits_Callback(hObject, eventdata, handles)
-test=get(handles.CheckFixLimits,'Value');
-if test
-    set(handles.CheckFixLimits,'BackgroundColor',[1 1 0])
-else
-    set(handles.CheckFixLimits,'BackgroundColor',[0.7 0.7 0.7])
+
+if ~get(handles.CheckFixLimits,'Value')
     update_plot(handles);
 end
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on button press in CheckFixAspectRatio.
 function CheckFixAspectRatio_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
+
 if get(handles.CheckFixAspectRatio,'Value')
-%     set(handles.CheckFixAspectRatio,'BackgroundColor',[1 1 0])
     update_plot(handles);
 else
-%     set(handles.CheckFixAspectRatio,'BackgroundColor',[0.7 0.7 0.7])
     update_plot(handles);
 end
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function num_AspectRatio_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 set(handles.CheckFixAspectRatio,'Value',1)% select the fixed aspect ratio button
-% set(handles.CheckFixAspectRatio,'BackgroundColor',[1 1 0])% mark in yellow
 update_plot(handles);
-%-------------------------------------------------------------------
-
-%-------------------------------------------------------------------
-
-
-
-%-------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 %----Executes on button press in 'record': records the current flags of manual correction.
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function record_Callback(hObject, eventdata, handles)
-% [filebase,num_i1,num_j1,num_i2,num_j2,Ext,NomType,SubDir]=read_input_file(handles);
+
 [RootPath,SubDir,RootFile,FileIndices,FileExt]=read_file_boxes(handles);
 FileName=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
-%FileName=read_file_boxes(handles);
 [erread,message]=fileattrib(FileName);
 if ~isempty(message) && ~isequal(message.UserWrite,1)
@@ -3233 +3228 @@
 end
 
-%---------------------------------------------------
+%----------------------------------------------------------------
 % --- Executes on menu selection FieldName
 function FieldName_1_Callback(hObject, eventdata, handles)
@@ -3452 +3447 @@
 
 
-%-----------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- reset civ buttons
 function reset_vel_type(handles_civ0,handle1)
-%-----------------------------------------------------------------------
+%------------------------------------------------------------------------
 for ibutton=1:length(handles_civ0)
     set(handles_civ0(ibutton),'BackgroundColor',[0.831 0.816 0.784])
@@ -3546 +3541 @@
 yi=0.5:npy-0.5;
 [Xi,Yi]=meshgrid(xi,yi);
-if isfield(UvData,'Object')
-    for iobj=1:length(UvData.Object)
-        ObjectData=UvData.Object{iobj};
+if isfield(UvData,'ProjObject')
+    for iobj=1:length(UvData.ProjObject)
+        ObjectData=UvData.ProjObject{iobj};
         if isfield(ObjectData,'ProjMode') &&(isequal(ObjectData.ProjMode,'mask_inside')||isequal(ObjectData.ProjMode,'mask_outside'));
             flagobj=1;
@@ -3618 +3613 @@
 image(imflag);
 
-%-------------------------------------------------------------------
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 %  - FUNCTIONS FOR SETTING PLOTTING PARAMETERS
 
-%------------------------------------------------------------------
-%-------------------------------------------------------------
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on selection change in TransformName.
 
 function TransformName_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------
+%------------------------------------------------------------------------
 UvData=get(handles.uvmat,'UserData');
 menu=get(handles.TransformName,'String');refresh
@@ -3749 +3744 @@
         delete(hhh)
     end
-%     if isfield(UvData,'Object')
-%         UvData.Object=UvData.Object(1);
-%     end
     set(handles.ListObject,'Value',1)
     set(handles.ListObject,'String',{''})
@@ -3762 +3754 @@
     set(handles.edit_object,'Value',0)
     edit_object_Callback(hObject, eventdata, handles)
-    UvData.Object={[]};
+    UvData.ProjObject={[]};
 end
 set(handles.uvmat,'UserData',UvData)
@@ -3917 +3909 @@
 %------------------------------------------------------------------------
 % --- Executes on selection change in CheckDecimate4 (nb_vec/4).
+%------------------------------------------------------------------------
 function CheckDecimate4_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
+
 if isequal(get(handles.CheckDecimate4,'Value'),1)
     set(handles.CheckDecimate16,'Value',0)
@@ -3926 +3919 @@
 %------------------------------------------------------------------------
 % --- Executes on selection change in CheckDecimate16 (nb_vec/16).
+%------------------------------------------------------------------------
 function CheckDecimate16_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
+
 if isequal(get(handles.CheckDecimate16,'Value'),1)
     set(handles.CheckDecimate4,'Value',0)
@@ -4132 +4126 @@
 list_str=get(handles.ListObject,'String');
 UvData=get(handles.uvmat,'UserData');
-ObjectData=UvData.Object{get(handles.ListObject_1,'Value')};
+ObjectData=UvData.ProjObject{get(handles.ListObject_1,'Value')};
 
 %% update the projection plot on uvmat
@@ -4139 +4133 @@
 %replot all the objects within the new projected field
 for IndexObj=1:numel(list_str)
-        hobject=UvData.Object{IndexObj}.DisplayHandle.uvmat;
+        hobject=UvData.ProjObject{IndexObj}.DisplayHandle.uvmat;
         if isempty(hobject) || ~ishandle(hobject)
             hobject=handles.PlotAxes;
@@ -4148 +4142 @@
             objectcolor='b';
         end
-        UvData.Object{IndexObj}.DisplayHandle.uvmat=plot_object(UvData.Object{IndexObj},ObjectData,hobject,objectcolor);%draw the object in uvmat      
+        UvData.ProjObject{IndexObj}.DisplayHandle.uvmat=plot_object(UvData.ProjObject{IndexObj},ObjectData,hobject,objectcolor);%draw the object in uvmat      
 end
 set(handles.uvmat,'UserData',UvData)
@@ -4177 +4171 @@
 %% The object  is displayed in set_object if this GUI is already opened
 UvData=get(handles.uvmat,'UserData');
-ObjectData=UvData.Object{IndexObj};
+ObjectData=UvData.ProjObject{IndexObj};
 hset_object=findobj(allchild(0),'tag','set_object');
 if ~isempty(hset_object)
@@ -4219 +4213 @@
 
 %% update the color of the graphic object representation: the selected object in magenta, others in blue
-update_object_color(handles.PlotAxes,hhview_field.PlotAxes,UvData.Object{IndexObj}.DisplayHandle.uvmat)
+update_object_color(handles.PlotAxes,hhview_field.PlotAxes,UvData.ProjObject{IndexObj}.DisplayHandle.uvmat)
 
 %------------------------------------------------------------------------
@@ -4313 +4307 @@
     list_object=get(handles.ListObject,'String');
     UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface
-    UvData.Object{IndexObj}.Name=list_object{IndexObj};
-    if numel(UvData.Object)<IndexObj;% error in UvData
+    UvData.ProjObject{IndexObj}.Name=list_object{IndexObj};
+    if numel(UvData.ProjObject)<IndexObj;% error in UvData
         msgbox_uvmat('ERROR','invalid object list')
         return
@@ -4324 +4318 @@
     end
 %     set(handles.ListObject_1,'Value',IndexObj);%restore ListObject selection after set_object deletion
-    data=UvData.Object{IndexObj};
+    data=UvData.ProjObject{IndexObj};
     if ~isfield(data,'Type')% default plane
         data.Type='plane';
@@ -4374 +4368 @@
     IndexObj=get(handles.ListObject,'Value');
     UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface
-    if numel(UvData.Object)<IndexObj(end);% error in UvData
+    if numel(UvData.ProjObject)<IndexObj(end);% error in UvData
         msgbox_uvmat('ERROR','invalid object list')
         return
@@ -4384 +4378 @@
     end
     set(handles.ListObject,'Value',IndexObj);%restore ListObject selection after set_object deletion
-    if ~isfield(UvData.Object{IndexObj(1)},'Type')% default plane
-        UvData.Object{IndexObj(1)}.Type='plane';
+    if ~isfield(UvData.ProjObject{IndexObj(1)},'Type')% default plane
+        UvData.ProjObject{IndexObj(1)}.Type='plane';
     end
     list_object=get(handles.ListObject,'String');
-    UvData.Object{IndexObj(end)}.Name=list_object{IndexObj(end)};
+    UvData.ProjObject{IndexObj(end)}.Name=list_object{IndexObj(end)};
     
     %% show the projection of the selected object on view_field
-    ProjData= proj_field(UvData.Field,UvData.Object{IndexObj});%project the current field on ObjectData
+    ProjData= proj_field(UvData.Field,UvData.ProjObject{IndexObj});%project the current field on ObjectData
     hview_field=findobj(allchild(0),'tag','view_field');
     if isempty(hview_field)
@@ -4425 +4419 @@
 %------------------------------------------------------------------------
 % --- Executes on button press in delete_object.
+%------------------------------------------------------------------------
 function delete_object_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
+
 IndexObj=get(handles.ListObject,'Value');%projection object selected for view_field
 IndexObj_1=get(handles.ListObject_1,'Value');%projection object selected for uvmat plot
 if IndexObj>1 && ~isequal(IndexObj,IndexObj_1) % do not delete the object used for the uvmat plot
     delete_object(IndexObj)
+end
+
+%'delete_object': delete a projection object, defined by its index in the Uvmat list or by its graphic handle
+%------------------------------------------------------------------------
+% function delete_object(hObject)
+%
+% INPUT:
+% hObject: object index (if integer) or handle of the graphic object. If
+%          hObject is a subobject, the parent object is detected and deleted. 
+
+function delete_object(IndexObj)
+
+huvmat=findobj('tag','uvmat');%handles of the uvmat interface
+UvData=get(huvmat,'UserData');
+hlist_object=findobj(huvmat,'Tag','ListObject');%handles of the object list in the uvmat interface
+list_str=get(hlist_object,'String');%objet list
+% if isequal(floor(hObject),hObject) %case of an index
+    if  ~isempty(UvData) && isfield(UvData, 'ProjObject') && length(UvData.ProjObject)>=IndexObj 
+        if isfield(UvData.ProjObject{IndexObj},'DisplayHandle') && isfield(UvData.ProjObject{IndexObj}.DisplayHandle,'uvmat')
+            hdisplay=UvData.ProjObject{IndexObj}.DisplayHandle.uvmat;
+            for iview=1:length(hdisplay)
+                if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0)
+                    ObjectData=get(hdisplay(iview),'UserData');
+                    if isfield(ObjectData,'SubObject') & ishandle(ObjectData.SubObject)
+                        delete(ObjectData.SubObject);
+                    end
+                    if isfield(ObjectData,'DeformPoint') & ishandle(ObjectData.DeformPoint)
+                        delete(ObjectData.DeformPoint);
+                    end
+                    delete(hdisplay(iview))
+                end
+                ishandle(hdisplay(iview))
+            end
+            for iobj=IndexObj+1:length(UvData.ProjObject)
+                hdisplay=UvData.ProjObject{iobj}.DisplayHandle.uvmat;
+                for iview=1:length(hdisplay)
+                    if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0)
+                        PlotData=get(hdisplay(iview),'UserData');
+                        PlotData.IndexObj=iobj-1;
+                        set(hdisplay(iview),'UserData',PlotData);
+                    end
+                end
+            end
+        end
+        UvData.ProjObject(IndexObj)=[];  
+        if ~isempty(list_str)
+            list_str(IndexObj)=[];
+        end
+    end
+% elseif ishandle(hObject)%object handle
+%     userdata=get(hObject,'UserData');
+%     if ishandle(userdata)%the selected line depends on a parent line
+%         hdisplay=userdata;% the parent object becomes the current one
+%     else
+%         hdisplay=hObject;% the selected object becomes the current one
+%     end
+%     PlotData=get(hdisplay,'UserData');
+%     if isfield(PlotData,'SubObject') & ishandle(PlotData.SubObject)
+%             delete(PlotData.SubObject);
+%     end
+%     if isfield(PlotData,'DeformPoint') & ishandle(PlotData.DeformPoint)
+%            delete(PlotData.DeformPoint);
+%     end
+%     delete(hdisplay);
+%     if isfield(PlotData,'IndexObj')
+%         IndexObj=PlotData.IndexObj;
+%         if  isequal(round(IndexObj),IndexObj) & IndexObj>=1 & length(list_str) > IndexObj
+%             if isfield(UvData,'ProjObject')& length(UvData.ProjObject) > IndexObj
+%                UvData.ProjObject(IndexObj)=[];
+%             end
+%             list_str(IndexObj)=[];
+%         end
+%     end
+% end
+set(huvmat,'UserData',UvData);
+set(hlist_object,'String',list_str)
+set(hlist_object,'Value',length(list_str))
+hlist_object_1=findobj(huvmat,'Tag','ListObject_1');%handles of the first object list in the uvmat interface
+old_index=get(hlist_object_1,'Value');
+set(hlist_object_1,'String',list_str)
+if IndexObj<=old_index
+    set(hlist_object_1,'Value',old_index-1)
 end
 
@@ -4599 +4676 @@
 aviobj=close(aviobj);
 UvData=rmfield(UvData,'plotaxes');
-%UvData.Object{1}.plotaxes=handles.PlotAxes;
 set(huvmat,'UserData',UvData);
 msgbox_uvmat('CONFIRMATION',{['movie ' aviname ' created '];['with ' num2str(imax) ' frames']})
@@ -4688 +4764 @@
 function create_object(data,handles)
 %------------------------------------------------------------------------
-% desactivate geometric calibration if opened
-hgeometry_calib=findobj(allchild(0),'tag','geometry_calib');
+%% desactivate concurrent tools
+hgeometry_calib=findobj(allchild(0),'tag','geometry_calib');% search the GUI geometric calibration 
 if ishandle(hgeometry_calib)
     hhgeometry_calib=guidata(hgeometry_calib);
     set(hhgeometry_calib.edit_append,'Value',0)% desactivate mouse action in geometry_calib
-    set(hhgeometry_calib.edit_append,'BackgroundColor',[0.7 0.7 0.7])
-end
-set(handles.edit_object,'Value',0); %suppress the object edit mode
-set(handles.edit_object,'BackgroundColor',[0.7,0.7,0.7])  
+end
+set(handles.edit_object,'Value',0)  %desactivate the object edit mode
+set(handles.CheckZoomFig,'Value',0) %desactivate zoom sub fig
+set(handles.CheckZoom,'Value',0)    %desactivate the zoom action
+if ishandle(handles.UVMAT_title)
+    delete(handles.UVMAT_title)     %delete the initial display of uvmat if no field has been entered yet
+end
+
+%% append a new line to the list of projection objects
 ListObject=get(handles.ListObject,'String');
 if isempty(ListObject)
@@ -4708 +4789 @@
 set(handles.ListObject,'Value',IndexObj)
 UvData=get(handles.uvmat,'UserData');
-UvData.Object{IndexObj}=[]; %create a new empty object
-UvData.Object{IndexObj}.DisplayHandle.uvmat=handles.PlotAxes; % axes for plot_object
-UvData.Object{IndexObj}.DisplayHandle.view_field=[]; %no plot handle before plot_field operation
+UvData.ProjObject{IndexObj}=[]; %create a new empty object
+UvData.ProjObject{IndexObj}.DisplayHandle.uvmat=handles.PlotAxes; % axes for plot_object
+UvData.ProjObject{IndexObj}.DisplayHandle.view_field=[]; %no plot handle before plot_field operation
+set(handles.uvmat,'UserData',UvData)
+
+%% initiate the new projection object
 data.Name=data.Type;% default name=type
 data.Coord=[0 0]; %default
@@ -4724 +4808 @@
         data.DX=UvData.Field.CoordMesh;
         data.DY=UvData.Field.CoordMesh;
+        if strcmp(data.Type,'rectangle')||strcmp(data.Type,'ellipse')
+            data.RangeX=UvData.Field.CoordMesh;
+            data.RangeY=UvData.Field.CoordMesh;
+        end
     end
     if isfield(Field,'NbDim')&& isequal(Field.NbDim,3)
@@ -4732 +4820 @@
     end
 end
-if ishandle(handles.UVMAT_title)
-    delete(handles.UVMAT_title)%delete the initial display of uvmat if no field has been entered
-end
-hset_object=set_object(data,handles);% call the set_object interface
-hhset_object=guidata(hset_object);
+hset_object=set_object(data,handles);% call the GUI set_object 
 hchild=get(hset_object,'children');
 set(hchild,'enable','on')
-set(handles.uvmat,'UserData',UvData)
-set(handles.CheckZoom,'Value',0) %desactivate the zoom for object creation by the mouse
-CheckZoom_Callback(handles.uvmat, [], handles)
+
+
 set(handles.delete_object,'Visible','on')
 
@@ -4771 +4854 @@
 
 UvData=get(handles.uvmat,'UserData');
-UvData.Object{IndexObj}=[]; %create a new empty object
-UvData.Object{IndexObj}.DisplayHandle.uvmat=[]; %no plot handle before plot_field operation
-UvData.Object{IndexObj}.DisplayHandle.view_field=[]; %no plot handle before plot_field operation
+UvData.ProjObject{IndexObj}=[]; %create a new empty object
+UvData.ProjObject{IndexObj}.DisplayHandle.uvmat=[]; %no plot handle before plot_field operation
+UvData.ProjObject{IndexObj}.DisplayHandle.view_field=[]; %no plot handle before plot_field operation
 set(handles.uvmat,'UserData',UvData)
 set(handles.ListObject,'Value',IndexObj)
@@ -4842 +4925 @@
 
 %% read lines currently drawn
-ListObj=UvData.Object;
+ListObj=UvData.ProjObject;
 select=zeros(1,numel(ListObj));
 for iobj=1:numel(ListObj);
@@ -4855 +4938 @@
 else
     set(handles.ListObject,'Value',val);% show the selected lines on the list
-    ObjectData=UvData.Object(val);
+    ObjectData=UvData.ProjObject(val);
     for iobj=1:length(ObjectData)
 %         if isfield(ObjectData{iobj},'Coord')
@@ -4962 +5045 @@
 %------------------------------------------------------------------------
 UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface 
-ListObj=UvData.Object;
+ListObj=UvData.ProjObject;
 select=zeros(1,numel(ListObj));
 for iobj=1:numel(ListObj);
@@ -4981 +5064 @@
     yi=0.5:npy-0.5;
     [Xi,Yi]=meshgrid(xi,yi);
-%     if isfield(UvData,'Object')
-        for iobj=1:length(UvData.Object)
-            ObjectData=UvData.Object{iobj};
+        for iobj=1:length(UvData.ProjObject)
+            ObjectData=UvData.ProjObject{iobj};
             if isfield(ObjectData,'ProjMode') &&(isequal(ObjectData.ProjMode,'mask_inside')||isequal(ObjectData.ProjMode,'mask_outside'));
                 flagobj=1;
@@ -5307 +5389 @@
 
 
-% --- Executes on button press in CheckZoomFig.
-function CheckZoomFig_Callback(hObject, eventdata, handles)
-% hObject    handle to CheckZoomFig (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hint: get(hObject,'Value') returns toggle state of CheckZoomFig