Changeset 699 for trunk

Timestamp:

Dec 12, 2013, 3:58:02 PM (10 years ago)

Author:

sommeria

Message:

mouse indication improved

Location:

trunk/src

Files:

• geometry_calib.m (modified) (2 diffs)
• mouse_motion.m (modified) (2 diffs)
• mouse_up.m (modified) (3 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/geometry_calib.m

@@ -978 +978 @@
 set(handles.APPLY,'BackgroundColor',[1 0 1])
 
-figure(10)
-hold off
-imagesc(Amod)
-hold on
-plot(Tmod(:,1),Tmod(:,2),'+')
+% figure(10)
+% hold off
+% imagesc(Amod)
+% hold on
+% plot(Tmod(:,1),Tmod(:,2),'+')
 
 
@@ -1238 +1238 @@
 hh=findobj('Tag','calib_points');
 if  ~isempty(Coord) && isempty(hh)
-    hh=line(Coord_plot(:,1),Coord_plot(:,2),'Color','m','Tag','calib_points','LineStyle','.','Marker','+');
+    hh=line(Coord_plot(:,1),Coord_plot(:,2),'Color','m','Tag','calib_points','LineStyle','.','Marker','+','MarkerSize',10);
 elseif isempty(Coord)%empty list of points, suppress the plot
     delete(hh)

trunk/src/mouse_motion.m

@@ -109 +109 @@
     test_zoom_draw=test_draw && isequal(AxeData.Drawing,'zoom')&& isfield(AxeData,'CurrentOrigin') && isequal(get(gcf,'SelectionType'),'normal');
     test_object=test_draw && isfield(AxeData,'CurrentObject') && ~isempty(AxeData.CurrentObject) && ishandle(AxeData.CurrentObject);
-    if ~test_edit_object  && ~test_ruler && ~CheckZoom
-        pointershape='crosshair';%set pointer with cross shape (default when mouse is over an axis)
+    if ~test_edit_object  && ~test_ruler 
+        if CheckZoom
+           pointershape='zoom';
+        elseif CheckZoomFig
+            pointershape='zoomfig';
+        elseif test_draw
+            pointershape='crosshair';%set pointer with cross shape (default when mouse is over an axis)
+        else
+        pointershape='fullcross';%set pointer with cross shape (default when mouse is over an axis)
+        end
     end
     FigData=get(hCurrentFig,'UserData');
@@ -445 +453 @@
 
 %% update the mouse pointer
+if strcmp(pointershape,'zoom')||strcmp(pointershape,'zoomfig')
+    CData=set_pointershape(pointershape);
+    set(hCurrentFig,'Pointer','custom','PointerShapeCData',CData,'PointerShapeHotSpot',[9 9])
+else
 set(hCurrentFig,'Pointer',pointershape);
+end
+
+function CData=set_pointershape(pointershape)
+        CData=ones(16,16);
+        [ind_x,ind_y]=meshgrid([1:16],[1:16]);
+        if strcmp(pointershape,'zoom')
+        radius=(ind_x-9).*(ind_x-9)+(ind_y-8.5).*(ind_y-9);
+        CData(radius<25 & radius>16)=2; %make white circle
+        CData(radius<16 | radius>40)=NaN; %make the centre transparent
+        CData(16,16)=1; CData(15,16)=2;
+        CData(15,15)=1; CData(14,15)=2;
+        CData(14,14)=1; CData(13,14)=2;
+        CData(13,13)=1; CData(12,13)=2;
+        elseif strcmp(pointershape,'zoomfig')
+            CData(:,1:3)=2;
+            CData(:,14:16)=2;
+                        CData(1:3,:)=2;
+            CData(14:16,:)=2;
+            CData(CData==1)=NaN;
+        end

trunk/src/mouse_up.m

@@ -39 +39 @@
     testsubplot=0;
 end
+%set(get(hcurrentfig,'CurrentObject'),'Selected','off')
+
 CurrentOrigin=[];
 if isfield(AxeData,'CurrentOrigin')
@@ -57 +59 @@
     return
 end
+
 xy=get(hcurrentaxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
 
@@ -63 +66 @@
 if ~isempty(huvmat) && isfield(AxeData,'Drawing') && ~isequal(AxeData.Drawing,'off') && isfield(AxeData,'CurrentObject')...
         && ~isempty(AxeData.CurrentObject) && ishandle(AxeData.CurrentObject)
+    set(AxeData.CurrentObject,'Selected','off')
     PlotData=get(AxeData.CurrentObject,'UserData');%get data attached to the current projection object
     IndexObj=PlotData.IndexObj;

trunk/src/uvmat.m

@@ -2825 +2825 @@
 function CheckZoom_Callback(hObject, eventdata, handles)
 
-if get(handles.CheckZoom,'Value') 
-    set(handles.CheckFixLimits,'Value',1)% propose by default fixed limits for the plotting axes
-    set(handles.CheckZoomFig,'Value',0)%desactivate zoom fig
-end
+    if get(handles.CheckZoom,'Value')
+        set(handles.CheckFixLimits,'Value',1)% propose by default fixed limits for the plotting axes
+        set(handles.CheckZoomFig,'Value',0)%desactivate zoom fig
+    end
+
 
 %------------------------------------------------------------------------