X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=7f12594dee0b52802c19b99912e360e563ee35e0;hb=577de4ac906cfd4215f2c6e79e21bcceed321401;hp=8ec1df2bff80bf1e17529210fd503e4bdf1e312b;hpb=711cae0ee02e046370fdb4d6c6f440596ff71980;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index 8ec1df2..7f12594 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.cpp,v 1.9 2000/07/28 08:28:08 kevin Exp $ +** $Id: views.cpp,v 1.12 2000/07/31 23:07:23 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 @@ -297,7 +297,7 @@ ImageFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity; } } - wxImage image (ny, nx, imageData, true); + wxImage image (nx, ny, imageData, true); m_bitmap = image.ConvertToBitmap(); delete imageData; int xSize = nx; @@ -405,7 +405,21 @@ PhantomView::OnProjections (wxCommandEvent& event) Projections& rProj = pProjectionDoc->getProjections(); Scanner theScanner (rPhantom, sGeometry.c_str(), nDet, nView, nSamples, dRotAngle); rProj.initFromScanner (theScanner); - theScanner.collectProjections (rProj, rPhantom, 0, TRACE_NONE); + +#if 1 + //wxScrolledWindow win (m_canvas, -1, wxDefaultPosition, wxSize(500,500), 0); + //win.SetSize (500, 500); + // wxClientDC dc (&win); + //win.PrepareDC (); + //win.Show(); + wxClientDC dc (m_canvas); + SGPDriver driver ((wxDC*) &dc, "Projections", 400, 400); + SGP sgp (driver); + theScanner.collectProjections (rProj, rPhantom, 0, TRACE_PHM, &sgp); +#else + theScanner.collectProjections (rProj, rPhantom, 0, TRACE_PHM); +#endif + pProjectionDoc->Modify(true); pProjectionDoc->UpdateAllViews(this); ostringstream os; @@ -562,7 +576,8 @@ PhantomView::OnDraw (wxDC* dc) SGPDriver driver (dc, "", xsize, ysize); SGP sgp (driver); const Phantom& rPhantom = GetDocument()->getPhantom(); - rPhantom.draw (sgp); + sgp.setColor (C_RED); + rPhantom.show (sgp); } // ProjectionCanvas