X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdlgreconstruct.h;h=91f1790f0592723162e28fb1ef92ca195a888d9b;hp=0a4f7a64786ce4dc08cb5176e91fe25d02f76be9;hb=f13a8c004b8f182b42d9e4df2bcd7c7f030bf1ad;hpb=3147cd44cff6132e51eac1a179c1fc3d405faacc diff --git a/src/dlgreconstruct.h b/src/dlgreconstruct.h index 0a4f7a6..91f1790 100644 --- a/src/dlgreconstruct.h +++ b/src/dlgreconstruct.h @@ -7,9 +7,7 @@ ** Date Started: August 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg -** -** $Id: dlgreconstruct.h,v 1.2 2000/09/04 09:06:46 kevin Exp $ +** Copyright (c) 1983-2009 Kevin Rosenberg ** ** 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 @@ -28,10 +26,6 @@ #ifndef __DLGRECONSTRUCT_H_ #define __DLGRECONSTRUCT_H_ -#ifdef __GNUG__ -#pragma interface "dlgreconstruct.h" -#endif - #include "wx/setup.h" #include "wx/dialog.h" #include "wx/dcmemory.h" @@ -56,7 +50,7 @@ public: /* Perform projection on view number return true if ABORT button has not been pressed */ - bool reconstructView (int iViewNumber); + bool reconstructView (int iViewNumber, bool bBackproject = true); /* Can be called to continue after the cancel button has been pressed, but the program decided to continue the operation (e.g., user didn't @@ -91,10 +85,10 @@ private: SGPDriver* m_pSGPDriver; SGP* m_pSGP; const int m_iTrace; - wxMemoryDC* m_pDC; + wxDC* m_pDC; wxButton *m_btnAbort; // the abort button (or NULL if none) - wxButton *m_btnPause; + wxButton *m_btnPause; wxButton *m_btnStep; wxMemoryDC m_memoryDC; // for restoring image on OnPaint @@ -115,12 +109,12 @@ private: Finished // finished, waiting to be removed from screen } m_state; - const static int ID_BTN_PAUSE = 19998; - const static int ID_BTN_STEP = 19999; - const static int MAX_IMAGE_X = 400; - const static int MAX_IMAGE_Y = 400; + const static int ID_BTN_PAUSE; + const static int ID_BTN_STEP; + const static int MAX_IMAGE_X; + const static int MAX_IMAGE_Y; - void showView (int iViewNumber); + void showView (int iViewNumber, bool bBackprojectView = true); DECLARE_EVENT_TABLE() };