Changeset 342 for trunk

Timestamp:

Dec 20, 2011, 5:14:43 PM (13 years ago)

Author:

sommeria

Message:

various bugs corrected

Location:

trunk/src

Files:

• find_file_series.m (modified) (1 diff)
• keyboard_callback.m (modified) (1 diff)
• mouse_down.m (modified) (1 diff)
• series.fig (modified) (previous)
• series.m (modified) (4 diffs)
• set_grid.m (modified) (6 diffs)
• set_object.m (modified) (2 diffs)
• uvmat.m (modified) (7 diffs)

trunk/src/find_file_series.m

@@ -143 +143 @@
                 break
             end
-        else
-            ref_j=j1;
-            if isempty(j2_input)
-                if  ~isempty(j2)% invalid file name if j2 does not exist in the input file
-                    break
+        else %j1_input is not empty
+            if isempty(j1)% the detected name does not fit with the input
+                break
+            else
+                ref_j=j1;
+                if isempty(j2_input)
+                    if  ~isempty(j2)% invalid file name if j2 does not exist in the input file
+                        break
+                    end
+                else
+                    ref_j=floor((j1+j2)/2);
                 end
-            else
-                ref_j=floor((j1+j2)/2);
             end
         end

trunk/src/keyboard_callback.m

@@ -33 +33 @@
             elseif isfield(AxeData,'LimEditBox')&& isequal(AxeData.LimEditBox,1)% update display of the GUI containing the axis (uvmat or view_field)
                 hh=guidata(hfig);
-                if isfield(hh,'MinX')
-                    set(hh.MinX,'String',num2str(xlimit(1)))
-                    set(hh.MaxX,'String',num2str(xlimit(2)))
-                    set(hh.MinY,'String',num2str(ylimit(1)))
-                    set(hh.MaxY,'String',num2str(ylimit(2)))
+                if isfield(hh,'num_MinX')
+                    set(hh.num_MinX,'String',num2str(xlimit(1)))
+                    set(hh.num_MaxX,'String',num2str(xlimit(2)))
+                    set(hh.num_MinY,'String',num2str(ylimit(1)))
+                    set(hh.num_MaxY,'String',num2str(ylimit(2)))
                 end
             end

trunk/src/mouse_down.m

@@ -353 +353 @@
             set(hhuvmat.transform_fct,'Value',1)
             uvmat('transform_fct_Callback',hObject,eventdata,hhuvmat); %file input with xml reading  in uvmat
