X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdlgreconstruct.cpp;h=9dc63929363d804bf1ea90b2e4c6f2d566c80814;hp=d0be191674e6315011cdd02a9058bc22c91c39c5;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hpb=9f29c8b32c972db1178d6f8551d5cd57ceb67083

diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp
index d0be191..9dc6392 100644
--- 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.15 2001/01/28 19:10:18 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"
@@ -74,8 +65,11 @@ END_EVENT_TABLE()
 IMPLEMENT_CLASS(ReconstructDialog, wxDialog)
 
 
-ReconstructDialog::ReconstructDialog (Reconstructor& rReconstruct, const Projections& rProj, ImageFile& rIF, const int iTrace, wxWindow *parent)
-: wxDialog(parent, -1, "Reconstruction", wxDefaultPosition), m_rReconstructor(rReconstruct), m_rProjections(rProj), m_rImageFile(rIF), m_pSGPDriver(NULL), m_pSGP(NULL), m_iTrace(iTrace), m_pDC(NULL), m_btnAbort(0), m_btnPause(0), m_btnStep(0)
+ReconstructDialog::ReconstructDialog (Reconstructor& rReconstruct, const Projections& rProj, 
+                                      ImageFile& rIF, const int iTrace, wxWindow *parent)
+: wxDialog(parent, -1, "Reconstruction", wxDefaultPosition), m_rReconstructor(rReconstruct), 
+           m_rProjections(rProj), m_rImageFile(rIF), m_pSGPDriver(NULL), m_pSGP(NULL), 
+  m_iTrace(iTrace), m_pDC(NULL), m_btnAbort(0), m_btnPause(0), m_btnStep(0)
 {
     m_state = Continue;
     m_iLastView = -1;
@@ -118,13 +112,13 @@ ReconstructDialog::ReconstructDialog (Reconstructor& rReconstruct, const Project
     wxSize sizeDlg (m_nxGraph, m_nyGraph);
     m_nxImage = m_rImageFile.nx();
     if (m_nxImage > MAX_IMAGE_X)
-		m_nxImage = MAX_IMAGE_X;
+		   m_nxImage = MAX_IMAGE_X;
     m_nyImage = m_rImageFile.ny();
     if (m_nyImage > MAX_IMAGE_Y)
-		m_nyImage = MAX_IMAGE_Y;
+		   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;
@@ -166,15 +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->setViewport (0.0, 0.1, 0.66, 1.); // viewport equiv now done in subroutine
-		m_rReconstructor.reconstructView (iViewNumber, 1, m_pSGP, bBackprojectView);
+		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;
@@ -204,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