X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdlgreconstruct.cpp;h=d0be191674e6315011cdd02a9058bc22c91c39c5;hp=7fb47d22251416afccf40b523fd8faabeb35ceb9;hb=9f29c8b32c972db1178d6f8551d5cd57ceb67083;hpb=f46d464bb065716c6738c23a4d7e7dbedd0b93b9 diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp index 7fb47d2..d0be191 100644 --- a/src/dlgreconstruct.cpp +++ b/src/dlgreconstruct.cpp @@ -7,9 +7,9 @@ ** Date Started: August 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dlgreconstruct.cpp,v 1.11 2000/12/18 06:32:13 kevin Exp $ +** $Id: dlgreconstruct.cpp,v 1.15 2001/01/28 19:10:18 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 @@ -55,13 +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; - + + +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) @@ -130,20 +130,20 @@ ReconstructDialog::ReconstructDialog (Reconstructor& rReconstruct, const Project m_iClientY = sizeDlg.y; SetClientSize (sizeDlg); - Centre(wxCENTER_FRAME | wxBOTH); - - if ( m_parentTop ) - m_parentTop->Enable(FALSE); - - Show(TRUE); - Enable(TRUE); // enable this window - + Centre(wxCENTER_FRAME | wxBOTH); + + if ( m_parentTop ) + m_parentTop->Enable(FALSE); + + Show(TRUE); + Enable(TRUE); // enable this window + m_bitmap.Create (m_iClientX, m_iClientY); // save a copy of screen - m_pDC = dynamic_cast (new wxClientDC (this)); - int x, y; - this->GetClientSize(&x, &y); - m_pSGPDriver = new SGPDriver (m_pDC, x, y); - m_pSGP = new SGP (*m_pSGPDriver); + m_pDC = dynamic_cast (new wxClientDC (this)); + int x, y; + this->GetClientSize(&x, &y); + m_pSGPDriver = new SGPDriver (m_pDC, x, y); + m_pSGP = new SGP (*m_pSGPDriver); wxYield(); // Update the display @@ -152,13 +152,15 @@ ReconstructDialog::ReconstructDialog (Reconstructor& rReconstruct, const Project void ReconstructDialog::showView (int iViewNumber, bool bBackprojectView) -{ +{ if ( iViewNumber < m_rProjections.nView() ) { m_iLastView = iViewNumber; - ::wxYield(); // update the display - m_pSGP->eraseWindow(); - Refresh(); - + ::wxYield(); // update the display + m_pSGP->eraseWindow(); + m_btnPause->Refresh(); + m_btnStep->Refresh(); + m_btnAbort->Refresh(); + char szProgress [256]; snprintf (szProgress, sizeof(szProgress), "Reconstructing View %d (%.1f%%)", iViewNumber, 100 * iViewNumber / static_cast(m_rProjections.nView())); m_pSGP->setViewport (0, 0, 1, 1); @@ -170,7 +172,7 @@ ReconstructDialog::showView (int iViewNumber, bool bBackprojectView) m_pSGP->drawText (szProgress); m_pSGP->setTextSize (dCharHeight); - m_pSGP->setViewport (0.0, 0.1, 0.66, 1.); + // m_pSGP->setViewport (0.0, 0.1, 0.66, 1.); // viewport equiv now done in subroutine m_rReconstructor.reconstructView (iViewNumber, 1, m_pSGP, bBackprojectView); ImageFileArrayConst v = m_rImageFile.getArray(); @@ -200,7 +202,7 @@ ReconstructDialog::showView (int iViewNumber, bool bBackprojectView) int baseAddr = ((m_nyImage - 1 - iy) * m_nxImage + ix2) * 3; imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity; } - } + } wxImage image (m_nxImage, m_nyImage, imageData, true); wxBitmap bitmap = image.ConvertToBitmap(); m_pSGP->getDriver().idWX()->DrawBitmap(bitmap, xBase, yBase, false); @@ -257,15 +259,15 @@ ReconstructDialog::OnPause (wxCommandEvent& event) // this means that the count down is already finished and we're being // shown as a modal dialog - so just let the default handler do the job event.Skip(); - } else if (m_state == Continue) { - m_memoryDC.SelectObject (m_bitmap); // in memoryDC - m_pSGP->setDC (&m_memoryDC); - m_memoryDC.SetFont (*wxSWISS_FONT); - showView (m_iLastView, false); + } else if (m_state == Continue) { + m_memoryDC.SelectObject (m_bitmap); // in memoryDC + m_pSGP->setDC (&m_memoryDC); + m_memoryDC.SetFont (*wxSWISS_FONT); + showView (m_iLastView, false); m_state = Paused; m_btnPause->SetLabel (wxString("Resume")); - m_pSGP->setDC (m_pDC); - m_memoryDC.SelectObject(wxNullBitmap); + m_pSGP->setDC (m_pDC); + m_memoryDC.SelectObject(wxNullBitmap); } else if (m_state == Paused) { m_state = Continue; m_btnPause->SetLabel (wxString("Pause")); @@ -278,24 +280,24 @@ ReconstructDialog::OnStep (wxCommandEvent& event) { if ( m_state == Finished ) { event.Skip(); - } else if (m_state == Continue) { - m_memoryDC.SelectObject (m_bitmap); // in memoryDC - m_pSGP->setDC (&m_memoryDC); - m_memoryDC.SetFont (*wxSWISS_FONT); - showView (m_iLastView, false); + } else if (m_state == Continue) { + m_memoryDC.SelectObject (m_bitmap); // in memoryDC + m_pSGP->setDC (&m_memoryDC); + m_memoryDC.SetFont (*wxSWISS_FONT); + showView (m_iLastView, false); m_state = Paused; m_btnPause->SetLabel (wxString("Resume")); - m_pSGP->setDC (m_pDC); - m_memoryDC.SelectObject(wxNullBitmap); - Refresh(); + m_pSGP->setDC (m_pDC); + m_memoryDC.SelectObject(wxNullBitmap); + Refresh(); } else if (m_state == Paused) { - m_memoryDC.SelectObject (m_bitmap); // in memoryDC - m_pSGP->setDC (&m_memoryDC); - m_memoryDC.SetFont (*wxSWISS_FONT); + m_memoryDC.SelectObject (m_bitmap); // in memoryDC + m_pSGP->setDC (&m_memoryDC); + m_memoryDC.SetFont (*wxSWISS_FONT); reconstructView (m_iLastView + 1); - m_pSGP->setDC (m_pDC); - m_memoryDC.SelectObject(wxNullBitmap); - Refresh(); + m_pSGP->setDC (m_pDC); + m_memoryDC.SelectObject(wxNullBitmap); + Refresh(); } } @@ -311,11 +313,11 @@ void ReconstructDialog::OnClose(wxCloseEvent& event) void ReconstructDialog::OnPaint (wxPaintEvent& event) -{ - wxPaintDC paintDC (this); +{ + wxPaintDC paintDC (this); if (m_state == Paused) { - paintDC.DrawBitmap (m_bitmap, 0, 0, false); - } + paintDC.DrawBitmap (m_bitmap, 0, 0, false); + } }