X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdialogs.h;h=1cd86e3efb879e37eba1d520ce5d804cfd404437;hp=7271339bd9a8c789e254157e8e22b38ffef5d948;hb=bfcc769cf8019eabc8c65c07257c8dbee4b4c977;hpb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3

diff --git a/src/dialogs.h b/src/dialogs.h
index 7271339..1cd86e3 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.12 2000/08/31 08:38:58 kevin Exp $
+**  $Id: dialogs.h,v 1.13 2000/09/02 05:10:39 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
@@ -47,7 +47,7 @@ class StringValueAndTitleListBox : public wxListBox
  public:
   StringValueAndTitleListBox (wxDialog* pParent, int nChoices, const char* aszTitle[], const char* aszValue[]);
 
-    const char* getSelectionStringValue (void) const;
+    const char* getSelectionStringValue () const;
 
  private:
     const char** m_ppszValues;
@@ -58,9 +58,9 @@ class DialogGetPhantom : public wxDialog
 {
  public:
     DialogGetPhantom (wxFrame* pParent, int iDefaultPhantom = Phantom::PHM_HERMAN);
-    virtual ~DialogGetPhantom (void) {}
+    virtual ~DialogGetPhantom () {}
 
-    const char* getPhantom (void);
+    const char* getPhantom ();
 
  private:
     StringValueAndTitleListBox* m_pListBoxPhantom;
@@ -72,10 +72,10 @@ class DialogGetImageMinMax : public wxDialog
 {
  public:
     DialogGetImageMinMax (wxFrame* pParent, const ImageFile& rImagefile, double dDefaultMin = 0., double dDefaultMax = 0.);
-    virtual ~DialogGetImageMinMax (void);
+    virtual ~DialogGetImageMinMax ();
 
-    double getMinimum (void);
-    double getMaximum (void);
+    double getMinimum ();
+    double getMaximum ();
 
  private:
     wxTextCtrl* m_pTextCtrlMin;
@@ -90,11 +90,11 @@ class DialogGetRasterParameters : public wxDialog
 {
  public:
     DialogGetRasterParameters (wxFrame* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultNSamples = 1);
-    virtual ~DialogGetRasterParameters (void);
+    virtual ~DialogGetRasterParameters ();
 
-    unsigned int getXSize (void);
-    unsigned int getYSize (void);
-    unsigned int getNSamples (void);
+    unsigned int getXSize ();
+    unsigned int getYSize ();
+    unsigned int getNSamples ();
 
  private:
     wxTextCtrl* m_pTextCtrlXSize;
@@ -111,17 +111,17 @@ 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, int iDefaultTrace = Trace::TRACE_NONE);
-    ~DialogGetProjectionParameters (void);
+    ~DialogGetProjectionParameters ();
 
-    unsigned int getNDet (void);
-    unsigned int getNView (void);
-    unsigned int getNSamples (void);
-    int getTrace (void);
+    unsigned int getNDet ();
+    unsigned int getNView ();
+    unsigned int getNSamples ();
+    int getTrace ();
 
-    double getRotAngle (void);
-    double getFieldOfViewRatio (void);
-    double getFocalLengthRatio (void);
-    const char* getGeometry(void);
+    double getRotAngle ();
+    double getFieldOfViewRatio ();
+    double getFocalLengthRatio ();
+    const char* getGeometry();
 
  private:
     wxTextCtrl* m_pTextCtrlNDet;
@@ -138,6 +138,7 @@ class DialogGetProjectionParameters : public wxDialog
     int m_iDefaultNView;
     int m_iDefaultNSamples;
     int m_iDefaultTrace;
+    int m_iDefaultGeometry;
     double m_dDefaultRotAngle;
     double m_dDefaultFocalLength;
     double m_dDefaultFieldOfView;
@@ -148,19 +149,20 @@ class DialogGetProjectionParameters : public wxDialog
 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);
-    virtual ~DialogGetReconstructionParameters (void);
-
-    unsigned int getXSize(void);
-    unsigned int getYSize(void);
-    const char* getFilterName(void);
-    double getFilterParam(void);
-    const char* getFilterMethodName(void);
-    unsigned int getZeropad(void);
-    const char* getFilterGenerationName(void);
-    const char* getInterpName(void);
-    unsigned int getInterpParam(void);
-    const char* getBackprojectName(void);
+    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;
@@ -174,12 +176,14 @@ class DialogGetReconstructionParameters : public wxDialog
     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 DialogAutoScaleParameters : public wxDialog