X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=3df51fa5e3c94227185b8acb602024602de88d15;hp=1cd730e7db5dc5f0e129b7312853629e05c64633;hb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10 diff --git a/src/views.cpp b/src/views.cpp index 1cd730e..3df51fa 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.16 2000/08/25 15:59:13 kevin Exp $ +** $Id: views.cpp,v 1.18 2000/08/31 08:38:58 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 @@ -51,6 +51,7 @@ #include "docs.h" #include "views.h" #include "dialogs.h" +#include "dlgprojections.h" #include #include "backprojectors.h" @@ -151,7 +152,7 @@ void ImageFileView::OnScaleAuto (wxCommandEvent& event) { const ImageFile& rIF = GetDocument()->getImageFile(); - DialogAutoScaleParameters dialogAutoScale (m_frame, rIF); + DialogAutoScaleParameters dialogAutoScale (m_frame, rIF, m_dAutoScaleFactor); int iRetVal = dialogAutoScale.ShowModal(); if (iRetVal == wxID_OK) { m_bMinSpecified = true; @@ -160,6 +161,7 @@ ImageFileView::OnScaleAuto (wxCommandEvent& event) dialogAutoScale.getMinMax (&dMin, &dMax); m_dMinPixel = dMin; m_dMaxPixel = dMax; + m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor(); OnUpdate (this, NULL); } } @@ -214,9 +216,9 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) 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"); file_menu->Append(wxID_SAVEAS, "Save &As..."); + file_menu->Append(wxID_CLOSE, "&Close"); file_menu->AppendSeparator(); file_menu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); @@ -251,9 +253,11 @@ bool ImageFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_frame = CreateChildFrame(doc, this); + SetFrame(m_frame); m_bMinSpecified = false; m_bMaxSpecified = false; + m_dAutoScaleFactor = 1.; int width, height; m_frame->GetClientSize(&width, &height); @@ -402,12 +406,13 @@ PhantomView::OnProperties (wxCommandEvent& event) void PhantomView::OnProjections (wxCommandEvent& event) { - DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., 1., 1., Scanner::GEOMETRY_PARALLEL); + DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., 1., 1., Scanner::GEOMETRY_PARALLEL, Trace::TRACE_NONE); int retVal = dialogProjection.ShowModal(); if (retVal == wxID_OK) { int nDet = dialogProjection.getNDet(); int nView = dialogProjection.getNView(); int nSamples = dialogProjection.getNSamples(); + int iTrace = dialogProjection.getTrace(); double dRotAngle = dialogProjection.getRotAngle(); double dFocalLengthRatio = dialogProjection.getFocalLengthRatio(); double dFieldOfViewRatio = dialogProjection.getFieldOfViewRatio(); @@ -424,25 +429,34 @@ PhantomView::OnProjections (wxCommandEvent& event) } rProj.initFromScanner (theScanner); -#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(&dc), x, y); - SGP sgp (driver); - for (int iView = 0; iView < rProj.nView(); iView++) { - theScanner.collectProjections (rProj, rPhantom, iView, 1, true, TRACE_RAYS, &sgp); - } -#else - theScanner.collectProjections (rProj, rPhantom); -#endif + if (iTrace > Trace::TRACE_CONSOLE) { + ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, iTrace, dynamic_cast(m_frame)); + for (int iView = 0; iView < rProj.nView(); iView++) { + ::wxYield(); + ::wxYield(); + if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { + pProjectionDoc->DeleteAllViews(); + return; + } + ::wxYield(); + ::wxYield(); + while (dialogProjections.isPaused()) { + ::wxYield(); + ::wxUsleep(50); + } + } + } else + theScanner.collectProjections (rProj, rPhantom, iTrace); pProjectionDoc->Modify(true); pProjectionDoc->UpdateAllViews(this); + if (wxView* pView = pProjectionDoc->GetFirstView()) + if (wxFrame* pFrame = pView->GetFrame()) { + pFrame->SetFocus(); + } ostringstream os; os << "Projections for " << rPhantom.name() << ": nDet=" << nDet << ", nView=" << nView << ", nSamples=" << nSamples << ", RotAngle=" << dRotAngle << ", FocalLengthRatio=" << dFocalLengthRatio << ", FieldOfViewRatio=" << dFieldOfViewRatio << ", Geometry=" << sGeometry.c_str() << "\n"; + rProj.setRemark (os.str()); *theApp->getLog() << os.str().c_str(); } } @@ -466,7 +480,7 @@ PhantomView::OnRasterize (wxCommandEvent& event) ImageFile& imageFile = pRasterDoc->getImageFile(); imageFile.setArraySize (xSize, ySize); - rPhantom.convertToImagefile (imageFile, nSamples, TRACE_NONE); + rPhantom.convertToImagefile (imageFile, nSamples, Trace::TRACE_NONE); pRasterDoc->Modify(true); pRasterDoc->UpdateAllViews(this); @@ -538,7 +552,8 @@ bool PhantomView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_frame = CreateChildFrame(doc, this); - + SetFrame(m_frame); + int width, height; m_frame->GetClientSize(&width, &height); m_frame->SetTitle("PhantomView"); @@ -637,7 +652,7 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) { const Projections& rProj = GetDocument()->getProjections(); ostringstream os; - os << "ProjectionFile " << rProj.getFilename() << ": Number of Detectors = " << rProj.nDet() << ", Number of Views = " << rProj.nView() << "\n"; + rProj.printScanInfo(os); *theApp->getLog() << os.str().c_str(); } @@ -667,7 +682,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) ImageFile& imageFile = pReconDoc->getImageFile(); const Projections& rProj = GetDocument()->getProjections(); imageFile.setArraySize (xSize, ySize); - rProj.reconstruct (imageFile, optFilterName.c_str(), optFilterParam, optFilterMethodName.c_str(), optZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), optInterpParam, optBackprojectName.c_str(), TRACE_NONE); + rProj.reconstruct (imageFile, optFilterName.c_str(), optFilterParam, optFilterMethodName.c_str(), optZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), optInterpParam, optBackprojectName.c_str(), Trace::TRACE_NONE); pReconDoc->Modify(true); pReconDoc->UpdateAllViews(this); ostringstream os; @@ -703,6 +718,8 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); file_menu->Append(wxID_OPEN, "&Open..."); + file_menu->Append(wxID_SAVE, "&Save"); + file_menu->Append(wxID_SAVEAS, "Save &As..."); file_menu->Append(wxID_CLOSE, "&Close"); file_menu->AppendSeparator(); @@ -739,6 +756,7 @@ bool ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_frame = CreateChildFrame(doc, this); + SetFrame(m_frame); int width, height; m_frame->GetClientSize(&width, &height);