Changeset 500 for trunk/src/civ.m

Timestamp:

Jul 24, 2012, 7:58:33 PM (12 years ago)

Author:

sommeria

Message:

various bug corrections

File:

• trunk/src/civ.m (modified) (10 diffs)

trunk/src/civ.m

@@ -24 +24 @@
 %TODO: search range
 
-% Last Modified by GUIDE v2.5 18-Jul-2012 23:20:12
+% Last Modified by GUIDE v2.5 24-Jul-2012 13:14:00
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -59 +59 @@
 addpath (path_civ) ; %add the path to civ, (useful in case of change of working directory after civ has been s opened in the working directory)
 errormsg=[];%default error message
-xmlfile='PARAM.xml';
+xmlfile=fullfile(path_civ,'PARAM.xml');
 test_batch=0;%default: ,no batch mode available
 sparam=[];
+if ~exist(xmlfile,'file')
+    [success,message]=copyfile(fullfile(path_civ,'PARAM.xml.default'),xmlfile)
+end
 if exist(xmlfile,'file')
     try
@@ -71 +74 @@
     end
 else
-    %errormsg=[xmlfile ' not found: path to civx binaries undefined'];
     [s,w]=system('oarstat');
     if ~isequal(s,0)
@@ -90 +92 @@
     end
     if ~isempty(test_command)
-    [s,w]=system(test_command);
-    if isequal(s,0)
-        test_batch=1;
-    end
+        [s,w]=system(test_command);
+        if isequal(s,0)
+            test_batch=1;
+        end
     end
 end
@@ -360 +362 @@
     % settings for  new civ data,
     if strcmp(Data.Conventions,'uvmat/civdata')% case of new civ data,
-        set(handles.Program,'Value',2) %select civ/Matlab by default
+        set(handles.Program,'Value',1) %select civ/Matlab by default
         Program_Callback([],[], handles)
         if ~isempty(Data.CivStage)%test for civ files
@@ -376 +378 @@
         % settings for civx data,
     elseif ~isempty(Data.absolut_time_T0')% case of  civx data,
-        set(handles.Program,'Value',1) %select Cix by default
+        set(handles.Program,'Value',3) %select Cix by default
         Program_Callback([],[], handles)
         if ~isempty(Data.fix2)
@@ -1080 +1082 @@
 %% read the PARAM.xml file to get the binaries (and batch_mode if batch)
 path_civ=fileparts(which('civ')); %path to the source directory of uvmat
-xmlfile='PARAM.xml';
+xmlfile=fullfile(path_civ,'PARAM.xml');
 s=[];
 if exist(xmlfile,'file')% search parameter xml file in the whole matlab path
@@ -1152 +1154 @@
             else
                 errormsg=['path ' path ' for binaries defined in PARAM.xml does not exist'];
-                return
-            end
-            
+            end          
         else  %look for the full path if the file name has been defined with a relative path in PARAM.xm
             fullname=fullfile(path_civ,Param.xml.(bin_name{1}));
@@ -1161 +1161 @@
             else
                 errormsg=['Binary ' Param.xml.(bin_name{1}) ' defined in PARAM.xml does not exist'];
-                return
-            end
-        end
-    end
+            end
+        end
+    end
+end
+if ~isempty(errormsg)
+    if strcmp(Param.Program,'civ_matlab.sh')
+        errormsg=[{errormsg}; {'run compile_functions.m to create it by compiling civ_matlab.m'}];
+    end
+    return
 end
 
@@ -4561 +4566 @@
 
 function last_i_Callback(hObject, eventdata, handles)
-