From 140a19cab8c93a2af817b9390272810978f1fead Mon Sep 17 00:00:00 2001
From: Saad Jbabdi <saad@fmrib.ox.ac.uk>
Date: Fri, 1 Dec 2006 10:55:42 +0000
Subject: [PATCH] Added network option, seed can be a list of rois
---
probtrackx.cc | 8 ++++++--
probtrackx.h | 1 +
ptx_simple.cc | 4 ++--
streamlines.cc | 15 ++++++++++++---
streamlines.h | 1 +
5 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/probtrackx.cc b/probtrackx.cc
index 7a4b575..9509545 100644
--- a/probtrackx.cc
+++ b/probtrackx.cc
@@ -35,8 +35,12 @@ int main ( int argc, char **argv ){
if(opts.mode.value()=="simple")
track();
string tmpin=opts.seedfile.value();
- if(fsl_imageexists(opts.mask2.value())){ twomasks();}
- else if(fsl_imageexists(opts.seedfile.value())){ seedmask();}
+ if(fsl_imageexists(opts.seedfile.value())){
+ if(fsl_imageexists(opts.mask2.value())){ twomasks();}
+ else{ seedmask(); }
+ }
+ else{ nmasks(); }
+
//else if(fopen(tmpin.c_str(),"r")!=NULL ){ track();}
// else if(opts.mode.value()=="seeds_to_targets")
diff --git a/probtrackx.h b/probtrackx.h
index 2f52f3e..8610f9f 100644
--- a/probtrackx.h
+++ b/probtrackx.h
@@ -7,3 +7,4 @@
#include "ptx_simple.h"
#include "ptx_seedmask.h"
#include "ptx_twomasks.h"
+#include "ptx_nmasks.h"
diff --git a/ptx_simple.cc b/ptx_simple.cc
index d1406a0..a0cb0b5 100644
--- a/ptx_simple.cc
+++ b/ptx_simple.cc
@@ -34,8 +34,8 @@ void track(){
Counter counter(seedref,stline);
counter.initialise();
Seedmanager seedmanager(counter);
-
-
+
+
Matrix Seeds = read_ascii_matrix(opts.seedfile.value());
for(int SN=1; SN<=Seeds.Nrows();SN++){
float xst=Seeds(SN,1);
diff --git a/streamlines.cc b/streamlines.cc
index fb42395..5a4c6d6 100644
--- a/streamlines.cc
+++ b/streamlines.cc
@@ -195,11 +195,20 @@ namespace TRACT{
if(opts.loopcheck.value()){
m_loopcheck=0;
}
+
bool accept_path=true;
if(m_passed_flags.size()!=0){
- for(unsigned int i=0; i<m_passed_flags.size();i++)
- if(!m_passed_flags[i])
- accept_path=false;
+ if(opts.waypoints_and.value()){
+ for(unsigned int i=0; i<m_passed_flags.size();i++)
+ if(!m_passed_flags[i])
+ accept_path=false;
+ }
+ else{
+ accept_path=false;
+ for(unsigned int i=0; i<m_passed_flags.size();i++)
+ if(m_passed_flags[i])
+ accept_path=true;
+ }
}
if(rubbish_passed)
accept_path=false;
diff --git a/streamlines.h b/streamlines.h
index b09fc3b..af95f0a 100644
--- a/streamlines.h
+++ b/streamlines.h
@@ -28,6 +28,7 @@ namespace TRACT{
volume<int> m_mask;
volume<int> m_skipmask;
volume<int> m_rubbish;
+ volume<int> m_stop;
volume4D<float> m_loopcheck;
vector<volume<int>* > m_waymasks;
vector<bool> m_passed_flags;
--
GitLab