X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdlgreconstruct.cpp;h=4729ee9c3930aad1542da8bf967d841a04e7d77b;hb=59d0884ed43a119a1c57fca65689ea9ee55ccfa8;hp=b7ad2c4dee7d28343a28394cd22e7147f25ad225;hpb=586af74e42519b0511311df711bab2b2be962629;p=ctsim.git

diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp
index b7ad2c4..4729ee9 100644
--- a/src/dlgreconstruct.cpp
+++ b/src/dlgreconstruct.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: dlgreconstruct.cpp,v 1.4 2000/09/04 09:24:21 kevin Exp $
+**  $Id: dlgreconstruct.cpp,v 1.7 2000/12/16 03:39:06 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
@@ -36,7 +36,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/button.h"
@@ -48,7 +47,6 @@
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/image.h"
-#endif
 
 #include "dlgreconstruct.h"
 #include <algorithm>
@@ -57,6 +55,13 @@
 
 static const int LAYOUT_X_MARGIN = 4;
 static const int LAYOUT_Y_MARGIN = 4;
+
+
+const int ReconstructDialog::ID_BTN_PAUSE = 19998;
+const int ReconstructDialog::ID_BTN_STEP = 19999;
+const int ReconstructDialog::MAX_IMAGE_X = 400;
+const int ReconstructDialog::MAX_IMAGE_Y = 400;
+
 
 BEGIN_EVENT_TABLE(ReconstructDialog, wxDialog)
    EVT_BUTTON(wxID_CANCEL, ReconstructDialog::OnCancel)
@@ -70,7 +75,7 @@ IMPLEMENT_CLASS(ReconstructDialog, wxDialog)
 
 
 ReconstructDialog::ReconstructDialog (Reconstructor& rReconstruct, const Projections& rProj, ImageFile& rIF, const int iTrace, wxWindow *parent)
-    : wxDialog(parent, -1, "Reconstruction"), 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)
+    : 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;
@@ -189,13 +194,13 @@ ReconstructDialog::showView (int iViewNumber)
     }
     unsigned char* imageData = new unsigned char [m_nxImage * m_nyImage * 3];
     double dScale = 255 / (maxValue - minValue);
-    for (int ix = 0; ix < m_nxImage; ix++) {
+    for (int ix2 = 0; ix2 < m_nxImage; ix2++) {
 	for (int iy = 0; iy < m_nyImage; iy++) {
-	    double dPixel = v[ix][iy];
+	    double dPixel = v[ix2][iy];
 	    dPixel = (dPixel - minValue) * dScale;
 	    int intensity = nearest<int>(dPixel);
 	    intensity = clamp (intensity, 0, 255);
-	    int baseAddr = ((m_nyImage - 1 - iy) * m_nxImage + ix) * 3;
+	    int baseAddr = ((m_nyImage - 1 - iy) * m_nxImage + ix2) * 3;
 	    imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity;
 	}
     }