** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.121 2001/02/27 03:59:30 kevin Exp $
+** $Id: views.cpp,v 1.130 2001/03/10 23:14:16 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
ImageFileView::ImageFileView()
: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false)
{
- m_iDefaultExportFormatID = ImageFile::FORMAT_PNG;
+ m_iDefaultExportFormatID = ImageFile::EXPORT_FORMAT_PNG;
}
ImageFileView::~ImageFileView()
m_pFileMenu->Append(wxID_PRINT, "&Print...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Preview");
+ m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
DialogExportParameters dialogExport (getFrameForChild(), m_iDefaultExportFormatID);
if (dialogExport.ShowModal() == wxID_OK) {
wxString strFormatName (dialogExport.getFormatName ());
- m_iDefaultExportFormatID = ImageFile::convertFormatNameToID (strFormatName.c_str());
+ m_iDefaultExportFormatID = ImageFile::convertExportFormatNameToID (strFormatName.c_str());
wxString strExt;
wxString strWildcard;
- if (m_iDefaultExportFormatID == ImageFile::FORMAT_PGM || m_iDefaultExportFormatID == ImageFile::FORMAT_PGMASCII) {
+ if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PGM || m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PGMASCII) {
strExt = ".pgm";
strWildcard = "PGM Files (*.pgm)|*.pgm";
}
#ifdef HAVE_PNG
- else if (m_iDefaultExportFormatID == ImageFile::FORMAT_PNG || m_iDefaultExportFormatID == ImageFile::FORMAT_PNG16) {
+ else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PNG || m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PNG16) {
strExt = ".png";
strWildcard = "PNG Files (*.png)|*.png";
}
#endif
+#ifdef HAVE_CTN_DICOM
+ else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_DICOM) {
+ strExt = "";
+ strWildcard = "DICOM Files (*.*)|*.*";
+ }
+#endif
+ else {
+ strExt = "";
+ strWildcard = "Miscellaneous (*.*)|*.*";
+ }
const wxString& strFilename = wxFileSelector (wxString("Export Filename"), wxString(""),
wxString(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE);
rPlotFile.addColumn (1, pYReal);
rPlotFile.addColumn (2, pYImag);
rPlotFile.addColumn (3, pYMag);
- for (int iL = 0; iL < rIF.nLabels(); iL++)
+ for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
os << " FFT Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str();
*theApp->getLog() << os.str().c_str() << "\n";
rPlotFile.addColumn (1, pYReal);
rPlotFile.addColumn (2, pYImag);
rPlotFile.addColumn (3, pYMag);
- for (int iL = 0; iL < rIF.nLabels(); iL++)
+ for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
os << " FFT Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str();
*theApp->getLog() << os.str().c_str() << "\n";
#if defined(DEBUG) || defined(_DEBUG)
m_iDefaultNDet = 165;
m_iDefaultNView = 180;
+ m_iDefaultNSample = 1;
#else
m_iDefaultNDet = 367;
m_iDefaultNView = 320;
-#endif
m_iDefaultNSample = 2;
+#endif
m_dDefaultRotation = 1;
m_dDefaultFocalLength = 2;
+ m_dDefaultCenterDetectorLength = 2;
m_dDefaultViewRatio = 1;
m_dDefaultScanRatio = 1;
m_iDefaultGeometry = Scanner::GEOMETRY_PARALLEL;
{
DialogGetProjectionParameters dialogProjection (getFrameForChild(),
m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation,
- m_dDefaultFocalLength, m_dDefaultViewRatio, m_dDefaultScanRatio, m_iDefaultGeometry,
- m_iDefaultTrace);
+ m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio,
+ m_iDefaultGeometry, m_iDefaultTrace);
int retVal = dialogProjection.ShowModal();
if (retVal != wxID_OK)
return;
m_iDefaultTrace = dialogProjection.getTrace();
m_dDefaultRotation = dialogProjection.getRotAngle();
m_dDefaultFocalLength = dialogProjection.getFocalLengthRatio();
+ m_dDefaultCenterDetectorLength = dialogProjection.getCenterDetectorLengthRatio();
m_dDefaultViewRatio = dialogProjection.getViewRatio();
m_dDefaultScanRatio = dialogProjection.getScanRatio();
wxString sGeometry = dialogProjection.getGeometry();
const Phantom& rPhantom = GetDocument()->getPhantom();
Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample,
- dRotationRadians, m_dDefaultFocalLength, m_dDefaultViewRatio, m_dDefaultScanRatio);
+ dRotationRadians, m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio);
if (theScanner.fail()) {
wxString msg = "Failed making scanner\n";
msg += theScanner.failMessage().c_str();
os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet
<< ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample
<< ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength
+ << ", CenterDetectorLengthRatio=" << m_dDefaultCenterDetectorLength
<< ", ViewRatio=" << m_dDefaultViewRatio << ", ScanRatio=" << m_dDefaultScanRatio
<< ", Geometry=" << sGeometry.c_str() << ", FanBeamAngle=" <<
convertRadiansToDegrees (theScanner.fanBeamAngle());
}
}
} else {
- if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) {
+#if HAVE_WXTHREADS
+ if (theApp->getUseBackgroundTasks()) {
ProjectorSupervisorThread* pProjector = new ProjectorSupervisorThread (this, m_iDefaultNDet,
m_iDefaultNView, sGeometry.c_str(), m_iDefaultNSample, dRotationRadians,
- m_dDefaultFocalLength, m_dDefaultViewRatio, m_dDefaultScanRatio, os.str().c_str());
+ m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio, os.str().c_str());
if (pProjector->Create() != wxTHREAD_NO_ERROR) {
sys_error (ERR_SEVERE, "Error creating projector thread");
delete pProjector;
pProjector->SetPriority(60);
pProjector->Run();
return;
- } else {
+ } else
+#endif // HAVE_WXTHREADS
+ {
pProj = new Projections;
pProj->initFromScanner (theScanner);
wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT );
<< m_iDefaultRasterNY << ", ViewRatio=" << m_dDefaultRasterViewRatio << ", nSamples="
<< m_iDefaultRasterNSamples;;
- if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) {
+#if HAVE_WXTHREADS
+ if (theApp->getUseBackgroundTasks()) {
RasterizerSupervisorThread* pThread = new RasterizerSupervisorThread (this, m_iDefaultRasterNX, m_iDefaultRasterNY,
- m_dDefaultRasterViewRatio, m_iDefaultRasterNSamples, os.str().c_str());
+ m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio, os.str().c_str());
if (pThread->Create() != wxTHREAD_NO_ERROR) {
*theApp->getLog() << "Error creating rasterizer thread\n";
return;
}
pThread->SetPriority (60);
pThread->Run();
- } else {
+ } else
+#endif
+ {
ImageFile* pImageFile = new ImageFile (m_iDefaultRasterNX, m_iDefaultRasterNY);
wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"),
pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT );
m_pFileMenu->Append(wxID_PRINT, "&Print...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
+ m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
EVT_MENU(PJMENU_RECONSTRUCT_FOURIER, ProjectionFileView::OnReconstructFourier)
EVT_MENU(PJMENU_CONVERT_POLAR, ProjectionFileView::OnConvertPolar)
EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar)
+EVT_MENU(PJMENU_PLOT_TTHETA_SAMPLING, ProjectionFileView::OnPlotTThetaSampling)
END_EVENT_TABLE()
ProjectionFileView::ProjectionFileView()
ImageFileDocument* pPolarDoc = theApp->newImageDoc();
ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY);
m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str());
- if (! rProj.convertPolar (*pIF, m_iDefaultPolarInterpolation)) {
+
+ if (! rProj.convertPolar (*pIF, m_iDefaultPolarInterpolation)) {
delete pIF;
*theApp->getLog() << "Error converting to Polar\n";
return;
}
+
+
pPolarDoc = theApp->newImageDoc ();
if (! pPolarDoc) {
sys_error (ERR_SEVERE, "Unable to create image file");
}
}
+void
+ProjectionFileView::OnPlotTThetaSampling (wxCommandEvent& event)
+{
+ Projections& rProj = GetDocument()->getProjections();
+ ParallelRaysums parallel (&rProj);
+ PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
+ PlotFile& rPlot = pPlotDoc->getPlotFile();
+ ParallelRaysumCoordinate** ppCoord = parallel.getCoordinates();
+ double* pdT = new double [parallel.getNumCoordinates()];
+ double* pdTheta = new double [parallel.getNumCoordinates()];
+ for (int i = 0; i < parallel.getNumCoordinates(); i++) {
+ pdT[i] = (*ppCoord)->m_dT;
+ pdTheta[i] = (*ppCoord)->m_dTheta;
+ ++ppCoord;
+ }
+ rPlot.setCurveSize (2, parallel.getNumCoordinates(), true);
+ rPlot.addEzsetCommand ("title T-Theta Sampling");
+ rPlot.addEzsetCommand ("xlabel T");
+ rPlot.addEzsetCommand ("ylabel Theta");
+ rPlot.addEzsetCommand ("curve 1");
+ if (rProj.nDet() < 50 && rProj.nView() < 50)
+ rPlot.addEzsetCommand ("symbol 1"); // x symbol
+ else
+ rPlot.addEzsetCommand ("symbol 6"); // point symbol
+ rPlot.addEzsetCommand ("noline");
+ rPlot.addColumn (0, pdT);
+ rPlot.addColumn (1, pdTheta);
+ delete pdT;
+ delete pdTheta;
+ if (theApp->getAskDeleteNewDocs())
+ pPlotDoc->Modify (true);
+ pPlotDoc->UpdateAllViews ();
+ pPlotDoc->getView()->OnUpdate (this, NULL);
+ pPlotDoc->getView()->getFrame()->Show(true);
+ return;
+}
+
void
ProjectionFileView::OnReconstructFourier (wxCommandEvent& event)
{
os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.c_str();
Timer timerRecon;
- ImageFile rImageFile;
+ ImageFile* pImageFile = NULL;
if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
- rImageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
- Reconstructor* pReconstructor = new Reconstructor (rProj, rImageFile, optFilterName.c_str(),
+ pImageFile = new ImageFile (m_iDefaultNX, m_iDefaultNY);
+ Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(),
m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(),
optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
- ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, rImageFile, m_iDefaultTrace, getFrameForChild());
+ ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, *pImageFile, m_iDefaultTrace, getFrameForChild());
for (int iView = 0; iView < rProj.nView(); iView++) {
::wxYield();
if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView, true)) {
delete pDlgReconstruct;
delete pReconstructor;
} else {
- if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) {
+#if HAVE_WXTHREADS
+ if (theApp->getUseBackgroundTasks()) {
ReconstructorSupervisorThread* pReconstructor = new ReconstructorSupervisorThread (this,
m_iDefaultNX, m_iDefaultNY, optFilterName.c_str(),
m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(),
pReconstructor->SetPriority (60);
pReconstructor->Run();
return;
- } else {
- rImageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
- Reconstructor* pReconstructor = new Reconstructor (rProj, rImageFile, optFilterName.c_str(),
+ } else
+#endif
+ {
+ pImageFile = new ImageFile (m_iDefaultNX, m_iDefaultNY);
+ Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(),
m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(),
optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
}
pReconstructor->postProcessing();
delete pReconstructor;
- ImageFileDocument* pReconDoc = theApp->newImageDoc();
- if (! pReconDoc) {
- sys_error (ERR_SEVERE, "Unable to create image file");
- return;
- }
}
}
ImageFileDocument* pReconDoc = theApp->newImageDoc();
sys_error (ERR_SEVERE, "Unable to create image file");
return;
}
- pReconDoc->setImageFile (&rImageFile);
+ pReconDoc->setImageFile (pImageFile);
if (theApp->getAskDeleteNewDocs())
pReconDoc->Modify (true);
pReconDoc->UpdateAllViews (this);
rasterView->getFrame()->Show(true);
}
*theApp->getLog() << os.str().c_str() << "\n";
- rImageFile.labelAdd (rProj.getLabel());
- rImageFile.labelAdd (os.str().c_str(), timerRecon.timerEnd());
+ pImageFile->labelAdd (rProj.getLabel());
+ pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());
}
m_pFileMenu->Append(wxID_PRINT, "&Print...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
+ m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
wxMenu *convert_menu = new wxMenu;
convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L");
convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image...\tCtrl-M");
-
+
+ wxMenu* analyze_menu = new wxMenu;
+ analyze_menu->Append (PJMENU_PLOT_TTHETA_SAMPLING, "&Plot T-Theta Sampling\tCtrl-T");
+
wxMenu *reconstruct_menu = new wxMenu;
reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R", "Reconstruct image using filtered backprojection");
reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier");
menu_bar->Append (m_pFileMenu, "&File");
menu_bar->Append (convert_menu, "&Convert");
+ menu_bar->Append (analyze_menu, "&Analyze");
menu_bar->Append (reconstruct_menu, "&Reconstruct");
menu_bar->Append (help_menu, "&Help");
subframe->SetMenuBar(menu_bar);
subframe->Centre(wxBOTH);
- wxAcceleratorEntry accelEntries[5];
+ wxAcceleratorEntry accelEntries[6];
accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('L'), PJMENU_CONVERT_POLAR);
accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('M'), PJMENU_CONVERT_FFT_POLAR);
accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('R'), PJMENU_RECONSTRUCT_FBP);
accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('E'), PJMENU_RECONSTRUCT_FOURIER);
accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('I'), PJMENU_FILE_PROPERTIES);
- wxAcceleratorTable accelTable (5, accelEntries);
+ accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('T'), PJMENU_PLOT_TTHETA_SAMPLING);
+ wxAcceleratorTable accelTable (6, accelEntries);
subframe->SetAcceleratorTable (accelTable);
return subframe;
m_pFileMenu->Append(wxID_PRINT, "&Print...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
+ m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
const PlotFile& rPlotFile = GetDocument()->getPlotFile();
const int iNColumns = rPlotFile.getNumColumns();
const int iNRecords = rPlotFile.getNumRecords();
-
+ const bool bScatterPlot = rPlotFile.getIsScatterPlot();
+
if (iNColumns > 0 && iNRecords > 0) {
if (m_pEZPlot)
delete m_pEZPlot;
m_pEZPlot->ezset("box");
m_pEZPlot->ezset("grid");
-
- double* pdXaxis = new double [iNRecords];
- rPlotFile.getColumn (0, pdXaxis);
-
+
+ double* pdX = new double [iNRecords];
double* pdY = new double [iNRecords];
- for (int iCol = 1; iCol < iNColumns; iCol++) {
- rPlotFile.getColumn (iCol, pdY);
- m_pEZPlot->addCurve (pdXaxis, pdY, iNRecords);
- }
+ if (! bScatterPlot) {
+ rPlotFile.getColumn (0, pdX);
- delete pdXaxis;
+ for (int iCol = 1; iCol < iNColumns; iCol++) {
+ rPlotFile.getColumn (iCol, pdY);
+ m_pEZPlot->addCurve (pdX, pdY, iNRecords);
+ }
+ } else {
+ rPlotFile.getColumn (0, pdX);
+ rPlotFile.getColumn (1, pdY);
+ m_pEZPlot->addCurve (pdX, pdY, iNRecords);
+ }
+ delete pdX;
delete pdY;
}
m_pFileMenu->Append(wxID_PRINT, "&Print...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
+ m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");