X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdlgprojections.cpp;h=de6d0e634fbb7ef7e0179fa9ea9ca614654e5cee;hb=484b9ac2ebf8f88dbe36bdc1d3a9c1b6a2b242eb;hp=8875fdad94873b216a2115fb8efdcbcf83129d1d;hpb=586af74e42519b0511311df711bab2b2be962629;p=ctsim.git diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp index 8875fda..de6d0e6 100644 --- a/src/dlgprojections.cpp +++ b/src/dlgprojections.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dlgprojections.cpp,v 1.5 2000/09/04 09:24:21 kevin Exp $ +** $Id: dlgprojections.cpp,v 1.7 2000/12/16 03:29:02 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 @@ -68,7 +68,7 @@ IMPLEMENT_CLASS(ProjectionsDialog, wxDialog) ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, const Phantom& rPhantom, const int iTrace, wxWindow *parent) - : wxDialog(parent, -1, "Collect Projections"), m_rScanner(rScanner), m_rProjections(rProj), m_rPhantom(rPhantom), m_pSGPDriver(NULL), m_pSGP(NULL), m_iTrace(iTrace), m_pDC(NULL), m_btnAbort(0), m_btnPause(0), m_btnStep(0) + : wxDialog(parent, -1, "Collect Projections", wxDefaultPosition), m_rScanner(rScanner), m_rProjections(rProj), m_rPhantom(rPhantom), 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; @@ -155,7 +155,7 @@ ProjectionsDialog::showView (int iViewNumber) if (m_iTrace >= Trace::TRACE_PLOT) { const DetectorArray& detArray = m_rProjections.getDetectorArray (iViewNumber); const DetectorValue* detValues = detArray.detValues(); - double detPos [detArray.nDet()]; + double* detPos = new double [detArray.nDet()]; for (int i = 0; i < detArray.nDet(); i++) detPos[i] = i; EZPlot ezplot (*m_pSGP); @@ -166,7 +166,8 @@ ProjectionsDialog::showView (int iViewNumber) ezplot.ezset("grid"); ezplot.ezset("box"); ezplot.addCurve (detValues, detPos, detArray.nDet()); - ezplot.plot(); + ezplot.plot(); + delete detPos; } } } @@ -181,7 +182,7 @@ ProjectionsDialog::projectView (int iViewNumber) showView (iViewNumber); wxYield(); // update the display if (m_iTrace >= Trace::TRACE_PLOT) { - sleep(1); + ::wxUsleep(500); } } else { m_state = Finished; // so that we return TRUE below and