Changeset 260

Timestamp:

Jul 9, 2011, 10:10:25 PM (13 years ago)

Author:

sommeria

Message:

bug repaired for civ : case of relative civ function paths

File:

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

trunk/src/civ.m

@@ -1591 +1591 @@
         if isfield(sparam,'CivBin')
             CivBin=sparam.CivBin;
-            if ~exist(CivBin,'file') || ~isempty(which(CivBin))% if path defined as relative to uvmat
+            if ~exist(CivBin,'file') || isempty(which(CivBin))% if path defined as relative to uvmat
                 sparam.CivBin=fullfile(path_UVMAT,CivBin);
                 if ~exist(sparam.CivBin,'file')
@@ -1602 +1602 @@
         if isfield(sparam,'Civ1Bin')
             Civ1Bin=sparam.Civ1Bin;
-            if ~exist(Civ1Bin,'file')||~isempty(which(Civ1Bin))% if path defined as relative to uvmat
+            if ~exist(Civ1Bin,'file')||isempty(which(Civ1Bin))% if path defined as relative to uvmat
                 sparam.Civ1Bin=fullfile(path_UVMAT,Civ1Bin);
                 if ~exist(sparam.Civ1Bin,'file')
@@ -1612 +1612 @@
         if isfield(sparam,'Civ2Bin')
             Civ2Bin=sparam.Civ2Bin;
-            if ~exist(Civ2Bin,'file')||~isempty(which(Civ2Bin))% if path defined as relative to uvmat
+            if ~exist(Civ2Bin,'file')||isempty(which(Civ2Bin))% if path defined as relative to uvmat
                 sparam.Civ2Bin=fullfile(path_UVMAT,Civ2Bin);
                 if ~exist(sparam.Civ2Bin,'file')
@@ -1621 +1621 @@
         end
         if  isfield(sparam,'PatchBin')
-            if ~exist(sparam.PatchBin,'file')||~isempty(which(sparam.PatchBin))% if path defined as relative to uvmat
+            if ~exist(sparam.PatchBin,'file')||isempty(which(sparam.PatchBin))% if path defined as relative to uvmat
                 sparam.PatchBin=fullfile(path_UVMAT,sparam.PatchBin);
             end
         end
         if isfield(sparam,'FixBin')
-            if ~exist(sparam.FixBin,'file')||~isempty(which(sparam.FixBin))% if path defined as relative to uvmat
+            if ~exist(sparam.FixBin,'file')||isempty(which(sparam.FixBin))% if path defined as relative to uvmat
                 sparam.FixBin=fullfile(path_UVMAT,sparam.FixBin);
             end