summaryrefslogtreecommitdiffstats
path: root/include/astra
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2014-12-01 11:58:21 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-01-19 11:16:25 +0100
commited56403b30389501d1df7fbbeb763abbe7b09654 (patch)
tree9845e80c5454143cd41dbd012914a00a1b5d2e77 /include/astra
parent44442e9e3212d0f4f72e41bc94e935d0b2dd7033 (diff)
downloadastra-ed56403b30389501d1df7fbbeb763abbe7b09654.tar.gz
astra-ed56403b30389501d1df7fbbeb763abbe7b09654.tar.bz2
astra-ed56403b30389501d1df7fbbeb763abbe7b09654.tar.xz
astra-ed56403b30389501d1df7fbbeb763abbe7b09654.zip
Fix whitespace
Diffstat (limited to 'include/astra')
-rw-r--r--include/astra/ConeProjectionGeometry3D.h56
-rw-r--r--include/astra/ParallelProjectionGeometry3D.h2
-rw-r--r--include/astra/ProjectionGeometry3D.h16
-rw-r--r--include/astra/VolumeGeometry3D.h32
4 files changed, 53 insertions, 53 deletions
diff --git a/include/astra/ConeProjectionGeometry3D.h b/include/astra/ConeProjectionGeometry3D.h
index 64bd51d..5f6c6b8 100644
--- a/include/astra/ConeProjectionGeometry3D.h
+++ b/include/astra/ConeProjectionGeometry3D.h
@@ -93,13 +93,13 @@ public:
* @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array. All angles
* are represented in radians and lie in the [0,2pi[ interval.
*/
- CConeProjectionGeometry3D(int _iProjectionAngleCount,
- int _iDetectorRowCount,
+ CConeProjectionGeometry3D(int _iProjectionAngleCount,
+ int _iDetectorRowCount,
int _iDetectorColCount,
- float32 _fDetectorWidth,
- float32 _fDetectorHeight,
+ float32 _fDetectorWidth,
+ float32 _fDetectorHeight,
const float32* _pfProjectionAngles,
- float32 _fOriginSourceDistance,
+ float32 _fOriginSourceDistance,
float32 _fOriginDetectorDistance);
/** Copy constructor.
@@ -128,13 +128,13 @@ public:
* @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array. All angles
* are represented in radians and lie in the [0,2pi[ interval.
*/
- bool initialize(int _iProjectionAngleCount,
- int _iDetectorRowCount,
+ bool initialize(int _iProjectionAngleCount,
+ int _iDetectorRowCount,
int _iDetectorColCount,
- float32 _fDetectorWidth,
- float32 _fDetectorHeight,
- const float32* _pfProjectionAngles,
- float32 _fOriginSourceDistance,
+ float32 _fDetectorWidth,
+ float32 _fDetectorHeight,
+ const float32* _pfProjectionAngles,
+ float32 _fOriginSourceDistance,
float32 _fOriginDetectorDistance);
@@ -142,7 +142,7 @@ public:
*/
virtual CProjectionGeometry3D* clone() const;
- /** Return true if this geometry instance is the same as the one specified.
+ /** Return true if this geometry instance is the same as the one specified.
*
* @return true if this geometry instance is the same as the one specified.
*/
@@ -153,38 +153,38 @@ public:
* @param _sType geometry type to compare to.
* @return true if _sType == "cone".
*/
- virtual bool isOfType(const std::string& _sType) const;
+ virtual bool isOfType(const std::string& _sType) const;
/** Turn this object into an XML object.
*
* @param _sNode The XML object to fill.
*/
- virtual void toXML(XMLNode* _sNode) const;
+ virtual void toXML(XMLNode* _sNode) const;
/** Returns the distance from the origin of the coordinate system to the source.
- *
- * @return Distance from the origin of the coordinate system to the source
- */
+ *
+ * @return Distance from the origin of the coordinate system to the source
+ */
float32 getOriginSourceDistance() const;
/** Returns the distance from the origin of the coordinate system to the detector
* (i.e., the distance between the origin and its orthogonal projection onto the detector array).
- *
- * @return Distance from the origin of the coordinate system to the detector
- */
+ *
+ * @return Distance from the origin of the coordinate system to the detector
+ */
float32 getOriginDetectorDistance() const;
/** Returns the distance from the source to the detector
* (i.e., the distance between the source and its orthogonal projection onto the detector array).
- *
- * @return Distance from the source to the detector
- */
+ *
+ * @return Distance from the source to the detector
+ */
float32 getSourceDetectorDistance() const;
- /**
- * Returns a vector giving the projection direction for a projection and detector index
- */
- virtual CVector3D getProjectionDirection(int _iProjectionIndex, int _iDetectorIndex) const;
+ /**
+ * Returns a vector giving the projection direction for a projection and detector index
+ */
+ virtual CVector3D getProjectionDirection(int _iProjectionIndex, int _iDetectorIndex) const;
};
// Returns the distance from the origin of the coordinate system to the source.
@@ -210,4 +210,4 @@ inline float32 CConeProjectionGeometry3D::getSourceDetectorDistance() const
} // namespace astra
-#endif /* _INC_ASTRA_PARALLELPROJECTIONGEOMETRY3D */
+#endif /* _INC_ASTRA_CONEPROJECTIONGEOMETRY3D */
diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h
index 2c11328..2a46981 100644
--- a/include/astra/ParallelProjectionGeometry3D.h
+++ b/include/astra/ParallelProjectionGeometry3D.h
@@ -123,7 +123,7 @@ public:
*/
virtual CProjectionGeometry3D* clone() const;
- /** Return true if this geometry instance is the same as the one specified.
+ /** Return true if this geometry instance is the same as the one specified.
*
* @return true if this geometry instance is the same as the one specified.
*/
diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h
index 18f7e41..15dab87 100644
--- a/include/astra/ProjectionGeometry3D.h
+++ b/include/astra/ProjectionGeometry3D.h
@@ -111,11 +111,11 @@ protected:
* @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array. All angles
* are represented in radians and lie in the [0,2pi[ interval.
*/
- CProjectionGeometry3D(int _iProjectionAngleCount,
- int _iDetectorRowCount,
+ CProjectionGeometry3D(int _iProjectionAngleCount,
+ int _iDetectorRowCount,
int _iDetectorColCount,
- float32 _fDetectorSpacingX,
- float32 _fDetectorSpacingY,
+ float32 _fDetectorSpacingX,
+ float32 _fDetectorSpacingY,
const float32* _pfProjectionAngles);
/** Copy constructor.
@@ -147,11 +147,11 @@ protected:
* @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array. All angles
* are represented in radians and lie in the [0,2pi[ interval.
*/
- bool _initialize(int _iProjectionAngleCount,
- int _iDetectorRowCount,
+ bool _initialize(int _iProjectionAngleCount,
+ int _iDetectorRowCount,
int _iDetectorColCount,
- float32 _fDetectorSpacingX,
- float32 _fDetectorSpacingY,
+ float32 _fDetectorSpacingX,
+ float32 _fDetectorSpacingY,
const float32* _pfProjectionAngles);
public:
diff --git a/include/astra/VolumeGeometry3D.h b/include/astra/VolumeGeometry3D.h
index 7354f33..eba0a92 100644
--- a/include/astra/VolumeGeometry3D.h
+++ b/include/astra/VolumeGeometry3D.h
@@ -104,7 +104,7 @@ protected:
float32 m_fPixelLengthZ; ///< Depth of a single pixel, in unit lengths.
float32 m_fPixelArea; ///< Area of a single pixel, in unit lengths squared.
- float32 m_fDivPixelLengthX; ///< 1/m_fPixelLengthX, used for fast division.
+ float32 m_fDivPixelLengthX; ///< 1/m_fPixelLengthX, used for fast division.
float32 m_fDivPixelLengthY; ///< 1/m_fPixelLengthY, used for fast division.
float32 m_fDivPixelLengthZ; ///< 1/m_fPixelLengthZ, used for fast division.
@@ -127,7 +127,7 @@ protected:
public:
- /** Default constructor. Sets all numeric member variables to 0 and all pointer member variables to NULL.
+ /** Default constructor. Sets all numeric member variables to 0 and all pointer member variables to NULL.
*
* If an object is constructed using this default constructor, it must always be followed by a call
* to one of the init() methods before the object can be used. Any use before calling init() is not allowed,
@@ -240,7 +240,7 @@ public:
*/
bool isInitialized() const;
- /** Return true if this geometry instance is the same as the one specified.
+ /** Return true if this geometry instance is the same as the one specified.
*
* @return true if this geometry instance is the same as the one specified.
*/
@@ -318,37 +318,37 @@ public:
*/
float32 getPixelArea() const;
- /** Get the minimal X-coordinate in the volume window.
+ /** Get the minimal X-coordinate in the volume window.
*
* @return Minimal X-coordinate in the volume window.
*/
float32 getWindowMinX() const;
- /** Get the minimal Y-coordinate in the volume window.
+ /** Get the minimal Y-coordinate in the volume window.
*
* @return Minimal Y-coordinate in the volume window.
*/
float32 getWindowMinY() const;
- /** Get the minimal Z-coordinate in the volume window.
+ /** Get the minimal Z-coordinate in the volume window.
*
* @return Minimal Z-coordinate in the volume window.
*/
float32 getWindowMinZ() const;
- /** Get the maximal X-coordinate in the volume window.
+ /** Get the maximal X-coordinate in the volume window.
*
* @return Maximal X-coordinate in the volume window.
*/
float32 getWindowMaxX() const;
- /** Get the maximal Y-coordinate in the volume window.
+ /** Get the maximal Y-coordinate in the volume window.
*
* @return Maximal Y-coordinate in the volume window.
*/
float32 getWindowMaxY() const;
- /** Get the maximal Z-coordinate in the volume window.
+ /** Get the maximal Z-coordinate in the volume window.
*
* @return Maximal Z-coordinate in the volume window.
*/
@@ -360,7 +360,7 @@ public:
* @param _iPixelCol Column index of the pixel, in the interval [0..getGridColCount()-1].
* @param _iPixelSlice Slice index of the pixel, in the interval [0..getGridSliceCount()-1].
* @return Computed index of the pixel, in the interval [0..getGridTotCount()-1].
- */
+ */
int pixelRowColSliceToIndex(int _iPixelRow, int _iPixelCol, int _iPixelSlice) const;
/** Convert a pixel index (from the interval [0..getGridTotCount()-1] to row, column and slice index.
@@ -440,7 +440,7 @@ public:
* @param _fCoordX X-coordinate.
* @return If the X-coordinate falls within a column of the volume grid, the column index is returned.
* Otherwise, a value of -1 is returned.
- */
+ */
int coordXToCol(float32 _fCoordX) const;
/** Convert a Y-coordinate to a row index in the volume grid.
@@ -448,7 +448,7 @@ public:
* @param _fCoordY Y-coordinate
* @return If the Y-coordinate falls within a row of the volume grid, the row index is returned.
* Otherwise, a value of -1 is returned.
- */
+ */
int coordYToRow(float32 _fCoordY) const;
/** Convert a Z-coordinate to a slice index in the volume grid.
@@ -456,7 +456,7 @@ public:
* @param _fCoordZ Z-coordinate
* @return If the Z-coordinate falls within a slice of the volume grid, the slice index is returned.
* Otherwise, a value of -1 is returned.
- */
+ */
int coordZToSlice(float32 _fCoordZ) const;
/** Convert an X-coordinate to a column index in the volume grid.
@@ -464,7 +464,7 @@ public:
* @param _fCoordX X-coordinate.
* @return If the X-coordinate falls within a column of the volume grid, the column index is returned.
* Otherwise, a value of -1 is returned.
- */
+ */
float32 coordXToColFloat(float32 _fCoordX) const;
/** Convert a Y-coordinate to a row index in the volume grid.
@@ -472,7 +472,7 @@ public:
* @param _fCoordY Y-coordinate
* @return If the Y-coordinate falls within a row of the volume grid, the row index is returned.
* Otherwise, a value of -1 is returned.
- */
+ */
float32 coordYToRowFloat(float32 _fCoordY) const;
/** Convert a Z-coordinate to a slice index in the volume grid.
@@ -480,7 +480,7 @@ public:
* @param _fCoordZ Z-coordinate
* @return If the Z-coordinate falls within a slice of the volume grid, the slice index is returned.
* Otherwise, a value of -1 is returned.
- */
+ */
float32 coordZToSliceFloat(float32 _fCoordZ) const;
CVolumeGeometry2D * createVolumeGeometry2D() const;