Changeset 307

Timestamp:

Nov 28, 2011, 8:43:30 PM (13 years ago)

Author:

sommeria

Message:

bug fixed in the browser of civ + bug fix for the plot of objects

Location:

trunk/src

Files:

• civ.m (modified) (4 diffs)
• plot_object.m (modified) (1 diff)
• set_object.m (modified) (2 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/civ.m

@@ -227 +227 @@
 varargout{1} = handles.output;
 
-% %------------------------------------------------------------------------
-% % --- function activated by the Open/Browse... option in the upper menu bar.
-% function MenuBrowse_Callback(hObject, eventdata, handles)
-% %------------------------------------------------------------------------
-% %get the current input root file name to initiate the browser
-% filebase=get(handles.RootName,'String');
-% oldfile=''; %default
-% if isempty(filebase)|| isequal(filebase,'')%loads the previously stored root file name 
-%     dir_perso=prefdir;
-%     profil_perso=fullfile(dir_perso,'uvmat_perso.mat');
-%     if exist(profil_perso,'file')
-%         h=load (profil_perso);
-%         if isfield(h,'filebase')&& ischar(h.filebase)
-%             oldfile=h.filebase;
-%         end
-%         if isfield(h,'RootPath') && ischar(h.RootPath)
-%             oldfile=h.RootPath;
-%         end
-%     end
-% else
-%     oldfile=filebase;
-% end
-% ind_opening=1;%default
-% browse.incr_pair=[0 0]; %default
-% menu={'*.xml;*.civ;*.png;*.jpg;*.tif;*.avi;*.AVI;*.nc;', ' (*.xml,*.civ,*.png,*.jpg ,.tif, *.avi,*.nc)';
-%        '*.xml',  '.xml files '; ...
-%         '*.civ',  '.civ files '; ...
-%         '*.png','.png image files'; ...
-%         '*.jpg',' jpeg image files'; ...
-%         '*.tif','.tif image files'; ...
-%         '*.avi;*.AVI','.avi movie files'; ...
-%         '*.nc','.netcdf files'; ...
-%         '*.*',  'All Files (*.*)'};
-% [FileName, PathName, filtindex] = uigetfile( menu, 'Pick a file',oldfile);
-% fileinput=[PathName FileName];%complete file name
-% sizf=size(fileinput);
-% if (~ischar(fileinput)||~isequal(sizf(1),1)),return;end %stop if fileinput not a character string
-% 
-% %% prepare the GUI with parameters from the input file if opened from uvmat
-% errormsg=display_file_name(handles,fileinput);
-%     if ~isempty(errormsg)
-%         msgbox_uvmat('ERROR',erromsg)
-%     end
-
-% 
-% [path,name,ext]=fileparts(fileinput);
-% testeditxml=0;
-% if isequal(ext,'.xml')
-%     testeditxml=1;
-%     t_browse=xmltree(fileinput);
-%     head_element=get(t_browse,1);
-%     if isfield(head_element,'name')&& isequal(head_element.name,'ImaDoc')
-%         testeditxml=0;
-%     end
-% end
-% if testeditxml==1 || isequal(ext,'.xls')
-%     heditxml=editxml({fileinput});
-%     set(heditxml,'Tag','browser')
-%     waitfor(heditxml,'Tag','idle')
-%     if ~ishandle(heditxml)
-%         return
-%     end
-%     attr=findobj(get(heditxml,'children'),'Tag','CurrentAttributes');
-%     set(handles.browse,'UserData',fileinput)% store for future opening with browser
-%     fileinput=get(attr,'UserData');
-%     if ~exist(fileinput,'file')
-%         return
-%     end
-% end
-% [RootPath,RootFile,str1,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fileinput);
-% filebase=fullfile(RootPath,RootFile);
-% num_i1=str2double(str1);
-% if isnan(num_i1),num_i1=1;end
-% num_i2=str2double(str2);
-% if isnan(num_i2),num_i2=num_i1;end
-% num_j1=stra2num(str_a);
-% if isnan(num_j1),num_j1=1;end
-% num_j2=stra2num(str_b);
-% if isnan(num_j2),num_j2=num_j1;end
-% if isequal(get(handles.ListCompareMode,'Value'),1)
-%     browse=[];%initialisation
-% else
-%     browse=get(handlesRootName,'UserData');
-% end
-% browse.num_i1=num_i1;
-% browse.num_i2=num_i2;
-% browse.num_j1=num_j1;
-% browse.num_j2=num_j2;
-% if length(ext)>1 && (~isempty(imformats(ext(2:end)))||strcmpi(ext,'.avi'));%if an image file has been opened by uvmat
-%     browse.nom_type_ima=nom_type;
-%     browse.ext_ima=ext;
-%     set(handles.ImaExt,'String',ext)
-% end
-% set(handles.ImaDoc,'String',ext);
-% 
-% 
-% set(handles.RootName,'UserData',browse);% store information from browser
-% RootName_Callback(hObject, eventdata, handles);
+%------------------------------------------------------------------------
+% --- function activated by the Open/Browse... option in the upper menu bar.
+function MenuBrowse_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
+%get the current input root file name to initiate the browser
+filebase=get(handles.RootName,'String');
+oldfile=''; %default
+if isempty(filebase)|| isequal(filebase,'')%loads the previously stored root file name 
+    dir_perso=prefdir;
+    profil_perso=fullfile(dir_perso,'uvmat_perso.mat');
+    if exist(profil_perso,'file')
+        h=load (profil_perso);
+        if isfield(h,'filebase')&& ischar(h.filebase)
+            oldfile=h.filebase;
+        end
+        if isfield(h,'RootPath') && ischar(h.RootPath)
+            oldfile=h.RootPath;
+        end
+    end
+else
+    oldfile=filebase;
+end
+ind_opening=1;%default
+browse.incr_pair=[0 0]; %default
+menu={'*.xml;*.civ;*.png;*.jpg;*.tif;*.avi;*.AVI;*.nc;', ' (*.xml,*.civ,*.png,*.jpg ,.tif, *.avi,*.nc)';
+       '*.xml',  '.xml files '; ...
+        '*.civ',  '.civ files '; ...
+        '*.png','.png image files'; ...
+        '*.jpg',' jpeg image files'; ...
+        '*.tif','.tif image files'; ...
+        '*.avi;*.AVI','.avi movie files'; ...
+        '*.nc','.netcdf files'; ...
+        '*.*',  'All Files (*.*)'};
+[FileName, PathName, filtindex] = uigetfile( menu, 'Pick a file',oldfile);
+fileinput=[PathName FileName];%complete file name
+sizf=size(fileinput);
+if (~ischar(fileinput)||~isequal(sizf(1),1)),return;end %stop if fileinput not a character string
+
+%% prepare the GUI with parameters from the input file if opened from uvmat
+errormsg=display_file_name(handles,fileinput);
+    if ~isempty(errormsg)
+        msgbox_uvmat('ERROR',erromsg)
+    end
+
+
+[path,name,ext]=fileparts(fileinput);
+testeditxml=0;
+if isequal(ext,'.xml')
+    testeditxml=1;
+    t_browse=xmltree(fileinput);
+    head_element=get(t_browse,1);
+    if isfield(head_element,'name')&& isequal(head_element.name,'ImaDoc')
+        testeditxml=0;
+    end
+end
+if testeditxml==1 || isequal(ext,'.xls')
+    heditxml=editxml({fileinput});
+    set(heditxml,'Tag','browser')
+    waitfor(heditxml,'Tag','idle')
+    if ~ishandle(heditxml)
+        return
+    end
+    attr=findobj(get(heditxml,'children'),'Tag','CurrentAttributes');
+    set(handles.browse,'UserData',fileinput)% store for future opening with browser
+    fileinput=get(attr,'UserData');
+    if ~exist(fileinput,'file')
+        return
+    end
+end
+[RootPath,RootFile,str1,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fileinput);
+filebase=fullfile(RootPath,RootFile);
+num_i1=str2double(str1);
+if isnan(num_i1),num_i1=1;end
+num_i2=str2double(str2);
+if isnan(num_i2),num_i2=num_i1;end
+num_j1=stra2num(str_a);
+if isnan(num_j1),num_j1=1;end
+num_j2=stra2num(str_b);
+if isnan(num_j2),num_j2=num_j1;end
+if isequal(get(handles.ListCompareMode,'Value'),1)
+    browse=[];%initialisation
+else
+    browse=get(handlesRootName,'UserData');
+end
+browse.num_i1=num_i1;
+browse.num_i2=num_i2;
+browse.num_j1=num_j1;
+browse.num_j2=num_j2;
+if length(ext)>1 && (~isempty(imformats(ext(2:end)))||strcmpi(ext,'.avi'));%if an image file has been opened by uvmat
+    browse.nom_type_ima=nom_type;
+    browse.ext_ima=ext;
+    set(handles.ImaExt,'String',ext)
+end
+set(handles.ImaDoc,'String',ext);
+
+set(handles.RootName,'UserData',browse);% store information from browser
+RootName_Callback(hObject, eventdata, handles);
 
 % -----------------------------------------------------------------------
@@ -416 +415 @@
 num_ref_j=num_j1;
 browse.incr_pair=[0 0];%default
-if ~isempty(imformats(ext_input(2:end)))||strcmpi(ext_input,'.avi')% if the extension corresponds to an image or movie format recognized by Matlab
+
+% form=imformats(ext_input(2:end));
+if ~isempty(ext_input)&&(~isempty(imformats(ext_input(2:end)))||strcmpi(ext_input,'.avi'))% if the extension corresponds to an image or movie format recognized by Matlab
     ext_ima=ext_input;
     nom_type_ima=nom_type_input;
@@ -967 +968 @@
 % be performed, while the result is needed for next steps.
 displ_pair={''};
-select=ones(size(1:nbpair))%flag for displayed pairs =1 for display
+select=ones(size(1:nbpair));%flag for displayed pairs =1 for display
 testpair=0;
 
@@ -1061 +1062 @@
 
 %% determine the default selection in the pair menu
-ichoice=find(select,1)% index of selected pair
+ichoice=find(select,1);% index of selected pair
 if (isempty(ichoice) || ichoice < 1); ichoice=1; end;
-initial=get(handles.ListPairCiv1,'Value')%initial choice of pair
+initial=get(handles.ListPairCiv1,'Value');%initial choice of pair
 if initial>nbpair || (numel(select)>=initial && ~isequal(select(initial),1))
     set(handles.ListPairCiv1,'Value',ichoice);% first valid pair proposed by default in the menu

trunk/src/plot_object.m

@@ -39 +39 @@
 %% default output
 hh=[];%default output
-if isequal(ProjObject,ObjectDataIn)% object representation does not appear in its own projection plot
+if ~isfield(ObjectDataIn,'Style')|| isequal(ProjObject,ObjectDataIn)% object representation does not appear in its own projection plot
     return
 end

trunk/src/set_object.m

@@ -672 +672 @@
 hhuvmat=guidata(huvmat);%handles in the uvmat GUI
 ObjectName=get(handles.TITLE,'String');%name of the current object 
-ListObject=get(hhuvmat.list_object_1,'String');%position in the objet list
-IndexObj_1=get(hhuvmat.list_object_1,'Value');
-if isequal(get(hhuvmat.list_object_2,'Visible'),'on')
-    IndexObj_2=get(hhuvmat.list_object_2,'Value');
-    List2=get(hhuvmat.list_object_2,'String');
+ListObject=get(hhuvmat.ListObject,'String');%position in the objet list
+IndexObj=get(hhuvmat.ListObject,'Value');
+IndexObj_1=IndexObj(1);
+% if isequal(get(hhuvmat.list_object_2,'Visible'),'on')
+%     IndexObj_2=get(hhuvmat.list_object_2,'Value');
+%     List2=get(hhuvmat.list_object_2,'String');
+if numel(IndexObj)==2
+    IndexObj_2=IndexObj(2);
 else
     IndexObj_2=[];
@@ -729 +732 @@
 end
 ListObject{IndexObj,1}=ObjectName;
-set(hhuvmat.list_object_1,'String',ListObject)
-set(hhuvmat.list_object_2,'String',ListObject)
+set(hhuvmat.ListObject,'String',ListObject)
+% set(hhuvmat.list_object_2,'String',ListObject)
 
 %% update the object plot and projection field
 if testnew 
-    set(hhuvmat.list_object_2,'Value',IndexObj)
+   set(hhuvmat.ListObject,'Value',IndexObj) 
+%     set(hhuvmat.list_object_2,'Value',IndexObj)
     ObjectData.DisplayHandle_uvmat=hhuvmat.axes3;
     ObjectData.DisplayHandle_view_field=[];
 else
-    if isfield(UvData.Object{IndexObj},'DisplayHandle_uvmat')% save the previous object graph handles
+    IndexObj
+    UvData.Object{IndexObj}
+    if IndexObj<=length(UvData.Object) && isfield(UvData.Object{IndexObj},'DisplayHandle_uvmat')% save the previous object graph handles
         ObjectData.DisplayHandle_uvmat=UvData.Object{IndexObj}.DisplayHandle_uvmat;
     else

trunk/src/uvmat.m

@@ -4851 +4851 @@
 % set(handles.uvmat,'UserData',UvData)
 set(handles.delete_object,'Visible','on')
-set(handles.uvmat_title,'Visible','on')
-set(handles.view_field_title,'Visible','on')
+% set(handles.uvmat_title,'Visible','on')
+% set(handles.view_field_title,'Visible','on')
 
 %------------------------------------------------------------------------