X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fprojections.h;h=787f325b34b7729328c04d90000da4c69ebe033e;hb=6480e936da257519dd36840862ac995ca8c374da;hp=48ca0f44710f737b2e4bbfe950bd086bfa1e2c9d;hpb=c5e7140bd08b8c8f527713e8dc861bcb7ee5f633;p=ctsim.git diff --git a/include/projections.h b/include/projections.h index 48ca0f4..787f325 100644 --- a/include/projections.h +++ b/include/projections.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: projections.h,v 1.22 2001/02/08 06:25:07 kevin Exp $ +** $Id: projections.h,v 1.25 2001/02/22 18:22:40 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify @@ -54,8 +54,8 @@ class Projections ~Projections (); static const int getInterpCount() {return s_iInterpCount;} - static const char** getInterpNameArray() {return s_aszInterpName;} - static const char** getInterpTitleArray() {return s_aszInterpTitle;} + static const char* const* getInterpNameArray() {return s_aszInterpName;} + static const char* const* getInterpTitleArray() {return s_aszInterpTitle;} static int convertInterpNameToID (const char* const interpName); static const char* convertInterpIDToName (const int interpID); static const char* convertInterpIDToTitle (const int interpID); @@ -75,7 +75,7 @@ class Projections bool convertPolar (ImageFile& rIF, int iInterpolation); bool convertFFTPolar (ImageFile& rIF, int iInterpolation, int iZeropad); - void calcArrayPolarCoordinates (unsigned int nx, unsigned int ny, double** ppdView, double** ppdDet); + bool calcArrayPolarCoordinates (unsigned int nx, unsigned int ny, double** ppdView, double** ppdDet); void interpolatePolar (ImageFileArray& v, ImageFileArray& vImag, unsigned int nx, unsigned int ny, std::complex** ppcDetValue, double** ppdDet, double** ppdView, unsigned int nView, unsigned int nDet, int iInterpolate); @@ -100,6 +100,7 @@ class Projections int geometry() const {return m_geometry;} double focalLength() const {return m_dFocalLength;} double phmLen() const { return m_dViewDiameter / SQRT2; } + void setPhmLen(double phmLen) { m_dViewDiameter = phmLen * SQRT2; } const std::string& getFilename() const {return m_filename;} Array2dFileLabel& getLabel() {return m_label;} @@ -143,8 +144,8 @@ class Projections const static kuint16 m_signature; - static const char* s_aszInterpName[]; - static const char* s_aszInterpTitle[]; + static const char* const s_aszInterpName[]; + static const char* const s_aszInterpTitle[]; static const int s_iInterpCount; bool headerWrite (fnetorderstream& fs);