Changeset 705 for trunk

Timestamp:

Feb 12, 2014, 12:02:04 AM (10 years ago)

Author:

sommeria

Message:

several bugs repaired

Location:

trunk/src

Files:

• check_files.m (modified) (2 diffs)
• series.m (modified) (7 diffs)
• set_object.fig (modified) (previous)
• set_object.m (modified) (4 diffs)

trunk/src/check_files.m

@@ -160 +160 @@
 %% check svn status
 [status,result]=system('svn --help');
-if status==0
+if status==0 % if a svn line command is available
     svn_info.rep_rev=0;svn_info.cur_rev=0;
-    [tild,result]=system(['svn info ' dir_fct]);
-    t=regexp(result,'R.vision\s*:\s*(?<rev>\d+)','names');
+    [tild,result]=system(['svn info ' dir_fct]); %get info fromn the svn server
+    t=regexp(result,'R.vision\s*:\s*(?<rev>\d+)','names');%detect 'révision' or 'Revision' in the text
     if ~isempty(t)
-        svn_info.cur_rev=str2double(t.rev);
+        svn_info.cur_rev=str2double(t.rev); %version nbre of the current package
     end
     [tild,result]=system(['svn info -r ''HEAD'' '  pathuvmat]);
     t=regexp(result,'R.vision\s*:\s*(?<rev>\d+)','names');
     if ~isempty(t)
-        svn_info.rep_rev=str2double(t.rev);
+        svn_info.rep_rev=str2double(t.rev); % version nbre available on the svn repository
     end
     [tild,result]=system(['svn status '  pathuvmat]);
     svn_info.status=result;
-    checkmsg =[checkmsg {['SVN revision : ' num2str(svn_info.cur_rev)]}];
-    if svn_info.rep_rev>svn_info.cur_rev
+    checkmsg =[checkmsg {['SVN revision : ' num2str(svn_info.cur_rev)]}];%display version nbre of the current uvmat package
+    if svn_info.rep_rev>svn_info.cur_rev %if the repository has a more advanced version than the uvmat package, warning msge
         checkmsg =[checkmsg ...
             {['Repository now at revision ' num2str(svn_info.rep_rev) '. Please type svn update in uvmat folder']}];
     end
-    modifications=regexp(svn_info.status,'M\s[^(\n|\>)]+','match');
+    modifications=regexp(svn_info.status,'M\s[^(\n|\>)]+','match');% detect the files modified compared to the repository
     if ~isempty(modifications)
         for ilist=1:numel(modifications)
@@ -186 +186 @@
         end
     end
-else
+else % no svn line command available
     checkmsg=[checkmsg {'SVN not available'}];
 end

trunk/src/series.m

@@ -1424 +1424 @@
 %% settings of the button RUN
 set(handles.RUN,'BusyAction','queue');% activation of STOP button will set BusyAction to 'cancel'
-%set(0,'CurrentFigure',handles.series); % display the GUI series
 set(handles.RUN, 'Enable','Off')% avoid further RUN action until the current one is finished
 set(handles.RUN,'BackgroundColor',[1 1 0])%show activation of RUN by yellow color
@@ -1875 +1874 @@
 function ActionName_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+
 %% stop any ongoing series processing
 if isequal(get(handles.RUN,'Value'),1)
@@ -2187 +2187 @@
 %% Expected nbre of output files
 if isfield(ParamOut,'OutputFileMode')
-StatusData.OutputFileMode=ParamOut.OutputFileMode;
-set(handles.status,'UserData',StatusData)
+    StatusData.OutputFileMode=ParamOut.OutputFileMode;
+    set(handles.status,'UserData',StatusData)
 end
 
@@ -2216 +2216 @@
 %------------------------------------------------------------------------
 if get(handles.ActionInputView,'Value')
-ActionName_Callback(hObject, eventdata, handles)
+    ActionName_Callback(hObject, eventdata, handles)
 end
 
@@ -2652 +2652 @@
 
 InputTable=get(handles.InputTable,'Data');
