r7061: initial property settings

[ctsim.git] / src / dlgreconstruct.cpp

diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp
index 1c467c1728977f3f176df27a546b68b487398c72..9dc63929363d804bf1ea90b2e4c6f2d566c80814 100644 (file)
--- a/src/dlgreconstruct.cpp
+++ b/src/dlgreconstruct.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgreconstruct.cpp,v 1.16 2001/01/29 23:11:32 kevin Exp $
+**  $Id$
 **
 **  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
@@ -25,17 +25,8 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-#pragma implementation "dlgreconstruct.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #include "wx/utils.h"
 #include "wx/frame.h"
 #include "wx/button.h"
@@ -127,7 +118,7 @@ ReconstructDialog::ReconstructDialog (Reconstructor& rReconstruct, const Project
                   m_nyImage = MAX_IMAGE_Y;
        
     sizeDlg.x += m_nxImage;
-    sizeDlg.y = max (sizeDlg.y, m_nyImage);
+    sizeDlg.y = imax (sizeDlg.y, m_nyImage);
        
     m_iClientX = sizeDlg.x;
     m_iClientY = sizeDlg.y;
@@ -169,18 +160,21 @@ ReconstructDialog::showView (int iViewNumber, bool bBackprojectView)
                m_pSGP->setViewport (0, 0, 1, 1);
                m_pSGP->setWindow (0, 0, 1, 1);
                m_pSGP->setTextColor (C_LTRED, -1);
-               double dCharHeight = m_pSGP->getCharHeight();
-               m_pSGP->setTextSize (dCharHeight * 2);
+               m_pSGP->setTextPointSize (20.);
                m_pSGP->moveAbs(0., m_pSGP->getCharHeight());
                m_pSGP->drawText (szProgress);
-               m_pSGP->setTextSize (dCharHeight);
+               m_pSGP->setTextPointSize (10.);
                
     int iXDialog, iYDialog;
     GetClientSize (&iXDialog, &iYDialog);
     double dGraphWidth = (iXDialog - m_nxImage) / static_cast<double>(iXDialog);
 
                m_rReconstructor.reconstructView (iViewNumber, 1, m_pSGP, bBackprojectView, dGraphWidth);
-               
+    ::wxYield();
+::wxYield();
+::wxYield();
+::wxYield();
+
                ImageFileArrayConst v = m_rImageFile.getArray();
                int xBase = m_nxGraph;
                int yBase = 0;
@@ -210,10 +204,12 @@ ReconstructDialog::showView (int iViewNumber, bool bBackprojectView)
                        }
                }
                wxImage image (m_nxImage, m_nyImage, imageData, true);
-               wxBitmap bitmap = image.ConvertToBitmap();
+               wxBitmap bitmap (image);
                m_pSGP->getDriver().idWX()->DrawBitmap(bitmap, xBase, yBase, false);
                delete imageData;
        }
+
+  ::wxYield();
 }
 
 bool