Changeset 280 for trunk

Timestamp:

Nov 18, 2011, 2:19:06 PM (12 years ago)

Author:

gostiaux

Message:

introduced dummy variables for multiple handles for the same tag... is it the solution ?

File:

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

trunk/src/civ.m

@@ -1619 +1619 @@
     CivMode='CivX';
 end
+binary_list={};
 switch CivMode
-     case {'CivX','CivAll'}      
-         for bin_name={'Civ1Bin','Civ2Bin','PatchBin','FixBin','CivBin'}
-             if isfield(param.global,bin_name{1})
-                 if ~exist(param.global.(bin_name{1}),'file')%look for the full path if the file name has been defined with a relative path in PARAM.xml
-                     fullname=fullfile(path_civ,param.global.(bin_name{1}));
-                     if exist(fullname,'file')
-                         param.global.(bin_name{1})=fullname;
-                     else
-                         msgbox_uvmat('ERROR',['Binary ' param.global.(bin_name{1}) ' defined in PARAM.xm does not exist'])
-                         return
-                     end
-                 else
-                     [path,name,ext]=fileparts(param.global.(bin_name{1}));
-                     currentdir=pwd;
-                     cd(path);
-                     binpath=pwd;%path of the binary
-                     param.global.(bin_name{1})=fullfile(binpath,[name ext]);
-%                      display(param.global.(bin_name{1}));
-                     cd(currentdir);
-                 end
-                 
-             end
-         end
+    case 'CivX'
+        binary_list={'Civ1Bin','Civ2Bin','PatchBin','FixBin'};
+    case 'CivAll'
+        binary_list={'Civ'}
     case 'Matlab'
         if batch
@@ -1648 +1630 @@
             % difficile a faire a priori
         end          
+end
+for bin_name=binary_list
+    if isfield(param.global,bin_name{1})
+        if ~exist(param.global.(bin_name{1}),'file')%look for the full path if the file name has been defined with a relative path in PARAM.xml
+            fullname=fullfile(path_civ,param.global.(bin_name{1}));
+            if exist(fullname,'file')
+                param.global.(bin_name{1})=fullname;
+            else
+                msgbox_uvmat('ERROR',['Binary ' param.global.(bin_name{1}) ' defined in PARAM.xml does not exist'])
+                return
+            end
+        else
+            [path,name,ext]=fileparts(param.global.(bin_name{1}));
+            currentdir=pwd;
+            cd(path);
+            binpath=pwd;%path of the binary
+            param.global.(bin_name{1})=fullfile(binpath,[name ext]);
+            %                      display(param.global.(bin_name{1}));
+            cd(currentdir);
+        end
+        
+    end
 end
 
@@ -1744 +1748 @@
             
             % read mask parameters
-            if get(handles.check_Mask,'Value')
+            dummy=get(handles.check_Mask,'Value');
+            if dummy{1}
                 maskdispl=get(handles.txt_MaskName,'String');
                 if exist(maskdispl,'file')
@@ -1767 +1772 @@
             
             % read grid parameters
-            if get(handles.check_Grid,'Value')
+            dummy=get(handles.check_Grid,'Value');
+            if dummy{1}
                 param.civ1.gridflag='y';
                 gridname=get(handles.txt_GridName,'String');
@@ -4317 +4323 @@
     par.rho=par.rho{index};
 end
-par.dx=get(handles.num_Dx,'String');
-par.dy=get(handles.num_Dy,'String');
+dummy=get(handles.num_Dx,'String');
+par.dx=dummy{1};
+dummy=get(handles.num_Dy,'String');
+par.dy=dummy{1};
 if isnan(str2double(par.dx))
     if isempty(get(handles.txt_GridName,'String'));
@@ -4347 +4355 @@
 % end
 %time=get(handles.RootName,'UserData'); %get the set of times
-par.gridname=get(handles.txt_GridName,'String');
+dummy=get(handles.txt_GridName,'String');
+par.gridname=dummy{1};
 par.gridflag='y';
 if strcmp(par.gridname,'')|| isempty(par.gridname)