X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdlgreconstruct.cpp;h=4fd7b1af7e8bc971c1433520aee74a0418cd6dbd;hp=640337a707069f771cd560c774b7c9003533249b;hb=c00c639073653fac7463a88f2b000f263236550d;hpb=e9222e8a8190ca48f30a1359badae06bcb200210 diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp index 640337a..4fd7b1a 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.10 2000/12/18 05:40:30 kevin Exp $ +** $Id: dlgreconstruct.cpp,v 1.13 2001/01/02 16:02:13 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,40 +130,37 @@ 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_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_pSGP->getDriver().idWX()->setDC (&m_pDC); wxYield(); // Update the display m_pSGPDriver->idWX()->SetFont(*wxSWISS_FONT); -#ifdef __WXMAC__ - MacUpdateImmediately(); -#endif } void ReconstructDialog::showView (int iViewNumber, bool bBackprojectView) -{ - // m_pSGP->setTextSize(0.01); +{ 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); @@ -205,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); @@ -214,14 +211,14 @@ ReconstructDialog::showView (int iViewNumber, bool bBackprojectView) } bool -ReconstructDialog::reconstructView (int iViewNumber) +ReconstructDialog::reconstructView (int iViewNumber, bool bBackproject) { if (iViewNumber <= m_iLastView) // have already done this view return true; if (iViewNumber < m_rProjections.nView()) { ::wxYield(); // update the display - showView (iViewNumber, true); + showView (iViewNumber, bBackproject); ::wxYield(); // update the display if (m_iTrace >= Trace::TRACE_PLOT) { ::wxUsleep(250); @@ -230,10 +227,6 @@ ReconstructDialog::reconstructView (int iViewNumber) m_state = Finished; // so that we return TRUE below and } // that [Cancel] handler knew what to do -#ifdef __WXMAC__ - MacUpdateImmediately(); -#endif - ::wxYield(); // update the display return m_state != Cancelled; } @@ -266,16 +259,16 @@ 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); } else if (m_state == Paused) { -// m_pSGP->setDC (m_pDC); -// m_memoryDC.SelectObject(wxNullBitmap); m_state = Continue; m_btnPause->SetLabel (wxString("Pause")); } @@ -287,17 +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(); } else if (m_state == Paused) { -// m_pSGP->setDC (m_pDC); -// m_memoryDC.SelectObject(wxNullBitmap); + 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(); } } @@ -313,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); + } }