From 9a334e5884e2e6d42afc43ac0d3d64d5fb340101 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 3 Jan 2001 22:01:50 +0000 Subject: [PATCH] r353: *** empty log message *** --- src/dialogs.h | 262 +++++++++++++++++++++---------------------- src/dlgreconstruct.h | 4 +- src/docs.h | 18 +-- 3 files changed, 142 insertions(+), 142 deletions(-) diff --git a/src/dialogs.h b/src/dialogs.h index baf9a2f..0553b1a 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.18 2001/01/02 05:34:57 kevin Exp $ +** $Id: dialogs.h,v 1.19 2001/01/03 22:01:50 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 @@ -35,7 +35,7 @@ #include "scanner.h" #include "phantom.h" #include "procsignal.h" -#include "filter.h" +#include "filter.h" // CLASS StringValueAndTitleListBox @@ -66,26 +66,26 @@ class DialogGetPhantom : public wxDialog private: StringValueAndTitleListBox* m_pListBoxPhantom; }; - - -#include -class ImageFileDocument; -class DialogGetComparisonImage : public wxDialog -{ - public: - DialogGetComparisonImage (wxFrame* pParent, const char* const pszTitle, const std::vector& rVecIF, bool bShowMakeDifference); - virtual ~DialogGetComparisonImage () {} - - ImageFileDocument* getImageFileDocument (); - - bool getMakeDifferenceImage(); - - private: - wxListBox* m_pListBoxImageChoices; - wxCheckBox* m_pMakeDifferenceImage; - const std::vector& m_rVecIF; -}; - + + +#include +class ImageFileDocument; +class DialogGetComparisonImage : public wxDialog +{ + public: + DialogGetComparisonImage (wxFrame* pParent, const char* const pszTitle, const std::vector& rVecIF, bool bShowMakeDifference); + virtual ~DialogGetComparisonImage () {} + + ImageFileDocument* getImageFileDocument (); + + bool getMakeDifferenceImage(); + + private: + wxListBox* m_pListBoxImageChoices; + wxCheckBox* m_pMakeDifferenceImage; + const std::vector& m_rVecIF; +}; + class ImageFile; class DialogGetMinMax : public wxDialog @@ -166,94 +166,94 @@ class DialogGetProjectionParameters : public wxDialog #include "backprojectors.h" -class DialogGetReconstructionParameters : public wxDialog -{ - public: - DialogGetReconstructionParameters (wxFrame* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultFilterID = SignalFilter::FILTER_ABS_BANDLIMIT, double dDefaultFilterParam = 1., int iDefaultFilterMethodID = ProcessSignal::FILTER_METHOD_CONVOLUTION, int iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_INVALID, int iDefaultZeropad = 3, int iDefaultInterpID = Backprojector::INTERP_LINEAR, int iDefaultInterpParam = 1, int iDefaultBackprojectID = Backprojector::BPROJ_IDIFF3, int iDefaultTrace = Trace::TRACE_NONE); - virtual ~DialogGetReconstructionParameters (); - - unsigned int getXSize(); - unsigned int getYSize(); - const char* getFilterName(); - double getFilterParam(); - const char* getFilterMethodName(); - unsigned int getZeropad(); - const char* getFilterGenerationName(); - const char* getInterpName(); - unsigned int getInterpParam(); - const char* getBackprojectName(); - int getTrace (); - - private: - wxTextCtrl* m_pTextCtrlXSize; - wxTextCtrl* m_pTextCtrlYSize; - wxTextCtrl* m_pTextCtrlZeropad; - wxTextCtrl* m_pTextCtrlFilterParam; - wxTextCtrl* m_pTextCtrlInterpParam; - - StringValueAndTitleListBox* m_pListBoxFilter; - StringValueAndTitleListBox* m_pListBoxFilterMethod; - StringValueAndTitleListBox* m_pListBoxFilterGeneration; - StringValueAndTitleListBox* m_pListBoxInterp; - StringValueAndTitleListBox* m_pListBoxBackproject; - StringValueAndTitleListBox* m_pListBoxTrace; - - int m_iDefaultXSize; - int m_iDefaultYSize; - double m_dDefaultFilterParam; - int m_iDefaultZeropad; - int m_iDefaultInterpParam; - int m_iDefaultTrace; -}; - - -class DialogGetFilterParameters : public wxDialog -{ - public: - DialogGetFilterParameters (wxFrame* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultFilterID = SignalFilter::FILTER_BANDLIMIT, double dDefaultFilterParam = 1., double dDefaultBandwidth = 1., int iDefaultDomain = SignalFilter::DOMAIN_SPATIAL, double dDefaultInputScale = 1., double dDefaultOutputScale = 1.); - virtual ~DialogGetFilterParameters (); - - unsigned int getXSize(); - unsigned int getYSize(); - const char* getFilterName(); - const char* getDomainName(); - double getFilterParam(); - double getInputScale(); - double getOutputScale(); - double getBandwidth(); - - private: - wxTextCtrl* m_pTextCtrlXSize; - wxTextCtrl* m_pTextCtrlYSize; - wxTextCtrl* m_pTextCtrlFilterParam; - wxTextCtrl* m_pTextCtrlOutputScale; - wxTextCtrl* m_pTextCtrlInputScale; - wxTextCtrl* m_pTextCtrlBandwidth; - - StringValueAndTitleListBox* m_pListBoxFilter; - StringValueAndTitleListBox* m_pListBoxDomain; - - int m_iDefaultXSize; - int m_iDefaultYSize; - double m_dDefaultFilterParam; - double m_dDefaultBandwidth; - double m_dDefaultOutputScale; - double m_dDefaultInputScale; - int m_iDefaultDomain; -}; - -class DialogExportParameters : public wxDialog -{ - public: - DialogExportParameters (wxFrame* pParent, int iDefaultFormatID); - virtual ~DialogExportParameters () {} - - const char* getFormatName(); - - private: - StringValueAndTitleListBox* m_pListBoxFormat; -}; - +class DialogGetReconstructionParameters : public wxDialog +{ + public: + DialogGetReconstructionParameters (wxFrame* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultFilterID = SignalFilter::FILTER_ABS_BANDLIMIT, double dDefaultFilterParam = 1., int iDefaultFilterMethodID = ProcessSignal::FILTER_METHOD_CONVOLUTION, int iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_INVALID, int iDefaultZeropad = 3, int iDefaultInterpID = Backprojector::INTERP_LINEAR, int iDefaultInterpParam = 1, int iDefaultBackprojectID = Backprojector::BPROJ_IDIFF3, int iDefaultTrace = Trace::TRACE_NONE); + virtual ~DialogGetReconstructionParameters (); + + unsigned int getXSize(); + unsigned int getYSize(); + const char* getFilterName(); + double getFilterParam(); + const char* getFilterMethodName(); + unsigned int getZeropad(); + const char* getFilterGenerationName(); + const char* getInterpName(); + unsigned int getInterpParam(); + const char* getBackprojectName(); + int getTrace (); + + private: + wxTextCtrl* m_pTextCtrlXSize; + wxTextCtrl* m_pTextCtrlYSize; + wxTextCtrl* m_pTextCtrlZeropad; + wxTextCtrl* m_pTextCtrlFilterParam; + wxTextCtrl* m_pTextCtrlInterpParam; + + StringValueAndTitleListBox* m_pListBoxFilter; + StringValueAndTitleListBox* m_pListBoxFilterMethod; + StringValueAndTitleListBox* m_pListBoxFilterGeneration; + StringValueAndTitleListBox* m_pListBoxInterp; + StringValueAndTitleListBox* m_pListBoxBackproject; + StringValueAndTitleListBox* m_pListBoxTrace; + + int m_iDefaultXSize; + int m_iDefaultYSize; + double m_dDefaultFilterParam; + int m_iDefaultZeropad; + int m_iDefaultInterpParam; + int m_iDefaultTrace; +}; + + +class DialogGetFilterParameters : public wxDialog +{ + public: + DialogGetFilterParameters (wxFrame* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultFilterID = SignalFilter::FILTER_BANDLIMIT, double dDefaultFilterParam = 1., double dDefaultBandwidth = 1., int iDefaultDomain = SignalFilter::DOMAIN_SPATIAL, double dDefaultInputScale = 1., double dDefaultOutputScale = 1.); + virtual ~DialogGetFilterParameters (); + + unsigned int getXSize(); + unsigned int getYSize(); + const char* getFilterName(); + const char* getDomainName(); + double getFilterParam(); + double getInputScale(); + double getOutputScale(); + double getBandwidth(); + + private: + wxTextCtrl* m_pTextCtrlXSize; + wxTextCtrl* m_pTextCtrlYSize; + wxTextCtrl* m_pTextCtrlFilterParam; + wxTextCtrl* m_pTextCtrlOutputScale; + wxTextCtrl* m_pTextCtrlInputScale; + wxTextCtrl* m_pTextCtrlBandwidth; + + StringValueAndTitleListBox* m_pListBoxFilter; + StringValueAndTitleListBox* m_pListBoxDomain; + + int m_iDefaultXSize; + int m_iDefaultYSize; + double m_dDefaultFilterParam; + double m_dDefaultBandwidth; + double m_dDefaultOutputScale; + double m_dDefaultInputScale; + int m_iDefaultDomain; +}; + +class DialogExportParameters : public wxDialog +{ + public: + DialogExportParameters (wxFrame* pParent, int iDefaultFormatID); + virtual ~DialogExportParameters () {} + + const char* getFormatName(); + + private: + StringValueAndTitleListBox* m_pListBoxFormat; +}; + class DialogAutoScaleParameters : public wxDialog { public: @@ -264,32 +264,32 @@ class DialogAutoScaleParameters : public wxDialog double getAutoScaleFactor (); private: - const double m_dMean; + const double m_dMean; const double m_dMode; - const double m_dMedian; - const double m_dStdDev; + const double m_dMedian; + const double m_dStdDev; wxTextCtrl* m_pTextCtrlStdDevFactor; wxListBox* m_pListBoxCenter; }; - -class DialogGetXYSize : public wxDialog -{ - public: - DialogGetXYSize (wxFrame* pParent, const char* const pszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1); - virtual ~DialogGetXYSize (); - - unsigned int getXSize (); - unsigned int getYSize (); - - private: - wxTextCtrl* m_pTextCtrlXSize; - wxTextCtrl* m_pTextCtrlYSize; - - unsigned int m_iDefaultXSize; - unsigned int m_iDefaultYSize; -}; - + +class DialogGetXYSize : public wxDialog +{ + public: + DialogGetXYSize (wxFrame* pParent, const char* const pszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1); + virtual ~DialogGetXYSize (); + + unsigned int getXSize (); + unsigned int getYSize (); + + private: + wxTextCtrl* m_pTextCtrlXSize; + wxTextCtrl* m_pTextCtrlYSize; + + unsigned int m_iDefaultXSize; + unsigned int m_iDefaultYSize; +}; + #endif diff --git a/src/dlgreconstruct.h b/src/dlgreconstruct.h index 8ff6cb2..7797df3 100644 --- a/src/dlgreconstruct.h +++ b/src/dlgreconstruct.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dlgreconstruct.h,v 1.6 2000/12/18 06:32:13 kevin Exp $ +** $Id: dlgreconstruct.h,v 1.7 2001/01/03 22:01:50 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 @@ -91,7 +91,7 @@ private: SGPDriver* m_pSGPDriver; SGP* m_pSGP; const int m_iTrace; - wxDC* m_pDC; + wxDC* m_pDC; wxButton *m_btnAbort; // the abort button (or NULL if none) wxButton *m_btnPause; diff --git a/src/docs.h b/src/docs.h index c1da82a..8da87b3 100644 --- a/src/docs.h +++ b/src/docs.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: docs.h,v 1.10 2001/01/02 05:34:57 kevin Exp $ +** $Id: docs.h,v 1.11 2001/01/03 22:01:50 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 @@ -117,13 +117,13 @@ public: { return m_phantom; } virtual bool OnOpenDocument (const wxString& filename); - virtual bool OnSaveDocument (const wxString& filename); + virtual bool OnSaveDocument (const wxString& filename); virtual bool OnCloseDocument (); virtual bool IsModified () const; virtual void Modify (bool mod); }; - - + + class PlotFileDocument: public wxDocument { DECLARE_DYNAMIC_CLASS(PlotFileDocument) @@ -145,11 +145,11 @@ public: const PlotFile& getPlotFile () const { return m_plot; } - PlotFile& getPlotFile () - { return m_plot; } - - virtual bool OnOpenDocument (const wxString& filename); - virtual bool OnSaveDocument (const wxString& filename); + PlotFile& getPlotFile () + { return m_plot; } + + virtual bool OnOpenDocument (const wxString& filename); + virtual bool OnSaveDocument (const wxString& filename); virtual bool OnCloseDocument (); virtual bool IsModified () const; virtual void Modify (bool mod); -- 2.34.1