Changeset 410 for trunk/src/mouse_down.m

Timestamp:

May 6, 2012, 4:06:22 PM (12 years ago)

Author:

sommeria

Message:

projection on object improved: two menus for object projection dispalyed in uvmat and in view_field

File:

• trunk/src/mouse_down.m (modified) (6 diffs)

trunk/src/mouse_down.m

@@ -245 +245 @@
                     %indicate on the list of the GUI uvmat which object has been selected
             if strcmp(get(hcurrentfig,'tag'),'uvmat') %if the uvmat graph has been selected, object projection is on the other frame view_field
-                IndexObj_old=get(hhuvmat.ListObject,'Value');
-                if IndexObj>IndexObj_old(1)
-                    IndexObj=[IndexObj_old(1) IndexObj];
-                else
-                    IndexObj=[1 IndexObj];
-                end
+%                 IndexObj=get(hhuvmat.ListObject,'Value');
+%                 if IndexObj>IndexObj_old(1)
+%                     IndexObj=[IndexObj_old(1) IndexObj];
+%                 else
+%                     IndexObj=[1 IndexObj];
+%                 end
                 set(hhuvmat.ListObject,'Value',IndexObj);
-                set(hhuvmat.ListObject,'UserData',IndexObj);
+%                 set(hhuvmat.ListObject,'UserData',IndexObj);
             else
-                set(hhuvmat.ListObject,'Value',IndexObj);
-                list_str=get(hhuvmat.ListObject,'String');
+                set(hhuvmat.ListObject_1,'Value',IndexObj);
+                list_str=get(hhuvmat.ListObject_1,'String');
                 UvData.Object{IndexObj}.Name=list_str{IndexObj};
             end
@@ -290 +290 @@
 if  test_create && ~isempty(xy) && ~(isfield(AxeData,'Drawing')&& isequal(AxeData.Drawing,'create'))
     hset_object=findobj(allchild(0),'tag','set_object');
+    % activate this option if the GUI set_object is opened
     if ~isempty(hset_object)
-        sethandles=guidata(hset_object);
-        ObjectData=read_GUI(hset_object); %read object features in the GUI set_object
+        sethandles=guidata(hset_object);% handles of the elements in set_object
+        ObjectData=read_GUI(hset_object); %read object parameters in the GUI set_object
         ObjectData.Coord=[]; %reset previous object coordinates
-        ObjectData.Coord(1,1)=xy(1,1);
+        ObjectData.Coord(1,1)=xy(1,1); % the object first coordinate is set by the mouse position
         ObjectData.Coord(1,2)=xy(1,2);
-        if isfield(AxeData,'ObjectCoord') & size(AxeData.ObjectCoord,2)==3
+        if isfield(AxeData,'ObjectCoord') && size(AxeData.ObjectCoord,2)==3
             ObjectData.Coord(1,3)=AxeData.ObjectCoord(1,3); %generaliser au cas avec angle
         end
@@ -303 +304 @@
             IndexObj=length(UvData.Object)+1;% add the object as index IndexObj on the list of the interface
         else
-            IndexObj=2;
+            IndexObj=2;% the first object is used for uvmat display or blank
         end
         UvData.Object{IndexObj}=ObjectData;
-        ListObject=get(hhuvmat.ListObject,'String');
-        IndexObj_old=get(hhuvmat.ListObject,'Value');
+        ListObject=get(hhuvmat.ListObject_1,'String');
         UvData.Object{IndexObj}.DisplayHandle_uvmat=AxeData.CurrentObject;
         ObjectNameNew=ObjectData.Name;
@@ -313 +313 @@
              ObjectNameNew=ObjectData.Type;
         end
+        % add an index to the object name if the proposed name already exists
         vers=0;% index of the name
         detectname=1;
@@ -330 +331 @@
         ObjectName=ObjectNameNew;
         set(sethandles.Name,'String',ObjectName)% display the default name in set_object
-        IndexObj=numel(ListObject)+1;% append an object to the list in uvmat
+%         IndexObj=numel(ListObject)+1;% append an object to the list in uvmat
         set(hhuvmat.ListObject,'String',[ListObject;{ObjectName}]);%complement the object list
-        set(hhuvmat.ListObject,'Value',[IndexObj_old(1) IndexObj])
+        set(hhuvmat.ListObject_1,'String',[ListObject;{ObjectName}]);%complement the object list
+        %set(hhuvmat.ListObject,'Value',[IndexObj_old(1) IndexObj])
+        set(hhuvmat.ListObject,'Value',IndexObj)
         %             if isempty(object_name)
         %                 list_str{IndexObj}=[num2str(IndexObj) '-' ObjectData.Type];
@@ -344 +347 @@
         PlotData=get(AxeData.CurrentObject,'UserData');
         PlotData.IndexObj=IndexObj;
-        set(AxeData.CurrentObject,'UserData',PlotData); %record the object index in the graph
-        AxeData.Drawing='create';
+        set(AxeData.CurrentObject,'UserData',PlotData); %record the object index in the graph (memory used for mouse motion)
+        AxeData.Drawing='create';% flag for mouse motion
     end
 end