X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdialogs.h;h=7271339bd9a8c789e254157e8e22b38ffef5d948;hb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3;hp=7298348df77620a0e67fd3afba4372e5d7521769;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10;p=ctsim.git diff --git a/src/dialogs.h b/src/dialogs.h index 7298348..7271339 100644 --- a/src/dialogs.h +++ b/src/dialogs.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dialogs.h,v 1.10 2000/08/25 15:59:13 kevin Exp $ +** $Id: dialogs.h,v 1.12 2000/08/31 08:38:58 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -31,6 +31,7 @@ #include "wx/wx.h" #include +#include "ctsupport.h" #include "scanner.h" #include "phantom.h" #include "procsignal.h" @@ -109,12 +110,14 @@ class DialogGetRasterParameters : public wxDialog class DialogGetProjectionParameters : public wxDialog { public: - DialogGetProjectionParameters (wxFrame* pParent, int iDefaultNDet = 0, int iDefaultNView = 0, int iDefaultNSamples = 1, double dDefaultRotAngle = 1., double dDefaultFocalLength = 1, double dDefaultFieldOfView = 1., int iDefaultGeometry = Scanner::GEOMETRY_PARALLEL); + DialogGetProjectionParameters (wxFrame* pParent, int iDefaultNDet = 0, int iDefaultNView = 0, int iDefaultNSamples = 1, double dDefaultRotAngle = 1., double dDefaultFocalLength = 1, double dDefaultFieldOfView = 1., int iDefaultGeometry = Scanner::GEOMETRY_PARALLEL, int iDefaultTrace = Trace::TRACE_NONE); ~DialogGetProjectionParameters (void); unsigned int getNDet (void); unsigned int getNView (void); unsigned int getNSamples (void); + int getTrace (void); + double getRotAngle (void); double getFieldOfViewRatio (void); double getFocalLengthRatio (void); @@ -129,10 +132,12 @@ class DialogGetProjectionParameters : public wxDialog wxTextCtrl* m_pTextCtrlFieldOfView; StringValueAndTitleListBox* m_pListBoxGeometry; + StringValueAndTitleListBox* m_pListBoxTrace; int m_iDefaultNDet; int m_iDefaultNView; int m_iDefaultNSamples; + int m_iDefaultTrace; double m_dDefaultRotAngle; double m_dDefaultFocalLength; double m_dDefaultFieldOfView; @@ -180,10 +185,11 @@ class DialogGetReconstructionParameters : public wxDialog class DialogAutoScaleParameters : public wxDialog { public: - DialogAutoScaleParameters (wxFrame* pParent, const ImageFile& rImageFile); + DialogAutoScaleParameters (wxFrame* pParent, const ImageFile& rImageFile, double dDefaultScaleFactor = 1.); virtual ~DialogAutoScaleParameters() {} void getMinMax (double* pMin, double* pMax); + double getAutoScaleFactor (); private: const ImageFile& m_rImageFile;