Changeset 613 for trunk

Timestamp:

Apr 19, 2013, 8:26:15 AM (12 years ago)

Author:

sommeria

Message:

a few bugs repaired, GUI sizes optimized

Location:

trunk/src

Files:

• geometry_calib.m (modified) (1 diff)
• read_civdata.m (modified) (7 diffs)
• set_object.m (modified) (2 diffs)
• uigetfile_uvmat.m (modified) (8 diffs)

trunk/src/geometry_calib.m

@@ -89 +89 @@
 set(hObject,'WindowButtonDownFcn',{'mouse_alt_gui',handles}) % allows mouse action with right button (zoom for uicontrol display)
 
-%set the position of the interface
-if exist('pos','var')&& length(pos)>=4
-    set(hObject,'Position',pos);
-end
+%% position
+set(0,'Unit','points')
+ScreenSize=get(0,'ScreenSize');% get the size of the screen, to put the fig on the upper right
+Width=350;% fig width in points (1/72 inch)
+Height=min(0.9*ScreenSize(4),700);
+Left=ScreenSize(3)- Width-40; %right edge close to the right, with margin=40 
+Bottom=ScreenSize(4)-Height-40; %put fig at top right
+set(handles.geometry_calib,'Unit','points')
+set(handles.geometry_calib,'Position',[Left Bottom Width Height])
+
+% %set the position of the interface
+% if exist('pos','var')&& length(pos)>=4
+%     set(hObject,'Position',pos);
+% end
 
 %set menu of calibration options

trunk/src/read_civdata.m

@@ -2 +2 @@
 %------------------------------------------------------------------
 %
-% function [Field,VelTypeOut]=read_civdata(filename,FieldNames,VelType)
+% function [Field,VelTypeOut]=read_civdata(FileName,FieldNames,VelType)
 %
 % OUTPUT:
@@ -30 +30 @@
 %
 % INPUT:
-% filename: file name (string).
+% FileName: file name (string).
 % FieldNames =cell of field names to get, which can contain the strings:
 %             'ima_cor': image correlation, vec_c or vec2_C
@@ -45 +45 @@
 % 'nc2struct': reads a netcdf file 
 
-function [Field,VelTypeOut,errormsg]=read_civdata(filename,FieldNames,VelType)
+function [Field,VelTypeOut,errormsg]=read_civdata(FileName,FieldNames,VelType)
 
 %% default input
@@ -60 +60 @@
     FieldNames=[]; %default
 end
+Field=[];
+VelTypeOut=VelType;
 errormsg='';
+if ~exist(FileName,'file')
+    errormsg=['input file ' FileName ' does not exist'];
+    return
+end
 if ischar(FieldNames), FieldNames={FieldNames}; end;
 ProjModeRequest='';
@@ -75 +81 @@
 
 %% reading data
-Data=nc2struct(filename,'ListGlobalAttribute','CivStage');
+Data=nc2struct(FileName,'ListGlobalAttribute','CivStage');
 if isfield(Data,'Txt')
      erromsg=['error in read_civdata: ' Data.Txt];
@@ -85 +91 @@
     return
 else
-    [Field,vardetect]=nc2struct(filename,varlist);%read the variables in the netcdf file
+    [Field,vardetect]=nc2struct(FileName,varlist);%read the variables in the netcdf file
 end
 if isfield(Field,'Txt')
@@ -92 +98 @@
 end
 if vardetect(1)==0
-     errormsg=[ 'requested field not available in ' filename '/' VelType ': need to run patch'];
+     errormsg=[ 'requested field not available in ' FileName '/' VelType ': need to run patch'];
      return
 end

trunk/src/set_object.m

@@ -79 +79 @@
 guidata(hObject, handles);
 
+%% position
+set(0,'Unit','points')
+ScreenSize=get(0,'ScreenSize');% get the size of the screen, to put the fig on the upper right
+Width=300;% fig width in points (1/72 inch)
+Height=min(0.8*ScreenSize(4),500);
+Left=ScreenSize(3)- Width-40; %right edge close to the right, with margin=40 
+Bottom=ScreenSize(4)-Height-40; %put fig at top right
+set(handles.set_object,'Unit','points')
+set(handles.set_object,'Position',[Left Bottom Width Height])
+
 %default
 if ~exist('ZBounds','var')
@@ -155 +165 @@
 %defaul settings
 set(get(handles.set_object,'children'),'enable','on')
-   set(handles.PLOT,'enable','off') 
+set(handles.PLOT,'enable','off') 
 % end
