Skip to content

Commit 6bcc479

Browse files
committed
mrisReadAsciiCurvatureFile()/MRISreadVTK()
optional arguments to save curvature data given MRI
1 parent 6dd5d12 commit 6bcc479

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

include/mrisurf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,9 +657,9 @@ int MRISreadCurvatureIntoArray(const char *fname,
657657
int MRISreadFloatFile(MRI_SURFACE *mris,const char *fname) ;
658658
#define MRISreadCurvature MRISreadCurvatureFile
659659

660-
int mrisReadAsciiCurvatureFile(MRI_SURFACE *mris, const char *fname);
660+
int mrisReadAsciiCurvatureFile(MRI_SURFACE *mris, const char *fname, MRI *outmri=NULL, int nframe=0);
661661
int mrisWriteAsciiCurvatureFile(MRI_SURFACE *mris, char *fname);
662-
MRI_SURFACE *MRISreadVTK(MRI_SURFACE *mris, const char *fname);
662+
MRI_SURFACE *MRISreadVTK(MRI_SURFACE *mris, const char *fname, MRI *outmri=NULL, int nframe=0);
663663

664664
MRI *MRISloadSurfVals(const char *srcvalfile,
665665
const char *typestring,

utils/mrisurf_io.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,7 +2819,7 @@ int MRISwriteCurvVTK(MRI_SURFACE *mris, const char *fname)
28192819
28202820
Description
28212821
------------------------------------------------------*/
2822-
MRI_SURFACE *MRISreadVTK(MRI_SURFACE *mris, const char *fname)
2822+
MRI_SURFACE *MRISreadVTK(MRI_SURFACE *mris, const char *fname, MRI *outmri, int nframe)
28232823
{
28242824
char line[STRLEN], *cp = NULL;
28252825

@@ -3061,6 +3061,10 @@ MRI_SURFACE *MRISreadVTK(MRI_SURFACE *mris, const char *fname)
30613061
if (fscanf(fp, "%f", &f)) {
30623062
v->curv = f; // fill-in both curvature and scalar data fields
30633063
v->val = f;
3064+
3065+
if (outmri != NULL)
3066+
MRIsetVoxVal(outmri, vno, 0, 0, nframe, f);
3067+
30643068
if (isCurvData) {
30653069
// printf("%f\n",v->curv);
30663070
if (vno == 0) {
@@ -4928,7 +4932,7 @@ int MRISreadBinaryCurvature(MRI_SURFACE *mris, const char *mris_fname)
49284932
49294933
Description
49304934
------------------------------------------------------*/
4931-
int mrisReadAsciiCurvatureFile(MRI_SURFACE *mris, const char *fname)
4935+
int mrisReadAsciiCurvatureFile(MRI_SURFACE *mris, const char *fname, MRI *outmri, int nframe)
49324936
{
49334937
FILE *fp;
49344938
int vno;
@@ -4958,6 +4962,9 @@ int mrisReadAsciiCurvatureFile(MRI_SURFACE *mris, const char *fname)
49584962
"could not scan curvature from line '%s'",
49594963
fname,
49604964
line));
4965+
4966+
if (outmri != NULL)
4967+
MRIsetVoxVal(outmri, vno, 0, 0, nframe, v->curv);
49614968
}
49624969

49634970
fclose(fp);

0 commit comments

Comments
 (0)