X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdialogs.h;h=8311bb2e556268285f7ef59382e832e16b368e4f;hp=2eae3dcd12a61b295aca86ae3f1ae5d3897aa9a3;hb=d3fa225aa232e132cc198672c4fc148f96a1ab8c;hpb=a5d437cb4228b07f8c005eaca497c317b8c19d14

diff --git a/src/dialogs.h b/src/dialogs.h
index 2eae3dc..8311bb2 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -7,9 +7,9 @@
 **   Date Started:  July 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dialogs.h,v 1.21 2001/01/20 17:43:41 kevin Exp $
+**  $Id: dialogs.h,v 1.24 2001/02/11 04:56:38 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
@@ -110,28 +110,35 @@ class DialogGetMinMax : public wxDialog
 class DialogGetRasterParameters : public wxDialog
 {
  public:
-    DialogGetRasterParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultNSamples = 1);
+    DialogGetRasterParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, 
+      int iDefaultNSamples = 1, double dDefaultViewRatio = 1);
     virtual ~DialogGetRasterParameters ();
 
     unsigned int getXSize ();
     unsigned int getYSize ();
     unsigned int getNSamples ();
+    double getViewRatio();
 
  private:
     wxTextCtrl* m_pTextCtrlXSize;
     wxTextCtrl* m_pTextCtrlYSize;
     wxTextCtrl* m_pTextCtrlNSamples;
+    wxTextCtrl* m_pTextCtrlViewRatio;
 
     int m_iDefaultXSize;
     int m_iDefaultYSize;
     int m_iDefaultNSamples;
+    double m_dDefaultViewRatio;
 };
 
 
 class DialogGetProjectionParameters : public wxDialog
 {
  public:
-    DialogGetProjectionParameters (wxWindow* 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 (wxWindow* pParent, int iDefaultNDet = 0, 
+      int iDefaultNView = 0, int iDefaultNSamples = 1, double dDefaultRotAngle = 1., 
+      double dDefaultFocalLength = 1, double dDefaultViewRatio = 1., 
+      double dDefaultScanRatio = 1., int iDefaultGeometry = Scanner::GEOMETRY_PARALLEL, int iDefaultTrace = Trace::TRACE_NONE);
     ~DialogGetProjectionParameters ();
 
     unsigned int getNDet ();
@@ -140,7 +147,8 @@ class DialogGetProjectionParameters : public wxDialog
     int getTrace ();
 
     double getRotAngle ();
-    double getFieldOfViewRatio ();
+    double getViewRatio ();
+    double getScanRatio ();
     double getFocalLengthRatio ();
     const char* getGeometry();
 
@@ -150,8 +158,8 @@ class DialogGetProjectionParameters : public wxDialog
     wxTextCtrl* m_pTextCtrlNSamples;
     wxTextCtrl* m_pTextCtrlRotAngle;
     wxTextCtrl* m_pTextCtrlFocalLength;
-    wxTextCtrl* m_pTextCtrlFieldOfView;
-
+    wxTextCtrl* m_pTextCtrlViewRatio;
+    wxTextCtrl* m_pTextCtrlScanRatio;
     StringValueAndTitleListBox* m_pListBoxGeometry;
     StringValueAndTitleListBox* m_pListBoxTrace;
 
@@ -162,7 +170,8 @@ class DialogGetProjectionParameters : public wxDialog
     int m_iDefaultGeometry;
     double m_dDefaultRotAngle;
     double m_dDefaultFocalLength;
-    double m_dDefaultFieldOfView;
+    double m_dDefaultViewRatio;
+    double m_dDefaultScanRatio;
 };
 
 
@@ -170,7 +179,13 @@ class DialogGetProjectionParameters : public wxDialog
 class DialogGetReconstructionParameters : public wxDialog
 {
  public:
-    DialogGetReconstructionParameters (wxWindow* 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);
+    DialogGetReconstructionParameters (wxWindow* 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_DIRECT, 
+      int iDefaultZeropad = 3, int iDefaultInterpID = Backprojector::INTERP_LINEAR, 
+      int iDefaultInterpParam = 1, int iDefaultBackprojectID = Backprojector::BPROJ_IDIFF, 
+      int iDefaultTrace = Trace::TRACE_NONE);
     virtual ~DialogGetReconstructionParameters ();
 
     unsigned int getXSize();