| Attached Files | ITK_Direction.diff [^] (3,873 bytes) 2009-09-30 08:15 [Show Content] [Hide Content]Index: Code/IO/itkIOCommon.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkIOCommon.h,v
retrieving revision 1.27
diff -u -r1.27 itkIOCommon.h
--- Code/IO/itkIOCommon.h 27 May 2008 11:41:08 -0000 1.27
+++ Code/IO/itkIOCommon.h 29 Sep 2009 10:32:09 -0000
@@ -110,6 +110,7 @@
#endif
extern const char *const ITK_Origin;
extern const char *const ITK_Spacing;
+extern const char *const ITK_Direction;
extern const char *const ITK_FileOriginator;
extern const char *const ITK_OriginationDate;
extern const char *const ITK_PatientID;
Index: Code/IO/itkIOCommon.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkIOCommon.cxx,v
retrieving revision 1.29
diff -u -r1.29 itkIOCommon.cxx
--- Code/IO/itkIOCommon.cxx 5 Apr 2009 10:56:48 -0000 1.29
+++ Code/IO/itkIOCommon.cxx 29 Sep 2009 10:32:09 -0000
@@ -33,6 +33,7 @@
#endif
const char *const ITK_Origin = "ITK_Origin";
const char *const ITK_Spacing = "ITK_Spacing";
+const char *const ITK_Direction = "ITK_Direction";
const char *const ITK_FileOriginator = "ITK_FileOriginator";
const char *const ITK_OriginationDate = "ITK_OriginationDate";
const char *const ITK_PatientID = "ITK_PatientID";
Index: Code/IO/itkImageSeriesWriter.txx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkImageSeriesWriter.txx,v
retrieving revision 1.33
diff -u -r1.33 itkImageSeriesWriter.txx
--- Code/IO/itkImageSeriesWriter.txx 11 May 2009 19:26:54 -0000 1.33
+++ Code/IO/itkImageSeriesWriter.txx 29 Sep 2009 10:32:09 -0000
@@ -362,6 +362,17 @@
EncapsulateMetaData< DoubleArrayType >( dictionary, ITK_Spacing, spacingArray );
EncapsulateMetaData< unsigned int >( dictionary, ITK_NumberOfDimensions, inputImageDimension );
+ typename InputImageType::DirectionType direction2 = inputImage->GetDirection();
+ typedef Matrix< double, inputImageDimension, inputImageDimension> DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ for( unsigned int i = 0; i < inputImageDimension; i++ )
+ {
+ for( unsigned int j = 0; j < inputImageDimension; j++ )
+ {
+ directionMatrix[i][j] = direction2[i][j];
+ }
+ }
+ EncapsulateMetaData< DoubleMatrixType >( dictionary, ITK_Direction, directionMatrix );
}
}
Index: Code/IO/itkGDCMImageIO.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkGDCMImageIO.cxx,v
retrieving revision 1.167
diff -u -r1.167 itkGDCMImageIO.cxx
--- Code/IO/itkGDCMImageIO.cxx 22 Sep 2009 20:00:07 -0000 1.167
+++ Code/IO/itkGDCMImageIO.cxx 29 Sep 2009 10:32:09 -0000
@@ -1418,6 +1418,15 @@
m_Spacing[1] = spacingArray[1];
m_Spacing[2] = spacingArray[2];
}
+ else if( key == ITK_Direction )
+ {
+ typedef Matrix< double > DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ ExposeMetaData< DoubleMatrixType >( dict, key, directionMatrix );
+ for(int i = 0; i<3; i++)
+ for(int j = 0; j<3; j++)
+ m_Direction[i][j]=directionMatrix[i][j];
+ }
else
{
itkDebugMacro(
@@ -1959,6 +1959,15 @@
m_Spacing[1] = spacingArray[1];
m_Spacing[2] = spacingArray[2];
}
+ else if( key == ITK_Direction )
+ {
+ typedef Matrix< double > DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ ExposeMetaData< DoubleMatrixType >( dict, key, directionMatrix );
+ for(int i = 0; i<3; i++)
+ for(int j = 0; j<3; j++)
+ m_Direction[i][j]=directionMatrix[i][j];
+ }
else
{
itkDebugMacro(
ITK_Direction2.diff [^] (3,874 bytes) 2009-09-30 10:41 [Show Content] [Hide Content]Index: Code/IO/itkIOCommon.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkIOCommon.h,v
retrieving revision 1.27
diff -u -r1.27 itkIOCommon.h
--- Code/IO/itkIOCommon.h 27 May 2008 11:41:08 -0000 1.27
+++ Code/IO/itkIOCommon.h 29 Sep 2009 10:32:09 -0000
@@ -110,6 +110,7 @@
#endif
extern const char *const ITK_Origin;
extern const char *const ITK_Spacing;
+extern const char *const ITK_Direction;
extern const char *const ITK_FileOriginator;
extern const char *const ITK_OriginationDate;
extern const char *const ITK_PatientID;
Index: Code/IO/itkIOCommon.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkIOCommon.cxx,v
retrieving revision 1.29
diff -u -r1.29 itkIOCommon.cxx
--- Code/IO/itkIOCommon.cxx 5 Apr 2009 10:56:48 -0000 1.29
+++ Code/IO/itkIOCommon.cxx 29 Sep 2009 10:32:09 -0000
@@ -33,6 +33,7 @@
#endif
const char *const ITK_Origin = "ITK_Origin";
const char *const ITK_Spacing = "ITK_Spacing";
+const char *const ITK_Direction = "ITK_Direction";
const char *const ITK_FileOriginator = "ITK_FileOriginator";
const char *const ITK_OriginationDate = "ITK_OriginationDate";
const char *const ITK_PatientID = "ITK_PatientID";
Index: Code/IO/itkImageSeriesWriter.txx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkImageSeriesWriter.txx,v
retrieving revision 1.33
diff -u -r1.33 itkImageSeriesWriter.txx
--- Code/IO/itkImageSeriesWriter.txx 11 May 2009 19:26:54 -0000 1.33
+++ Code/IO/itkImageSeriesWriter.txx 29 Sep 2009 10:32:09 -0000
@@ -362,6 +362,17 @@
EncapsulateMetaData< DoubleArrayType >( dictionary, ITK_Spacing, spacingArray );
EncapsulateMetaData< unsigned int >( dictionary, ITK_NumberOfDimensions, inputImageDimension );
+ typename InputImageType::DirectionType direction2 = inputImage->GetDirection();
+ typedef Matrix< double, inputImageDimension, inputImageDimension> DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ for( unsigned int i = 0; i < inputImageDimension; i++ )
+ {
+ for( unsigned int j = 0; j < inputImageDimension; j++ )
+ {
+ directionMatrix[i][j] = direction2[i][j];
+ }
+ }
+ EncapsulateMetaData< DoubleMatrixType >( dictionary, ITK_Direction, directionMatrix );
}
}
Index: Code/IO/itkGDCMImageIO.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkGDCMImageIO.cxx,v
retrieving revision 1.167
diff -u -r1.167 itkGDCMImageIO.cxx
--- Code/IO/itkGDCMImageIO.cxx 22 Sep 2009 20:00:07 -0000 1.167
+++ Code/IO/itkGDCMImageIO.cxx 29 Sep 2009 10:32:09 -0000
@@ -1418,6 +1418,15 @@
m_Spacing[1] = spacingArray[1];
m_Spacing[2] = spacingArray[2];
}
+ else if( key == ITK_Direction )
+ {
+ typedef Matrix< double > DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ ExposeMetaData< DoubleMatrixType >( dict, key, directionMatrix );
+ for(int i = 0; i<3; i++)
+ for(int j = 0; j<3; j++)
+ m_Direction[j][i]=directionMatrix[i][j];
+ }
else
{
itkDebugMacro(
@@ -1959,6 +1959,15 @@
m_Spacing[1] = spacingArray[1];
m_Spacing[2] = spacingArray[2];
}
+ else if( key == ITK_Direction )
+ {
+ typedef Matrix< double > DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ ExposeMetaData< DoubleMatrixType >( dict, key, directionMatrix );
+ for(int i = 0; i<3; i++)
+ for(int j = 0; j<3; j++)
+ m_Direction[j][i]=directionMatrix[i][j];
+ }
else
{
itkDebugMacro(
3dseriesimage_vs_2d.patch [^] (7,524 bytes) 2009-12-03 09:07 [Show Content] [Hide Content]Index: Code/IO/itkGDCMImageIO.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkGDCMImageIO.cxx,v
retrieving revision 1.169
diff -u -r1.169 itkGDCMImageIO.cxx
--- Code/IO/itkGDCMImageIO.cxx 3 Dec 2009 13:56:48 -0000 1.169
+++ Code/IO/itkGDCMImageIO.cxx 3 Dec 2009 14:06:32 -0000
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkGDCMImageIO.cxx,v $
Language: C++
- Date: $Date: 2009-12-03 13:56:48 $
- Version: $Revision: 1.169 $
+ Date: $Date: 2009-12-03 11:30:50 $
+ Version: $Revision: 1.168 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -1399,9 +1399,6 @@
m_GlobalNumberOfDimensions = numberOfDimensions;
m_Origin.resize( m_GlobalNumberOfDimensions );
m_Spacing.resize( m_GlobalNumberOfDimensions );
- m_Direction.resize( m_GlobalNumberOfDimensions );
- for(unsigned int i = 0; i<m_GlobalNumberOfDimensions; i++)
- m_Direction[i].resize( m_GlobalNumberOfDimensions );
}
else if( key == ITK_Origin )
{
@@ -1421,15 +1418,6 @@
m_Spacing[1] = spacingArray[1];
m_Spacing[2] = spacingArray[2];
}
- else if( key == ITK_ZDirection )
- {
- typedef Matrix< double > DoubleMatrixType;
- DoubleMatrixType directionMatrix;
- ExposeMetaData< DoubleMatrixType >( dict, key, directionMatrix );
- for(int i = 0; i<3; i++)
- for(int j = 0; j<3; j++)
- m_Direction[i][j]=directionMatrix[i][j];
- }
else
{
itkDebugMacro(
@@ -1952,9 +1940,6 @@
m_GlobalNumberOfDimensions = numberOfDimensions;
m_Origin.resize( m_GlobalNumberOfDimensions );
m_Spacing.resize( m_GlobalNumberOfDimensions );
- m_Direction.resize( m_GlobalNumberOfDimensions );
- for(unsigned int i = 0; i<m_GlobalNumberOfDimensions; i++)
- m_Direction[i].resize( m_GlobalNumberOfDimensions );
}
else if( key == ITK_Origin )
{
@@ -1974,15 +1959,6 @@
m_Spacing[1] = spacingArray[1];
m_Spacing[2] = spacingArray[2];
}
- else if( key == ITK_XDirection )
- {
- typedef Matrix< double > DoubleMatrixType;
- DoubleMatrixType directionMatrix;
- ExposeMetaData< DoubleMatrixType >( dict, key, directionMatrix );
- for(int i = 0; i<3; i++)
- for(int j = 0; j<3; j++)
- m_Direction[i][j]=directionMatrix[i][j];
- }
else
{
itkDebugMacro(
Index: Code/IO/itkIOCommon.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkIOCommon.cxx,v
retrieving revision 1.31
diff -u -r1.31 itkIOCommon.cxx
--- Code/IO/itkIOCommon.cxx 3 Dec 2009 13:56:50 -0000 1.31
+++ Code/IO/itkIOCommon.cxx 3 Dec 2009 14:06:32 -0000
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkIOCommon.cxx,v $
Language: C++
- Date: $Date: 2009-12-03 13:56:50 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2009-12-03 11:30:50 $
+ Version: $Revision: 1.30 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -33,7 +33,6 @@
#endif
const char *const ITK_Origin = "ITK_Origin";
const char *const ITK_Spacing = "ITK_Spacing";
-const char *const ITK_ZDirection = "ITK_ZDirection";
const char *const ITK_FileOriginator = "ITK_FileOriginator";
const char *const ITK_OriginationDate = "ITK_OriginationDate";
const char *const ITK_PatientID = "ITK_PatientID";
Index: Code/IO/itkIOCommon.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkIOCommon.h,v
retrieving revision 1.29
diff -u -r1.29 itkIOCommon.h
--- Code/IO/itkIOCommon.h 3 Dec 2009 13:56:53 -0000 1.29
+++ Code/IO/itkIOCommon.h 3 Dec 2009 14:06:32 -0000
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkIOCommon.h,v $
Language: C++
- Date: $Date: 2009-12-03 13:56:53 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2009-12-03 11:30:50 $
+ Version: $Revision: 1.28 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -110,7 +110,6 @@
#endif
extern const char *const ITK_Origin;
extern const char *const ITK_Spacing;
-extern const char *const ITK_ZDirection;
extern const char *const ITK_FileOriginator;
extern const char *const ITK_OriginationDate;
extern const char *const ITK_PatientID;
Index: Code/IO/itkImageIOBase.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkImageIOBase.cxx,v
retrieving revision 1.87
diff -u -r1.87 itkImageIOBase.cxx
--- Code/IO/itkImageIOBase.cxx 3 Dec 2009 13:56:54 -0000 1.87
+++ Code/IO/itkImageIOBase.cxx 3 Dec 2009 14:06:32 -0000
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkImageIOBase.cxx,v $
Language: C++
- Date: $Date: 2009-12-03 13:56:54 $
- Version: $Revision: 1.87 $
+ Date: $Date: 2009-11-03 12:25:10 $
+ Version: $Revision: 1.86 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -172,8 +172,7 @@
}
this->Modified();
std::vector<double> v;
- //v.resize(m_Direction.size());
- v.resize(direction.size());
+ v.resize(m_Direction.size());
for (unsigned int j=0; j < v.size(); j++)
{
v[j] = direction[j];
Index: Code/IO/itkImageSeriesWriter.txx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkImageSeriesWriter.txx,v
retrieving revision 1.35
diff -u -r1.35 itkImageSeriesWriter.txx
--- Code/IO/itkImageSeriesWriter.txx 3 Dec 2009 13:56:56 -0000 1.35
+++ Code/IO/itkImageSeriesWriter.txx 3 Dec 2009 14:06:32 -0000
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkImageSeriesWriter.txx,v $
Language: C++
- Date: $Date: 2009-12-03 13:56:56 $
- Version: $Revision: 1.35 $
+ Date: $Date: 2009-12-03 11:30:50 $
+ Version: $Revision: 1.34 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -362,17 +362,6 @@
EncapsulateMetaData< DoubleArrayType >( dictionary, ITK_Spacing, spacingArray );
EncapsulateMetaData< unsigned int >( dictionary, ITK_NumberOfDimensions, inputImageDimension );
- typename InputImageType::DirectionType direction2 = inputImage->GetDirection();
- typedef Matrix< double, inputImageDimension, inputImageDimension> DoubleMatrixType;
- DoubleMatrixType directionMatrix;
- for( unsigned int i = 0; i < inputImageDimension; i++ )
- {
- for( unsigned int j = 0; j < inputImageDimension; j++ )
- {
- directionMatrix[i][j] = direction2[i][j];
- }
- }
- EncapsulateMetaData< DoubleMatrixType >( dictionary, ITK_ZDirection, directionMatrix );
}
}
ITK_Direction4.patch [^] (4,702 bytes) 2010-04-20 06:27 [Show Content] [Hide Content]Index: Code/IO/itkGDCMImageIO.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkGDCMImageIO.cxx,v
retrieving revision 1.170
diff -u -r1.170 itkGDCMImageIO.cxx
--- Code/IO/itkGDCMImageIO.cxx 3 Dec 2009 14:09:13 -0000 1.170
+++ Code/IO/itkGDCMImageIO.cxx 20 Apr 2010 10:12:44 -0000
@@ -1399,6 +1399,9 @@
m_GlobalNumberOfDimensions = numberOfDimensions;
m_Origin.resize( m_GlobalNumberOfDimensions );
m_Spacing.resize( m_GlobalNumberOfDimensions );
+ for (unsigned int i = 0 ; i < m_GlobalNumberOfDimensions; i++)
+ m_Direction[i].resize( m_GlobalNumberOfDimensions );
+
}
else if( key == ITK_Origin )
{
@@ -1418,6 +1421,15 @@
m_Spacing[1] = spacingArray[1];
m_Spacing[2] = spacingArray[2];
}
+ else if( key == ITK_ZDirection )
+ {
+ typedef Matrix< double > DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ ExposeMetaData< DoubleMatrixType >( dict, key, directionMatrix );
+ for(int i = 0; i<3; i++)
+ for(int j = 0; j<3; j++)
+ m_Direction[i][j]=directionMatrix[i][j];
+ }
else
{
itkDebugMacro(
@@ -1940,6 +1952,9 @@
m_GlobalNumberOfDimensions = numberOfDimensions;
m_Origin.resize( m_GlobalNumberOfDimensions );
m_Spacing.resize( m_GlobalNumberOfDimensions );
+ m_Direction.resize(m_GlobalNumberOfDimensions );
+ for (unsigned int i = 0 ; i < m_GlobalNumberOfDimensions; i++)
+ m_Direction[i].resize( m_GlobalNumberOfDimensions );
}
else if( key == ITK_Origin )
{
@@ -1959,6 +1974,16 @@
m_Spacing[1] = spacingArray[1];
m_Spacing[2] = spacingArray[2];
}
+ else if( key == ITK_ZDirection )
+ {
+ typedef Matrix< double > DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ ExposeMetaData< DoubleMatrixType >( dict, key, directionMatrix );
+ for(int i = 0; i<3; i++)
+ for(int j = 0; j<3; j++)
+ m_Direction[i][j]=directionMatrix[i][j];
+
+ }
else
{
itkDebugMacro(
Index: Code/IO/itkIOCommon.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkIOCommon.cxx,v
retrieving revision 1.32
diff -u -r1.32 itkIOCommon.cxx
--- Code/IO/itkIOCommon.cxx 3 Dec 2009 14:09:13 -0000 1.32
+++ Code/IO/itkIOCommon.cxx 20 Apr 2010 10:12:44 -0000
@@ -33,6 +33,7 @@
#endif
const char *const ITK_Origin = "ITK_Origin";
const char *const ITK_Spacing = "ITK_Spacing";
+const char *const ITK_ZDirection = "ITK_ZDirection";
const char *const ITK_FileOriginator = "ITK_FileOriginator";
const char *const ITK_OriginationDate = "ITK_OriginationDate";
const char *const ITK_PatientID = "ITK_PatientID";
Index: Code/IO/itkIOCommon.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkIOCommon.h,v
retrieving revision 1.30
diff -u -r1.30 itkIOCommon.h
--- Code/IO/itkIOCommon.h 3 Dec 2009 14:09:14 -0000 1.30
+++ Code/IO/itkIOCommon.h 20 Apr 2010 10:12:44 -0000
@@ -110,6 +110,7 @@
#endif
extern const char *const ITK_Origin;
extern const char *const ITK_Spacing;
+extern const char *const ITK_ZDirection;
extern const char *const ITK_FileOriginator;
extern const char *const ITK_OriginationDate;
extern const char *const ITK_PatientID;
Index: Code/IO/itkImageSeriesWriter.txx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkImageSeriesWriter.txx,v
retrieving revision 1.36
diff -u -r1.36 itkImageSeriesWriter.txx
--- Code/IO/itkImageSeriesWriter.txx 3 Dec 2009 14:09:14 -0000 1.36
+++ Code/IO/itkImageSeriesWriter.txx 20 Apr 2010 10:12:44 -0000
@@ -362,6 +362,17 @@
EncapsulateMetaData< DoubleArrayType >( dictionary, ITK_Spacing, spacingArray );
EncapsulateMetaData< unsigned int >( dictionary, ITK_NumberOfDimensions, inputImageDimension );
+ typename InputImageType::DirectionType direction2 = inputImage->GetDirection();
+ typedef Matrix< double, inputImageDimension, inputImageDimension> DoubleMatrixType;
+ DoubleMatrixType directionMatrix;
+ for( unsigned int i = 0; i < inputImageDimension; i++ )
+ {
+ for( unsigned int j = 0; j < inputImageDimension; j++ )
+ {
+ directionMatrix[j][i] = direction2[i][j];
+ }
+ }
+ EncapsulateMetaData< DoubleMatrixType >( dictionary, ITK_ZDirection, directionMatrix );
}
}
|