** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.6 2000/07/19 04:33:27 kevin Exp $
+** $Id: views.cpp,v 1.13 2000/08/02 18:06:00 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
if (pt.x >= 0 && pt.x < nx && pt.y >= 0 & pt.y < ny) {
ostringstream os;
- os << "Image value (" << pt.x << "," << pt.y << ") = " << v[pt.x][pt.y] << "\n";
+ os << "Image value (" << pt.x << "," << pt.y << ") = " << v[pt.x][ny - 1 - pt.y] << "\n";
*theApp->getLog() << os.str().c_str();
} else
*theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n";
wxMenu *file_menu = new wxMenu;
- file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "&Create Phantom...");
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
file_menu->Append(wxID_OPEN, "&Open...");
file_menu->Append(wxID_CLOSE, "&Close");
file_menu->Append(wxID_SAVE, "&Save");
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;
// PhantomCanvas
PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
- : wxPanel(frame, -1, pos, size, style)
+ : wxScrolledWindow(frame, -1, pos, size, style)
{
m_pView = v;
}
m_pView->OnDraw(& dc);
}
+
// PhantomView
IMPLEMENT_DYNAMIC_CLASS(PhantomView, wxView)
void
PhantomView::OnProperties (wxCommandEvent& event)
{
- const Phantom::PhantomID idPhantom = GetDocument()->getPhantomID();
+ const int idPhantom = GetDocument()->getPhantomID();
const string& namePhantom = GetDocument()->getPhantomName();
ostringstream os;
- os << "Phantom " << namePhantom << " (" << static_cast<int>(idPhantom) << ")\n";
+ os << "Phantom " << namePhantom << " (" << idPhantom << ")\n";
*theApp->getLog() << os.str().c_str();
#if DEBUG
const Phantom& rPhantom = GetDocument()->getPhantom();
void
PhantomView::OnProjections (wxCommandEvent& event)
{
- DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., Scanner::GEOMETRY_PARALLEL_STR);
+ DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., Scanner::GEOMETRY_PARALLEL);
int retVal = dialogProjection.ShowModal();
if (retVal == wxID_OK) {
int nDet = dialogProjection.getNDet();
int nView = dialogProjection.getNView();
int nSamples = dialogProjection.getNSamples();
double dRotAngle = dialogProjection.getRotAngle();
- string sGeometry = dialogProjection.getGeometry();
+ wxString sGeometry = dialogProjection.getGeometry();
if (nDet > 0 && nView > 0 && sGeometry != "") {
const Phantom& rPhantom = GetDocument()->getPhantom();
ProjectionFileDocument* pProjectionDoc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT));
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
+ wxFrame frame (m_frame, -1, "", wxDefaultPosition, wxSize(500,500));
+ frame.Show();
+ wxClientDC dc (&frame);
+ int x, y;
+ frame.GetClientSize(&x, &y);
+ SGPDriver driver (dynamic_cast<wxDC*>(&dc), x, y);
+ SGP sgp (driver);
+ theScanner.collectProjections (rProj, rPhantom, 0, TRACE_PHM, &sgp);
+#else
+ theScanner.collectProjections (rProj, rPhantom);
+#endif
+
pProjectionDoc->Modify(true);
pProjectionDoc->UpdateAllViews(this);
ostringstream os;
- os << "Projections for " << rPhantom.name() << ": nDet=" << nDet << ", nView=" << nView << ", nSamples=" << nSamples << ", RotAngle=" << dRotAngle << ", Geometry=" << sGeometry << "\n";
+ os << "Projections for " << rPhantom.name() << ": nDet=" << nDet << ", nView=" << nView << ", nSamples=" << nSamples << ", RotAngle=" << dRotAngle << ", Geometry=" << sGeometry.c_str() << "\n";
*theApp->getLog() << os.str().c_str();
}
}
wxMenu *file_menu = new wxMenu;
- file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "&Create Phantom...");
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
file_menu->Append(wxID_OPEN, "&Open...");
file_menu->Append(wxID_CLOSE, "&Close");
m_frame->Show(true);
Activate(true);
-
- return true;
-}
-void
-PhantomView::OnDraw (wxDC* dc)
-{
- // if (m_bitmap.Ok())
- // dc->DrawBitmap (m_bitmap, 0, 0, false);
+ return true;
}
return true;
}
+void
+PhantomView::OnDraw (wxDC* dc)
+{
+ int xsize, ysize;
+ m_canvas->GetClientSize (&xsize, &ysize);
+ SGPDriver driver (dc, xsize, ysize);
+ SGP sgp (driver);
+ const Phantom& rPhantom = GetDocument()->getPhantom();
+ sgp.setColor (C_RED);
+ rPhantom.show (sgp);
+}
// ProjectionCanvas
void
ProjectionFileView::OnReconstruct (wxCommandEvent& event)
{
- DialogGetReconstructionParameters dialogReconstruction (m_frame, 256, 256, SignalFilter::FILTER_ABS_BANDLIMIT_STR, 1., SignalFilter::FILTER_METHOD_CONVOLUTION_STR, 3, Backprojector::INTERP_LINEAR_STR, 1, Backprojector::BPROJ_IDIFF3_STR);
+ DialogGetReconstructionParameters dialogReconstruction (m_frame, 256, 256, SignalFilter::FILTER_ABS_BANDLIMIT, 1., SignalFilter::FILTER_METHOD_CONVOLUTION, 3, Backprojector::INTERP_LINEAR, 1, Backprojector::BPROJ_IDIFF3);
int retVal = dialogReconstruction.ShowModal();
if (retVal == wxID_OK) {
int xSize = dialogReconstruction.getXSize();
int ySize = dialogReconstruction.getYSize();
- string optFilterName = dialogReconstruction.getFilterName();
+ wxString optFilterName = dialogReconstruction.getFilterName();
double optFilterParam = dialogReconstruction.getFilterParam();
- string optFilterMethodName = dialogReconstruction.getFilterMethodName();
+ wxString optFilterMethodName = dialogReconstruction.getFilterMethodName();
int optZeropad = dialogReconstruction.getZeropad();
- string optInterpName = dialogReconstruction.getInterpName();
+ wxString optInterpName = dialogReconstruction.getInterpName();
int optInterpParam = dialogReconstruction.getInterpParam();
- string optBackprojectName = dialogReconstruction.getBackprojName();
+ wxString optBackprojectName = dialogReconstruction.getBackprojectName();
if (xSize > 0 && ySize > 0) {
ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
ImageFile& imageFile = pReconDoc->getImageFile();
pReconDoc->Modify(true);
pReconDoc->UpdateAllViews(this);
ostringstream os;
- os << "Reconstruct " << rProj.getFilename() << ": xSize=" << xSize << ", ySize=" << ySize << ", Filter=" << optFilterName << ", FilterParam=" << optFilterParam << ", FilterMethod=" << optFilterMethodName << ", Zeropad=" << optZeropad << ", Interpolation=" << optInterpName << ", InterpolationParam=" << optInterpParam << ", Backprojection=" << optBackprojectName << "\n";
+ os << "Reconstruct " << rProj.getFilename() << ": xSize=" << xSize << ", ySize=" << ySize << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << optFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", Zeropad=" << optZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << optInterpParam << ", Backprojection=" << optBackprojectName.c_str() << "\n";
*theApp->getLog() << os.str().c_str();
}
}
wxMenu *file_menu = new wxMenu;
- file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "&Create Phantom...");
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
file_menu->Append(wxID_OPEN, "&Open...");
file_menu->Append(wxID_CLOSE, "&Close");