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

diff --git a/src/dialogs.h b/src/dialogs.h
index d16981c..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.20 2001/01/04 21:28: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
@@ -59,7 +59,7 @@ class StringValueAndTitleListBox : public wxListBox
 class DialogGetPhantom : public wxDialog
 {
  public:
-    DialogGetPhantom (wxFrame* pParent, int iDefaultPhantom = Phantom::PHM_HERMAN);
+    DialogGetPhantom (wxWindow* pParent, int iDefaultPhantom = Phantom::PHM_HERMAN);
     virtual ~DialogGetPhantom () {}
 
     const char* getPhantom ();
@@ -74,7 +74,7 @@ class ImageFileDocument;
 class DialogGetComparisonImage : public wxDialog
 {
  public:
-   DialogGetComparisonImage (wxFrame* pParent, const char* const pszTitle, const std::vector<ImageFileDocument*>& rVecIF, bool bShowMakeDifference);
+   DialogGetComparisonImage (wxWindow* pParent, const char* const pszTitle, const std::vector<ImageFileDocument*>& rVecIF, bool bShowMakeDifference);
     virtual ~DialogGetComparisonImage () {}
 
     ImageFileDocument* getImageFileDocument ();
@@ -92,7 +92,7 @@ class ImageFile;
 class DialogGetMinMax : public wxDialog
 {
  public:
-    DialogGetMinMax (wxFrame* pParent, const char* const pszTitle, double dDefaultMin = 0., double dDefaultMax = 0.);
+    DialogGetMinMax (wxWindow* pParent, const char* const pszTitle, double dDefaultMin = 0., double dDefaultMax = 0.);
     virtual ~DialogGetMinMax ();
 
     double getMinimum ();
@@ -110,28 +110,35 @@ class DialogGetMinMax : public wxDialog
 class DialogGetRasterParameters : public wxDialog
 {
  public:
-    DialogGetRasterParameters (wxFrame* 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 (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 (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 (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);
+    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();
@@ -211,7 +226,7 @@ class DialogGetReconstructionParameters : public wxDialog
 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.);
+    DialogGetFilterParameters (wxWindow* 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();
@@ -246,7 +261,7 @@ class DialogGetFilterParameters : public wxDialog
 class DialogExportParameters : public wxDialog
 {
  public:
-    DialogExportParameters (wxFrame* pParent, int iDefaultFormatID);
+    DialogExportParameters (wxWindow* pParent, int iDefaultFormatID);
     virtual ~DialogExportParameters () {}
 
     const char* getFormatName();
@@ -258,7 +273,7 @@ class DialogExportParameters : public wxDialog
 class DialogAutoScaleParameters : public wxDialog
 {
  public:
-    DialogAutoScaleParameters (wxFrame* pParent, double mean, double mode, double median, double stddev, double dDefaultScaleFactor = 1.);
+    DialogAutoScaleParameters (wxWindow* pParent, double mean, double mode, double median, double stddev, double dDefaultScaleFactor = 1.);
     virtual ~DialogAutoScaleParameters() {}
 
     bool getMinMax (double* pMin, double* pMax);
@@ -277,7 +292,7 @@ class DialogAutoScaleParameters : public wxDialog
 class DialogGetXYSize : public wxDialog
 {
  public:
-    DialogGetXYSize (wxFrame* pParent, const char* const pszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1);
+    DialogGetXYSize (wxWindow* pParent, const char* const pszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1);
     virtual ~DialogGetXYSize ();
 
     unsigned int getXSize ();
@@ -295,7 +310,7 @@ class DialogGetXYSize : public wxDialog
 class DialogGetConvertPolarParameters : public wxDialog
 {
  public:
-   DialogGetConvertPolarParameters (wxFrame* pParent, const char* const pszTitle, int iDefaultXSize = 0, 
+   DialogGetConvertPolarParameters (wxWindow* pParent, const char* const pszTitle, int iDefaultXSize = 0, 
      int iDefaultYSize = 0, int iDefaultInterpolationID = Projections::POLAR_INTERP_BILINEAR, 
      int iDefaultZeropad = 1);
    virtual ~DialogGetConvertPolarParameters ();