From 7daf447ab06f3e6588d4aa038cc108c88e7d5f25 Mon Sep 17 00:00:00 2001
From: Matthew Webster <mwebster@fmrib.ox.ac.uk>
Date: Thu, 1 Dec 2016 17:02:51 +0000
Subject: [PATCH] Fixed SJ bug
---
fslselectvols.cc | 33 +++++++++------------------------
1 file changed, 9 insertions(+), 24 deletions(-)
diff --git a/fslselectvols.cc b/fslselectvols.cc
index 2d1a597..caa1742 100644
--- a/fslselectvols.cc
+++ b/fslselectvols.cc
@@ -50,33 +50,18 @@ bool file_exists (const std::string& name) {
}
int get_vols(Matrix& id_vols,const string& vols){
- vector<int> comps;
if(file_exists(vols)){
id_vols = read_ascii_matrix(vols);
- if(id_vols.Ncols()==1){id_vols=id_vols.t();}
-
- //comps.resize(id_vols.Ncols());
- //for(int i=0;i<(int)comps.size();i++){
- // comps[i]=id_vols(1,i+1);
- //}
- }
- else{
- if(vols.length()>0 && parse_filterstring(comps,vols)){
- return 1;
- }
+ if(id_vols.Ncols()==1)
+ id_vols=id_vols.t();
+ } else {
+ vector<int> comps;
+ if(vols.length()>0 && parse_filterstring(comps,vols))
+ return 1;
+ id_vols.ReSize(1,comps.size());
+ for(int i=0;i<(int)comps.size();i++)
+ id_vols(1,i+1)=comps[i];
}
-
- //sort and remove duplicates
- //sort (comps.begin(), comps.end());
- //vector<int>::iterator it = unique (comps.begin(), comps.end());
- //comps.resize( it - comps.begin() );
-
- //id_vols.ReSize(1,comps.size());
- //for(int i=0;i<(int)comps.size();i++){
- // id_vols(1,i+1)=comps[i];
- //}
-
-
return 0;
}
--
GitLab