-filexml=uigetfile_uvmat('pick a xml parameter file',InputTable{1,1},'.xml');
+filexml=uigetfile_uvmat('pick a xml parameter file',InputTable{1,1},'.xml');% get the xml file containing processing parameters
 if ~isempty(filexml)%abandon if no file is introduced by the browser
     Param=xml2struct(filexml);
-    fill_GUI(Param,handles.series)
+    % stop current Action if button RUN has been activated
+    if isequal(get(handles.RUN,'Value'),1)
+        answer= msgbox_uvmat('INPUT_Y-N','stop current Action process?');
+        if strcmp(answer,'Yes')
+            STOP_Callback(hObject, eventdata, handles)
+        else
+            return
+        end
+    end
+    Param.Action.RUN=0; %deactivate the RUN button
+    fill_GUI(Param,handles.series)% fill the elements of the GUI series with the input parameters
     REFRESH_Callback([],[],handles)% refresh data relative to the input files
     SeriesData=get(handles.series,'UserData');
-    if isfield(Param,'ActionInput')
+    if isfield(Param,'ActionInput')%  introduce  parameters specific to an Action fct, for instance PIV parameters
         set(handles.ActionInput,'Visible','on')
         set(handles.ActionInput_title,'Visible','on')
@@ -2665 +2675 @@
         SeriesData.ActionInput=Param.ActionInput;
     end
-    if isfield(Param,'ProjObject')
+    if isfield(Param,'ProjObject') %introduce projection object if relevant
         SeriesData.ProjObject=Param.ProjObject;
     end
     set(handles.series,'UserData',SeriesData)
-    ActionName_Callback([],[],handles)
+    %ActionName_Callback([],[],handles)
 end
 
@@ -2724 +2734 @@
     set(handles.status,'BackgroundColor',[1 1 0])
     drawnow
-    %StatusData.time_ref=get(handles.RUN,'UserData');% get the time of launch
     Param=read_GUI(handles.series);
     RootPath=Param.InputTable{1,1};

trunk/src/set_object.m

@@ -36 +36 @@
 function varargout = set_object(varargin)
 
-% Last Modified by GUIDE v2.5 02-Sep-2013 11:39:56
+% Last Modified by GUIDE v2.5 11-Feb-2014 20:08:17
 
 % Begin initialization code - DO NOT REFRESH
@@ -82 +82 @@
 set(0,'Unit','pixels')
 ScreenSize=get(0,'ScreenSize');% get the size of the screen, to put the fig on the upper right
-Width=300;% fig width in pixels 
-Height=600;
+PosGUI=get(handles.set_object,'Position');% fig width in pixels 
+Width=PosGUI(3);%width of the gui set_object in pixels
+Height=PosGUI(4);
 Left=ScreenSize(3)- Width-40; %right edge close to the right, with margin=40 
 Bottom=ScreenSize(4)-Height-40; %put fig at top right
@@ -650 +651 @@
         def=[Object.Style '.xml'];
     end
-    displ_txt={'save object as an .xml file in';dir_save};%default display
+    displ_txt={['save object in' dir_save]; 'with file name (.xml):'};%default display
     menu=get(handles.ProjMode,'String');
     value=get(handles.ProjMode,'Value');
     ProjMode=menu{value};
     if strcmp(ProjMode,'mask_inside')||strcmp(ProjMode,'mask_outside')
-        displ_txt={'save mask contour as an .xml file:'; 'to create a mask image, use save_mask on the GUI uvmat (lower right)'};
+        displ_txt={displ_txt; '(to create a mask image, use save_mask on the GUI uvmat upper menu)'};
     end
     answer=msgbox_uvmat('INPUT_TXT',displ_txt,def);
-    if iscell(answer)
-        FullName=fullfile(dir_save,answer{1});
+    if ischar(answer)
+        FullName=fullfile(dir_save,answer);
         t=struct2xml(Object);
         t=set(t,1,'name','ProjObject');
@@ -784 +785 @@
     set(handles.Coord,'Data',Coord);
 end
-
-
-