r353: *** empty log message ***

diff --git a/src/dialogs.h b/src/dialogs.h
index baf9a2fb328f3141b6aa306307ee6831d45f8739..0553b1afa6e201f4eaea1629c6910c23e1ab09e5 100644 (file)
--- 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"\r
+#include "filter.h"
 
 
 // CLASS StringValueAndTitleListBox
@@ -66,26 +66,26 @@ class DialogGetPhantom : public wxDialog
  private:
     StringValueAndTitleListBox* m_pListBoxPhantom;
 };
-\r
-\r
-#include <vector>\r
-class ImageFileDocument;\r
-class DialogGetComparisonImage : public wxDialog\r
-{\r
- public:\r
-   DialogGetComparisonImage (wxFrame* pParent, const char* const pszTitle, const std::vector<ImageFileDocument*>& rVecIF, bool bShowMakeDifference);\r
-    virtual ~DialogGetComparisonImage () {}\r
-\r
-    ImageFileDocument* getImageFileDocument ();\r
-\r
-    bool getMakeDifferenceImage();\r
-\r
- private:\r
-    wxListBox* m_pListBoxImageChoices;\r
-    wxCheckBox* m_pMakeDifferenceImage;\r
-    const std::vector<ImageFileDocument*>& m_rVecIF;\r
-};\r
-\r
+
+
+#include <vector>
+class ImageFileDocument;
+class DialogGetComparisonImage : public wxDialog
+{
+ public:
+   DialogGetComparisonImage (wxFrame* pParent, const char* const pszTitle, const std::vector<ImageFileDocument*>& rVecIF, bool bShowMakeDifference);
+    virtual ~DialogGetComparisonImage () {}
+
+    ImageFileDocument* getImageFileDocument ();
+
+    bool getMakeDifferenceImage();
+
+ private:
+    wxListBox* m_pListBoxImageChoices;
+    wxCheckBox* m_pMakeDifferenceImage;
+    const std::vector<ImageFileDocument*>& m_rVecIF;
+};
+
 
 class ImageFile;
 class DialogGetMinMax : public wxDialog
@@ -166,94 +166,94 @@ class DialogGetProjectionParameters : public wxDialog
 
 
 #include "backprojectors.h"
