X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdialogs.h;h=7de92037b143e0e5f4e4cb95d41b1abfe745016f;hp=726ea932c507957b7bd5d04c6631e3ce0029aece;hb=c953cbb6ffc2fd50e736230f4e6976a025983cff;hpb=f1303ea0f1188b0a89846c67b5783f596e7ba1b7 diff --git a/src/dialogs.h b/src/dialogs.h index 726ea93..7de9203 100644 --- a/src/dialogs.h +++ b/src/dialogs.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dialogs.h,v 1.28 2001/02/21 20:13:03 kevin Exp $ +** $Id: dialogs.h,v 1.32 2001/03/01 07:30:49 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 @@ -56,24 +56,24 @@ public: class StringValueAndTitleListBox : public wxListBox { public: - StringValueAndTitleListBox (wxDialog* pParent, int nChoices, const char* aszTitle[], const char* aszValue[]); + StringValueAndTitleListBox (wxDialog* pParent, int nChoices, const char* const aszTitle[], const char* const aszValue[]); const char* getSelectionStringValue () const; private: - const char** m_ppszValues; + const char* const* m_ppszValues; }; class StringValueAndTitleRadioBox : public wxRadioBox { public: - StringValueAndTitleRadioBox (wxDialog* pParent, const wxString& strTitle, int nChoices, const char* aszTitle[], const char* aszValue[]); + StringValueAndTitleRadioBox (wxDialog* pParent, const wxString& strTitle, int nChoices, const char* const aszTitle[], const char* const aszValue[]); const char* getSelectionStringValue () const; private: - const char** m_ppszValues; + const char* const* m_ppszValues; }; @@ -113,17 +113,21 @@ class DialogPreferences : public wxDialog { public: DialogPreferences (wxWindow* pParent, const char* const pszTitle, bool bAdvanced, bool bAskNewDocs, - bool bVerboseLogging); + bool bVerboseLogging, bool bStartupTips, bool bUseBackgroundTasks); virtual ~DialogPreferences (); bool getAdvancedOptions (); bool getAskDeleteNewDocs (); bool getVerboseLogging (); + bool getStartupTips (); + bool getUseBackgroundTasks(); private: wxCheckBox* m_pCBAdvancedOptions; wxCheckBox* m_pCBAskDeleteNewDocs; wxCheckBox* m_pCBVerboseLogging; + wxCheckBox* m_pCBStartupTips; + wxCheckBox* m_pCBUseBackgroundTasks; }; @@ -176,7 +180,7 @@ class DialogGetProjectionParameters : public wxDialog public: DialogGetProjectionParameters (wxWindow* pParent, int iDefaultNDet = 0, int iDefaultNView = 0, int iDefaultNSamples = 1, double dDefaultRotAngle = 1., - double dDefaultFocalLength = 1, double dDefaultViewRatio = 1., + double dDefaultFocalLength = 1, double dDefaultCenterDetectorLength = 1, double dDefaultViewRatio = 1., double dDefaultScanRatio = 1., int iDefaultGeometry = Scanner::GEOMETRY_PARALLEL, int iDefaultTrace = Trace::TRACE_NONE); ~DialogGetProjectionParameters (); @@ -189,6 +193,7 @@ class DialogGetProjectionParameters : public wxDialog double getViewRatio (); double getScanRatio (); double getFocalLengthRatio (); + double getCenterDetectorLengthRatio (); const char* getGeometry(); private: @@ -197,6 +202,7 @@ class DialogGetProjectionParameters : public wxDialog wxTextCtrl* m_pTextCtrlNSamples; wxTextCtrl* m_pTextCtrlRotAngle; wxTextCtrl* m_pTextCtrlFocalLength; + wxTextCtrl* m_pTextCtrlCenterDetectorLength; wxTextCtrl* m_pTextCtrlViewRatio; wxTextCtrl* m_pTextCtrlScanRatio; StringValueAndTitleRadioBox* m_pRadioBoxGeometry; @@ -209,6 +215,7 @@ class DialogGetProjectionParameters : public wxDialog int m_iDefaultGeometry; double m_dDefaultRotAngle; double m_dDefaultFocalLength; + double m_dDefaultCenterDetectorLength; double m_dDefaultViewRatio; double m_dDefaultScanRatio; };