Changeset 714 for trunk/src/uvmat.m

Timestamp:

Feb 22, 2014, 5:11:04 PM (11 years ago)

Author:

sommeria

Message:

various improvements

File:

• trunk/src/uvmat.m (modified) (14 diffs)

trunk/src/uvmat.m

@@ -474 +474 @@
 %------------------------------------------------------------------------
 fileinput=get(hObject,'Label');
-    set(handles.SubField,'Value',0)
-    desable_subfield(handles)
-display_file_name( handles,fileinput)
-
+set(handles.SubField,'Value',0)
+desable_subfield(handles)
+errormsg=display_file_name( handles,fileinput);
+if ~isempty(errormsg)
+    set(hObject,'Label','')
+    MenuFile=[{get(handles.MenuFile_1,'Label')};{get(handles.MenuFile_2,'Label')};...
+        {get(handles.MenuFile_3,'Label')};{get(handles.MenuFile_4,'Label')};{get(handles.MenuFile_5,'Label')}];
+    str_find=strcmp(get(hObject,'Label'),MenuFile);
+    MenuFile(str_find)=[];% suppress the input file to the list
+    for ifile=1:numel(MenuFile)
+        set(handles.(['MenuFile_' num2str(ifile)]),'Label',MenuFile{ifile});
+    end
+end
 
 % -----------------------------------------------------------------------
@@ -616 +625 @@
 %------------------------------------------------------------------------   
 set(handles.InputFileREFRESH,'BackgroundColor',[1 1 0])% set button color to yellow to indicate that refresh is under action
+set(handles.uvmat,'Pointer','watch') % set the mouse pointer to 'watch'
+drawnow
 % read the current input file name:
 [RootPath,SubDir,RootFile,FileIndices,FileExt]=read_file_boxes(handles);
@@ -640 +651 @@
 
 if isempty(errormsg)
-set(handles.InputFileREFRESH,'BackgroundColor',[1 0 0])% set button color to red to indicate that refresh has been updated
+% set(handles.InputFileREFRESH,'BackgroundColor',[1 0 0])% set button color to red to indicate that refresh has been updated
 else
     set(handles.InputFileREFRESH,'BackgroundColor',[1 0 1])% keep button color magenta, input not succesfull
 end
+set(handles.uvmat,'Pointer','arrow')% set back the mouse pointer to arrow
 
 %------------------------------------------------------------------------ 
 % --- Fills the edit boxes RootPath, RootFile,NomType...from an input file name 'fileinput'
-function display_file_name(handles,fileinput,index)
+function errormsg=display_file_name(handles,fileinput,index)
 %------------------------------------------------------------------------
 %% look for the input file existence
+errormsg='';%default
 if ~exist(fileinput,'file')
-    msgbox_uvmat('ERROR',['input file ' fileinput  ' does not exist'])
+    errormsg=['input file ' fileinput  ' does not exist'];
+    msgbox_uvmat('ERROR',errormsg)
     return
 end
@@ -917 +931 @@
 NbSlice=1;%default
 ImaDoc_str='';
-set(handles.InputFileREFRESH,'BackgroundColor',[1 1 0])
 if ~isempty(XmlFileName)
     set(handles.view_xml,'Visible','on')
@@ -1148 +1161 @@
 set(handles.j2,'Visible',state_j)
 set(handles.MaxIndex_j,'Visible',state_j);
-%set(handles.frame_j,'Visible',state_j);
 set(handles.j_text,'Visible',state_j);
 if ~isempty(i2_series)||~isempty(j2_series)
@@ -1161 +1173 @@
     set(handles.TransformName,'value',2); % set transform to sub_field if the current fct doe not accept two input fields
 end
-TransformName_Callback([],[],handles)
+set(handles.InputFileREFRESH,'BackgroundColor',[1 0 0])% set button color to red to indicate that refresh has been updated
+TransformName_Callback([],[],handles)% callback for the selection of transform function, then refresh the current plot
 mask_test=get(handles.CheckMask,'value');
 if mask_test
@@ -2016 +2029 @@
 if ~isempty(errormsg)
       msgbox_uvmat('ERROR',errormsg);
+      set(handles.InputFileREFRESH,'BackgroundColor',[1 0 1])% keep button color magenta, input not succesfull
 else
     set(handles.i1,'BackgroundColor',[1 1 1])
@@ -2023 +2037 @@
     set(handles.FileIndex,'BackgroundColor',[1 1 1])
     set(handles.FileIndex_1,'BackgroundColor',[1 1 1])  
-    set(handles.REFRESH,'BackgroundColor',[1 0 0])
+    set(handles.REFRESH,'BackgroundColor',[1 0 0])% set button color to red, update successfull
 end    
 
@@ -2040 +2054 @@
 
 %% initialisation
+pointer=get(handles.uvmat,'Pointer');
+set(handles.uvmat,'Pointer','watch')
+drawnow
 if ~exist('Field','var')
     Field={};
@@ -2740 +2757 @@
 end
 ResizeFcn(handles.uvmat,[],handles)
+set(handles.uvmat,'Pointer',pointer)
 
 %------------------------------------------------------------------------
@@ -3579 +3597 @@
     set(handles.CheckEditObject,'Value',0)
     set(handles.CheckZoom,'Value',0)
-%     set(handles.CheckZoom,'BackgroundColor',[0.7 0.7 0.7])
-%     set(handles.CheckEditObject,'BackgroundColor',[0.7 0.7 0.7])
     set(gcf,'Pointer','arrow')
 else
@@ -3680 +3696 @@
 function TransformName_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+set(handles.TransformName,'backgroundColor',[1 1 0])% indicate activation  of the menu
+drawnow
 UvData=get(handles.uvmat,'UserData');
 menu=get(handles.TransformName,'String');%refresh
@@ -3751 +3769 @@
         [fid,errormsg] =fopen([fullfile(list_path{ichoice},transform_name) '.m']);
         InputText=textscan(fid,'%s',1,'delimiter','\n');
-        fclose(fid)
+        fclose(fid);
         set(handles.TransformName,'ToolTipString',['transform_fct: ' InputText{1}{1}])% put the first line of the selected function as tooltip help
     end
@@ -3818 +3836 @@
 end
 set(handles.uvmat,'UserData',UvData)
+set(handles.TransformName,'backgroundColor',[1 1 1])% indicate desactivation  of the menu
+drawnow
 
 %% inputfilerefresh the current plot