-huvmat=findobj(allchild(0),'tag','uvmat');
-UvData=get(huvmat,'UserData');
-pos_uvmat=get(huvmat,'Position');
-%position the set_object GUI with respect to uvmat
-if isfield(UvData,'SetObjectOrigin')
-    pos_set_object(1:2)=UvData.SetObjectOrigin + pos_uvmat(1:2);
-    pos_set_object(3:4)=UvData.SetObjectSize .* pos_uvmat(3:4);
-    set(hObject,'Position',pos_set_object)
-end
+% huvmat=findobj(allchild(0),'tag','uvmat');
+% UvData=get(huvmat,'UserData');
+% pos_uvmat=get(huvmat,'Position');
+% %position the set_object GUI with respect to uvmat
+% if isfield(UvData,'SetObjectOrigin')
+%     pos_set_object(1:2)=UvData.SetObjectOrigin + pos_uvmat(1:2);
+%     pos_set_object(3:4)=UvData.SetObjectSize .* pos_uvmat(3:4);
+%     set(hObject,'Position',pos_set_object)
+% end
 
 %------------------------------------------------------------------------

trunk/src/uigetfile_uvmat.m

@@ -48 +48 @@
     uicontrol('Style','text','Units','normalized', 'Position', [0.05 0.97 0.5 0.03],'BackgroundColor',BackgroundColor,...
             'String','path:','FontUnits','points','FontSize',12,'FontWeight','bold','ForegroundColor','blue','HorizontalAlignment','left');
-    uicontrol('Style','edit','Units','normalized', 'Position', [0.05 0.89 0.9 0.08],'tag','titlebox','Max',2,'BackgroundColor',[1 1 1],...
+    uicontrol('Style','edit','Units','normalized', 'Position', [0.05 0.89 0.9 0.08],'tag','titlebox','Max',2,'BackgroundColor',[1 1 1],'Callback',@refresh_GUI,...
         'String',InputDir,'FontUnits','points','FontSize',12,'FontWeight','bold');
     uicontrol('Style','pushbutton','Tag','backward','Units','normalized','Position',[0.05 0.75 0.1 0.07],...
@@ -96 +96 @@
 end
 hfig=get(hObject,'parent');
+hlist=findobj(hfig,'tag','list');% find the list object
+set(hlist,'BackgroundColor',[1 1 0])
+drawnow
 htitlebox=findobj(hfig,'tag','titlebox');
 DirName=get(htitlebox,'String');
@@ -105 +108 @@
 hcheck_date=findobj(hfig,'tag','check_date');
 ListFiles=list_files(DirName,get(hcheck_date,'Value'),sort_option);% list the directory content
-hlist=findobj(hfig,'tag','list');% find the list object
+
 set(hlist,'String',ListFiles)
 Value=[];
@@ -115 +118 @@
 end
 set(hlist,'Value',Value)
-
+set(hlist,'BackgroundColor',[0.7 0.7 0.7])
 if strcmp(get(hfig,'Tag'),'status_display') 
     hseries=findobj(allchild(0),'tag','series');
@@ -217 +220 @@
     %         FullSelectName=fileparts(fileparts(FullSelectName));
     %     end
+    set(hObject,'BackgroundColor',[1 1 0])% paint list in yellow to indicate action
+    drawnow
     hbackward=findobj(hfig,'Tag','backward');
     set(hbackward,'UserData',DirName); %store the current dir for future backward action
@@ -225 +230 @@
     end
     hcheck_date=findobj(hfig,'tag','check_date');
+    
     ListFiles=list_files(FullSelectName,get(hcheck_date,'Value'),sort_option);% list the directory content
     set(hObject,'Value',1)
     set(hObject,'String',ListFiles)
+    set(hObject,'BackgroundColor',[0.7 0.7 0.7])
     set(htitlebox,'String',FullSelectName)% record the new dir name
 elseif exist(FullSelectName,'file')%visualise the field if it exists
@@ -288 +295 @@
 DirName=pwd;
 hfig=get(hObject,'parent');
+hlist=findobj(hfig,'tag','list');% find the list object
+set(hlist,'BackgroundColor',[1 1 0])
+drawnow
 sort_option='name';%default
 hsort_option=findobj(hfig,'tag','sort_option');
@@ -297 +307 @@
 htitlebox=findobj(hfig,'Tag','titlebox');
 set(htitlebox,'String',DirName)% record the new dir name
-hlist=findobj(hfig,'tag','list');% find the list object
+set(hlist,'Value',1)
 set(hlist,'String',ListFiles)
+set(hlist,'BackgroundColor',[0.7 0.7 0.7])
 %------------------------------------------------------------------------