Changeset 387 for trunk/src/mouse_motion.m

Timestamp:

Apr 4, 2012, 3:31:30 PM (12 years ago)

Author:

sommeria

Message:

several bugs corrected: mask, color image...

File:

• trunk/src/mouse_motion.m (modified) (1 diff)

trunk/src/mouse_motion.m

@@ -245 +245 @@
                         end
                         [Data,errormsg,result_conv]= civ_matlab(Param);
-                        rangx(1)=-(isx2-ibx2)+shiftx;
-                        rangx(2)=isx2-ibx2+shiftx;
-                        rangy(1)=-(isy2-iby2)-shifty;
-                        rangy(2)=(isy2-iby2)-shifty;
-                        hcorr=[];
-                        if isfield(AxeData,'CurrentCorrImage')
-                            hcorr=AxeData.CurrentCorrImage;
-                            if ~ishandle(hcorr)
-                                hcorr=[];
+                        if ~isempty(errormsg)
+                            text_displ_4=errormsg;
+                        else
+                            rangx(1)=-(isx2-ibx2)+shiftx;
+                            rangx(2)=isx2-ibx2+shiftx;
+                            rangy(1)=-(isy2-iby2)-shifty;
+                            rangy(2)=(isy2-iby2)-shifty;
+                            hcorr=[];
+                            if isfield(AxeData,'CurrentCorrImage')
+                                hcorr=AxeData.CurrentCorrImage;
+                                if ~ishandle(hcorr)
+                                    hcorr=[];
+                                end
                             end
-                        end
-                        if isempty(hcorr)
-                            corrfig=findobj(allchild(0),'tag','corrfig');
-                            if ~isempty(corrfig)
-                                set(0,'CurrentFigure',corrfig(1))
-                                AxeData.CurrentCorrImage=imagesc(rangx,-rangy,result_conv,[0 1]);
-                                AxeData.CurrentVector=line([0 Data.Civ1_U],[0 Data.Civ1_V],'Tag','vector');               
-                                colorbar
-                                set(haxes,'UserData',AxeData)
-                                set(get(AxeData.CurrentCorrImage,'parent'),'YDir','normal')
+                            if isempty(hcorr)
+                                corrfig=findobj(allchild(0),'tag','corrfig');
+                                if ~isempty(corrfig)
+                                    set(0,'CurrentFigure',corrfig(1))
+                                    AxeData.CurrentCorrImage=imagesc(rangx,-rangy,result_conv,[0 1]);
+                                    AxeData.CurrentVector=line([0 Data.Civ1_U],[0 Data.Civ1_V],'Tag','vector');
+                                    colorbar
+                                    set(haxes,'UserData',AxeData)
+                                    set(get(AxeData.CurrentCorrImage,'parent'),'YDir','normal')
+                                end
+                            else
+                                set(AxeData.CurrentCorrImage,'CData',result_conv)
+                                set(AxeData.CurrentCorrImage,'XData',rangx)
+                                set(AxeData.CurrentCorrImage,'YData',-rangy)
+                                set(AxeData.CurrentVector,'XData',[0 Data.Civ1_U],'YData',[0 Data.Civ1_V])
                             end
-                        else
-                            set(AxeData.CurrentCorrImage,'CData',result_conv)
-                            set(AxeData.CurrentCorrImage,'XData',rangx)
-                            set(AxeData.CurrentCorrImage,'YData',-rangy)
-                            set(AxeData.CurrentVector,'XData',[0 Data.Civ1_U],'YData',[0 Data.Civ1_V])
                         end
                     end