-            set(hhuvmat.FixedLimits,'Value',0)% put FixedLimits option to 'off'
-            set(hhuvmat.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
+            set(hhuvmat.CheckFixedLimits,'Value',0)% put FixedLimits option to 'off'
+            set(hhuvmat.CheckFixedLimits,'BackgroundColor',[0.7 0.7 0.7])
             return
         end

trunk/src/series.m

@@ -490 +490 @@
 CData=zeros([size(XIma) 3]);
 file_ima=double((i1_series(:,:,1)>0)');
+if numel(file_ima)>=2
 if size(file_ima,1)==1
     CLine=interp1(ind_i,file_ima,xima,'nearest');
@@ -499 +500 @@
 end
 set(handles.waitbar_frame,'CData',CData)
+end
 set(handles.waitbar_frame,'Units','normalized')
+
 % CData(:,1:floor(advance_ratio*size(CData,2)),1:2)=1;
 % set(hwaitbar,'CData',CData)
@@ -1673 +1676 @@
 function num_first_i_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-last_i_Callback(hObject, eventdata, handles)
+num_last_i_Callback(hObject, eventdata, handles)
 
 %------------------------------------------------------------------------
@@ -1687 +1690 @@
 function num_first_j_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
- last_j_Callback(hObject, eventdata, handles)
+ num_last_j_Callback(hObject, eventdata, handles)
 
 %------------------------------------------------------------------------

trunk/src/set_grid.m

@@ -264 +264 @@
 textout=char(textgrid);
 imageA=get(handles.image_1,'String');
-[Pathsub]=name2display(imageA);
-Answer = msgbox_uvmat('INPUT_TXT','grid file name (*.grid)',fullfile(Pathsub,'gridA.grid'));
+RootPath=fileparts_uvmat(imageA);
+%[Pathsub]=name2display(imageA);
+Answer = msgbox_uvmat('INPUT_TXT','grid file name (*.grid)',fullfile(RootPath,'gridA.grid'));
 % Answer = inputdlg('grid file name (*.grid)',' ',1,{fullfile(Pathsub,'gridA.grid')},'on');
 dlmwrite(Answer,textout,'');
@@ -281 +282 @@
     textgrid={tete;txt};
     textout=char(textgrid);
-    Answer = msgbox_uvmat('INPUT_TXT','grid file name (*.grid)',fullfile(Pathsub,'gridB.grid'));
+    Answer = msgbox_uvmat('INPUT_TXT','grid file name (*.grid)',fullfile(RootPath,'gridB.grid'));
     dlmwrite(Answer,textout,'');
     msgbox_uvmat('CONFIRMATION',[Answer ' written as ASCII text file']);
@@ -287 +288 @@
 
 %-------------------------
-function [grid_pix_A,grid_pix_B]=get_grid(handles);
+function [grid_pix_A,grid_pix_B]=get_grid(handles)
 %Object=read_set_object(handles);%read the set_grid interface;
 grid_pix_B=[];%default
@@ -296 +297 @@
 YMin=str2num(get(handles.YMin,'String'));
 YMax=str2num(get(handles.YMax,'String'));
-array_realx=[XMin:DX:XMax];
-array_realy=[YMin:DY:YMax];
+array_realx=XMin:DX:XMax;
+array_realy=YMin:DY:YMax;
 nx_patch=length(array_realx);
 ny_patch=length(array_realy);
@@ -325 +326 @@
     return
 end
-[Pathsub,RootFile,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(imageA);
-form=imformats(ext(2:end));
+%[Pathsub,RootFile,field_count,str2,str_a,str_b,FileExt,NomType,SubDir]=name2display(imageA);
+[RootPath,~,RootFile,~,~,~,~,FileExt]=fileparts_uvmat(imageA);
+form=imformats(FileExt(2:end));
 if isempty(form)% if the extension corresponds to an image format recognized by Matlab
      msgbox_uvmat('ERROR',['error: ' imageA ' is not an image name recognized by Matlab '])
      return
 end
-fileAxml=[fullfile(Pathsub,RootFile) '.xml'];
+fileAxml=[fullfile(RootPath,RootFile) '.xml'];
 [XmlDataA,error]=imadoc2struct(fileAxml); 
 if isfield(XmlDataA,'GeometryCalib')
@@ -360 +362 @@
         return
     end
-    [Pathsub,RootFile,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(imageB);
-    form=imformats(ext([2:end]));
+    %[RootPath,RootFile,field_count,str2,str_a,str_b,FileExt,NomType,SubDir]=name2display(imageB);
+    [RootPath,~,RootFile,~,~,~,~,FileExt]=fileparts_uvmat(imageB);
+    form=imformats(FileExt(2:end));
     if isempty(form)% if the extension corresponds to an image format recognized by Matlab
-         msgbox_uvmat('ERROR',['error: ' imageB ' is not an image name recognized by Matlab '])
-         return
-    end
-    fileBxml=[fullfile(Pathsub,RootFile) '.xml'];
-    [XmlDataB,error]=imadoc2struct(fileBxml); 
+        msgbox_uvmat('ERROR',['error: ' imageB ' is not an image name recognized by Matlab '])
+        return
+    end
+    fileBxml=[fullfile(RootPath,RootFile) '.xml'];
+    [XmlDataB,error]=imadoc2struct(fileBxml);
     if isfield(XmlDataB,'GeometryCalib')
-     tsaiB=XmlDataB.GeometryCalib;
+        tsaiB=XmlDataB.GeometryCalib;
     else
-     msgbox_uvmat('WARNING','no geometric calibration available for image B')
-     tsaiB=[];
- end
-    %[error,Heading,nom_type_read,ext_ima_read,time,TimeUnit,mode,NbSlice,...
+        msgbox_uvmat('WARNING','no geometric calibration available for image B')
+        tsaiB=[];
+    end
+    %[error,Heading,NomType_read,ext_ima_read,time,TimeUnit,mode,NbSlice,...
     %     npxB,npyB,tsaiB]=read_imadoc(fileBxml,0);
     [grid_imaB(:,1),grid_imaB(:,2)]=px_XYZ(tsaiB,grid_real(:,1),grid_real(:,2),0);
-%     if isempty(npxB)|isempty(npyB)
-        B=imread(imageB);
-       siz=size(B);
-       npxB=siz(2);
-       npyB=siz(1);
-%     end
-    flagB=grid_imaB(:,1)>0 & grid_imaB(:,1)<npxB & grid_imaB(:,2)>0 & grid_imaB(:,2)<npyB; 
+    %     if isempty(npxB)|isempty(npyB)
+    B=imread(imageB);
+    siz=size(B);
+    npxB=siz(2);
+    npyB=siz(1);
+    %     end
+    flagB=grid_imaB(:,1)>0 & grid_imaB(:,1)<npxB & grid_imaB(:,2)>0 & grid_imaB(:,2)<npyB;
 end
 if testB

trunk/src/set_object.m

@@ -672 +672 @@
 hhuvmat=guidata(huvmat);%handles in the uvmat GUI
 ListObject=get(hhuvmat.ListObject,'String');%position in the objet list
-IndexObj=get(hhuvmat.ListObject,'Value')
+IndexObj=get(hhuvmat.ListObject,'Value');
 
 %% read the object on the GUI set_object
+ObjectData=read_set_object(handles);%read the input parameters defining the object in the GUI set_object
 ObjectName=get(handles.TITLE,'String');%name of the current object defiend in set_object
-ObjectData=read_set_object(handles);%read the input parameters defining the object in the GUI set_object
 if isempty(ObjectName)
     if get(hhuvmat.edit_object,'Value')% edit mode
         ObjectName=ListObject{IndexObj(end)};%take the name of the last (second) selected item
+    else %new object
+        StyleList=get(handles.ObjectStyle,'String');
+        StyleVal=get(handles.ObjectStyle,'Value');
+        ObjectName=StyleList{StyleVal};
+        %ObjectName=[num2str(numel(ListObject)+1) '-' StyleList{StyleVal}];% take the object style as default name
     end
 end
@@ -700 +705 @@
     end
     ObjectName=ObjectNameNew;
-    ObjectName=[num2str(IndexObj(end)) '-' ObjectData.Style];%default name
+%     ObjectName=[num2str(IndexObj(end)) '-' ObjectData.Style];%default name
+    set(handles.TITLE,'String',ObjectName)% display the default name in set_object
+    IndexObj(2)=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)
+    UvData.Object{IndexObj(2)}=[];%initiate a new object (empty yet)
 end
 % IndexObj_1=IndexObj(1);

trunk/src/uvmat.m

@@ -1986 +1986 @@
 
 %% determine the input file type
-if (test_1 && isfield(UvData,'MovieObject_1'))||(~test_1 && isfield(UvData,'MovieObject'))
+if (test_1 && isfield(UvData,'MovieObject_1'))||(~test_1 && ~isempty(UvData.MovieObject))
     FileType='movie';
 elseif isequal(lower(Ext),'.avi')
@@ -4249 +4249 @@
 list_str=get(handles.ListObject,'String');
 IndexObj_old=get(handles.ListObject,'UserData');%retrieve previous selection
-IndexObj=get(handles.ListObject,'Value');
+IndexObj=get(handles.ListObject,'Value');%present object selection
+
+%% we select two objects or more at once (using the Ctrl key), keep only the last two items: the first is projected on uvmat, the second on view_field
 if length(IndexObj)>2
      IndexObj=[IndexObj(end-1) IndexObj(end)];%keeps only the last two selected items at most
 end
-if length(IndexObj)==1
-    if length(IndexObj_old)>=2 && isequal(IndexObj_old(1),IndexObj)       
-        IndexObj=IndexObj_old(2);
-    elseif length(IndexObj_old)>=2 && isequal(IndexObj_old(2),IndexObj)
-        IndexObj=IndexObj_old(1);
-    else
-        IndexObj=[IndexObj_old(1) IndexObj];
-    end
-end
-set(handles.ListObject,'Value',IndexObj); %keeps only the two first selected objects
-set(handles.ListObject,'UserData',IndexObj)
- %desactivate the edit object mode
-set(handles.edit_object,'Value',0)
+
+%% we select one object 
+if length(IndexObj)==1% 
+    if length(IndexObj_old)>=2 && isequal(IndexObj_old(1),IndexObj)   % we select the first previously selected object-> 
+        IndexObj=[1 IndexObj_old(2)];% it desactivates this object and selects the first object for uvmat
+    elseif length(IndexObj_old)>=2 && isequal(IndexObj_old(2),IndexObj) % we select the second previously selected object->
+        IndexObj=IndexObj_old(1);% it desactivates this object  and keeps only the first previously selected object (uvmat)
+    else % 
+        IndexObj=[IndexObj_old(1) IndexObj];% activates a second object while keeping the first previously selected one
+    end
+end
+set(handles.ListObject,'Value',IndexObj); % marks the selected objects in the list
+set(handles.ListObject,'UserData',IndexObj)% keep the current object selection in memory for next time
+
+%% update the object representation
+set(handles.edit_object,'Value',0) % desactivate the edit object mode
 edit_object_Callback(hObject, eventdata, handles)
 UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface
@@ -4272 +4277 @@
     return
 end
-UvData.Object=update_obj(UvData,IndexObj(1),IndexObj(2));
-set(handles.uvmat,'UserData',UvData)
-
-%project on the selected object and update the corresponding plot
+if numel(IndexObj)>=2
+    UvData.Object=update_obj(UvData,IndexObj(1),IndexObj(2));%update the current object graphic representation
+    set(handles.uvmat,'UserData',UvData)
+end
+
+%% project on the selected object and update the corresponding plot
+% hview_field=findobj(allchild(0),'tag','view_field');
+% ViewObjectAxes=[];%default
+if ~isequal(IndexObj(1),IndexObj_old(1))
+    update_object(handles,IndexObj(1),handles.axes3,list_str{IndexObj(1)})%plot the projection in uvmat
+end
 hview_field=findobj(allchild(0),'tag','view_field');
-ViewObjectAxes=[];%default
-if ~isequal(IndexObj(1),IndexObj_old(1))
-update_object(handles,IndexObj(1),handles.axes3,list_str{IndexObj(1)})%plot the projection in uvmat
-end
 if length(IndexObj)==2 && (length(IndexObj_old)==1 || ~isequal(IndexObj(2),IndexObj_old(2)))
-    hview_field=findobj(allchild(0),'tag','view_field');
     if isempty(hview_field)
         hview_field=view_field;
@@ -4288 +4295 @@
     PlotHandles=guidata(hview_field);
     update_object(handles,IndexObj(2),PlotHandles.axes3,list_str{IndexObj(2)})%plot the projection in view_field
-end
-update_object_color(handles.axes3,PlotHandles.axes3,UvData.Object{IndexObj(2)}.DisplayHandle_uvmat)
+    update_object_color(handles.axes3,PlotHandles.axes3,UvData.Object{IndexObj(2)}.DisplayHandle_uvmat)
+else
+    if ~isempty(hview_field)
+        delete(hview_field)
+    end
+    hset_object=findobj(allchild(0),'tag','set_object');
+    if ~isempty(hset_object)
+        delete(hset_object)
+    end
+    update_object_color(handles.axes3,handles.axes3,[])
+end
+
+%% update the color of the gfraphic object representation: the selected object in magenta, others in blue
+% update_object_color(handles.axes3,PlotHandles.axes3,UvData.Object{IndexObj(2)}.DisplayHandle_uvmat)
 
 %------------------------------------------------------------------------
@@ -4308 +4327 @@
 if ~isempty(hset_object)
     delete(hset_object)% delete existing version of set_object
+end
     hset_object=set_object(ObjectData,[],ZBounds);
-end
+% end
 edit_test=get(handles.edit_object,'Value');
 if edit_test
@@ -4347 +4367 @@
     set(hother(iobj),'Selected','off')
 end
+if ~isempty(DisplayHandle)
 linetype=get(DisplayHandle,'Type');
 if isequal(linetype,'line')
@@ -4372 +4393 @@
 if isfield(SubObjectData,'DeformPoint') & ishandle(SubObjectData.DeformPoint)
     set(SubObjectData.DeformPoint,'Color','m')
+end
 end