-class DialogGetReconstructionParameters : public wxDialog\r
-{\r
- public:\r
-    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);\r
-    virtual ~DialogGetReconstructionParameters ();\r
-\r
-    unsigned int getXSize();\r
-    unsigned int getYSize();\r
-    const char* getFilterName();\r
-    double getFilterParam();\r
-    const char* getFilterMethodName();\r
-    unsigned int getZeropad();\r
-    const char* getFilterGenerationName();\r
-    const char* getInterpName();\r
-    unsigned int getInterpParam();\r
-    const char* getBackprojectName();\r
-    int getTrace ();\r
-\r
- private:\r
-    wxTextCtrl* m_pTextCtrlXSize;\r
-    wxTextCtrl* m_pTextCtrlYSize;\r
-    wxTextCtrl* m_pTextCtrlZeropad;\r
-    wxTextCtrl* m_pTextCtrlFilterParam;\r
-    wxTextCtrl* m_pTextCtrlInterpParam;\r
-\r
-    StringValueAndTitleListBox* m_pListBoxFilter;\r
-    StringValueAndTitleListBox* m_pListBoxFilterMethod;\r
-    StringValueAndTitleListBox* m_pListBoxFilterGeneration;\r
-    StringValueAndTitleListBox* m_pListBoxInterp;\r
-    StringValueAndTitleListBox* m_pListBoxBackproject;\r
-    StringValueAndTitleListBox* m_pListBoxTrace;\r
-\r
-    int m_iDefaultXSize;\r
-    int m_iDefaultYSize;\r
-    double m_dDefaultFilterParam;\r
-    int m_iDefaultZeropad;\r
-    int m_iDefaultInterpParam;\r
-    int m_iDefaultTrace;\r
-};\r
-\r
-
-class DialogGetFilterParameters : public wxDialog\r
-{\r
- public:\r
-    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.);\r
-    virtual ~DialogGetFilterParameters ();\r
-\r
-    unsigned int getXSize();\r
-    unsigned int getYSize();\r
-    const char* getFilterName();\r
-    const char* getDomainName();\r
-    double getFilterParam();\r
-    double getInputScale();\r
-    double getOutputScale();\r
-    double getBandwidth();\r
-\r
- private:\r
-    wxTextCtrl* m_pTextCtrlXSize;\r
-    wxTextCtrl* m_pTextCtrlYSize;\r
-    wxTextCtrl* m_pTextCtrlFilterParam;\r
-    wxTextCtrl* m_pTextCtrlOutputScale;\r
-    wxTextCtrl* m_pTextCtrlInputScale;\r
-    wxTextCtrl* m_pTextCtrlBandwidth;\r
-\r
-    StringValueAndTitleListBox* m_pListBoxFilter;\r
-    StringValueAndTitleListBox* m_pListBoxDomain;\r
-\r
-    int m_iDefaultXSize;\r
-    int m_iDefaultYSize;\r
-    double m_dDefaultFilterParam;\r
-    double m_dDefaultBandwidth;\r
-    double m_dDefaultOutputScale;\r
-    double m_dDefaultInputScale;\r
-    int m_iDefaultDomain;\r
-};\r
-\r
-class DialogExportParameters : public wxDialog\r
-{\r
- public:\r
-    DialogExportParameters (wxFrame* pParent, int iDefaultFormatID);\r
-    virtual ~DialogExportParameters () {}\r
-\r
-    const char* getFormatName();\r
-\r
- private:\r
-    StringValueAndTitleListBox* m_pListBoxFormat;\r
-};\r
-\r
+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;\r
+    const double m_dMean;
        const double m_dMode;
-       const double m_dMedian;\r
-       const double m_dStdDev;\r
+       const double m_dMedian;
+       const double m_dStdDev;
 
     wxTextCtrl* m_pTextCtrlStdDevFactor;
     wxListBox* m_pListBoxCenter;
 };
-\r
-class DialogGetXYSize : public wxDialog\r
-{\r
- public:\r
-    DialogGetXYSize (wxFrame* pParent, const char* const pszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1);\r
-    virtual ~DialogGetXYSize ();\r
-\r
-    unsigned int getXSize ();\r
-    unsigned int getYSize ();\r
-\r
- private:\r
-    wxTextCtrl* m_pTextCtrlXSize;\r
-    wxTextCtrl* m_pTextCtrlYSize;\r
-\r
-    unsigned int m_iDefaultXSize;\r
-    unsigned int m_iDefaultYSize;\r
-};\r
-\r
+
+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 8ff6cb2a138ca87a2eb161df71f137b17772875b..7797df35f6d8e6bfcdbbc5e9242707199948c041 100644 (file)
--- 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;\r
+   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 c1da82a23de7b0bd5acf39d48f7698c0a3e37183..8da87b3c76a9b3e25a036673e09c2d22c6f3eb4f 100644 (file)
--- 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);\r
+    virtual bool OnSaveDocument (const wxString& filename);
     virtual bool OnCloseDocument ();
     virtual bool IsModified () const;
     virtual void Modify (bool mod);
 };
-\r
-\r
+
+
 class PlotFileDocument: public wxDocument
 {
     DECLARE_DYNAMIC_CLASS(PlotFileDocument)
@@ -145,11 +145,11 @@ public:
     const PlotFile& getPlotFile () const
        { return m_plot; }
 
-    PlotFile& getPlotFile ()\r
-       { return m_plot; }\r
-\r
-    virtual bool OnOpenDocument (const wxString& filename);\r
-    virtual bool OnSaveDocument (const wxString& filename);\r
+    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);