diff --git a/fslselectvols.cc b/fslselectvols.cc index 2d1a59773932eb1e83189dba899ab2a612a020a8..caa174241686b4f839d7534b500a1140225dcc46 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; }