Changeset 746 for trunk/src

Timestamp:

Apr 20, 2014, 6:19:08 PM (11 years ago)

Author:

sommeria

Message:

 

Location:

trunk/src

Files:

• compile.m (modified) (2 diffs)
• msgbox_uvmat.m (modified) (4 diffs)
• series/merge_proj.m (modified) (2 diffs)

trunk/src/compile.m

@@ -8 +8 @@
 function compile (FctName,SubfctPath)
 if isempty(which('mcc'))
-    msgbox_uvmat('no Matlab compiler toolbox mcc installed')
+    msgbox_uvmat('ERROR','no Matlab compiler toolbox mcc installed')
     return
+else
+    hh=msgbox_uvmat('INFO',['compilation of ' FctName ' in progress...']);
 end
 disp(['compiling ' FctName ' ...'])
@@ -23 +25 @@
 end
 disp(['mcc -m -R -nojvm -R -nodisplay ' SubfctPath ' ' FctName '.m'])
-eval(['mcc -m -R -nojvm -R -nodisplay ' SubfctPath ' ' FctName '.m'])% compile the source file [FctName .m], which produces a binary file FctName and a cmd file [run_' FctName '.sh]
-%eval(['mcc -m -R -nojvm -R -nodisplay ' FctName '.m'])% compile the source file [FctName .m], which produces a binary file FctName and a cmd file [run_' FctName 
-system(['mv -f ' FctName ' bin/']);%move the binary file FctName to the subdir /bin
-system(['sed -e ''''s#/' FctName '#/bin/' FctName '#'''' run_' FctName '.sh > ' FctName '.sh']);%modify the cmd file and copy it to [FctName '.sh']
-system(['rm run_' FctName '.sh']);% remove the initial cmd file [run_' FctName '.sh]
-system(['chmod +x ' FctName '.sh']); % set the cmd file to 'executable'
+try
+    eval(['mcc -m -R -nojvm -R -nodisplay ' SubfctPath ' ' FctName '.m'])% compile the source file [FctName .m], which produces a binary file FctName and a cmd file [run_' FctName '.sh]
+    system(['mv -f ' FctName ' bin/']);%move the binary file FctName to the subdir /bin
+    system(['sed -e ''''s#/' FctName '#/bin/' FctName '#'''' run_' FctName '.sh > ' FctName '.sh']);%modify the cmd file and copy it to [FctName '.sh']
+    system(['rm run_' FctName '.sh']);% remove the initial cmd file [run_' FctName '.sh]
+    system(['chmod +x ' FctName '.sh']); % set the cmd file to 'executable'
+catch ME
+    msgbox_uvmat('ERROR',ME.message);
+end
 display('** END **')
-end
+delete(hh)
 
 

trunk/src/msgbox_uvmat.m

@@ -69 +69 @@
 testNo=0;
 testCancel=0;
+testOK=1;
 testinputstring=0;
 icontype='quest';%default question icon (text input asked)
@@ -96 +97 @@
             testinputstring=2;
             testCancel=1; %no cancel button
+        case 'INFO'
+            icontype='';
+            testOK=0;
         otherwise
           %  testinputstring=1;
@@ -172 +176 @@
 set(handles.figure1,'Units','normalized')
 set(handles.edit_box,'Units','normalized')
-
+if testOK
 set(handles.figure1,'WindowStyle','modal')% Make% Make the GUI modal 
+set(handles.OK,'Visible','on')
 % UIWAIT makes msgbox_uvmat wait for user response (see UIRESUME)
 uiwait(handles.figure1);
+else
+   set(handles.OK,'Visible','off') 
+end
+
 
 %------------------------------------------------------------------------
@@ -202 +211 @@
     end
     % The figure can be deleted now
+    if strcmp(get(handles.OK,'Visible'),'on')
     delete(handles.figure1);
+    else %case of INFO display (non modal)
+        varargout{1}=hObject;
+    end
 end
 

trunk/src/series/merge_proj.m

@@ -227 +227 @@
         [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},Param.InputFields,frame_index{iview}(index));
         if ~isempty(errormsg)
-            disp_uvmat(['ERROR in merge_proj/read_field/' errormsg],checkrun)
+            disp_uvmat('ERROR',['ERROR in merge_proj/read_field/' errormsg],checkrun)
             return
         end
@@ -255 +255 @@
             [Data{iview},errormsg]=proj_field(Data{iview},Param.ProjObject);
             if ~isempty(errormsg)
-                disp_uvmat(['ERROR in merge_proge/proj_field: ' errormsg],checkrun)
+                disp_uvmat('ERROR',['ERROR in merge_proge/proj_field: ' errormsg],checkrun)
                 return
             end