X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=dfce19050dd228534721978c7f8a1abca95674d3;hp=6b3553fd8166c495d3d65e5ee4e9e137a97d6b56;hb=9ff5b5165b2c8871bd4b29ccd5ca794638414615;hpb=59f85941934e85d4824c4d76e4d7ed3375bf2e3a diff --git a/src/views.cpp b/src/views.cpp index 6b3553f..dfce190 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.cpp,v 1.135 2001/03/11 18:52:03 kevin Exp $ +** $Id: views.cpp,v 1.136 2001/03/13 04:44:25 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 @@ -880,7 +880,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) edit_menu->Append(IFMENU_EDIT_COPY, "Copy\tCtrl-C"); edit_menu->Append(IFMENU_EDIT_CUT, "Cut\tCtrl-X"); edit_menu->Append(IFMENU_EDIT_PASTE, "Paste\tCtrl-V"); - + wxMenu *view_menu = new wxMenu; view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale S&et...\tCtrl-E"); view_menu->Append(IFMENU_VIEW_SCALE_AUTO, "Display Scale &Auto...\tCtrl-A"); @@ -1101,9 +1101,9 @@ void ImageFileView::OnEditCopy (wxCommandEvent& event) { wxBitmapDataObject *pBitmapObject = new wxBitmapDataObject; - + pBitmapObject->SetBitmap (m_bitmap); - + if (wxTheClipboard->Open()) { wxTheClipboard->SetData (pBitmapObject); wxTheClipboard->Close(); @@ -1130,7 +1130,7 @@ void ImageFileView::OnEditPaste (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); - + if (wxTheClipboard->Open()) { wxBitmap bitmap; if (wxTheClipboard->IsSupported (wxDF_BITMAP)) { @@ -1139,7 +1139,7 @@ ImageFileView::OnEditPaste (wxCommandEvent& event) bitmap = bitmapObject.GetBitmap (); } wxTheClipboard->Close(); - + int nx = rIF.nx(); int ny = rIF.ny(); if (bitmap.Ok() == true && bitmap.GetWidth() == nx && bitmap.GetHeight() == ny) { @@ -1246,7 +1246,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) pScaledDoc->Modify (true); pScaledDoc->UpdateAllViews (this); pScaledDoc->getView()->getFrame()->Show(true); - pScaledDoc->Activate(); + pScaledDoc->Activate(); } } @@ -1265,7 +1265,6 @@ ImageFileView::OnConvert3d (wxCommandEvent& event) GetDocumentManager()->ActivateView (pGraph3d->getView(), true, false); ::wxYield(); pGraph3d->getView()->getCanvas()->SetFocus(); - pGraph3d->Activate(); } #endif @@ -1351,7 +1350,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) pPlotDoc->Modify (true); pPlotDoc->getView()->getFrame()->Show(true); pPlotDoc->UpdateAllViews (); - pPlotDoc->Activate(); + pPlotDoc->Activate(); } } @@ -1437,7 +1436,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) pPlotDoc->Modify (true); pPlotDoc->getView()->getFrame()->Show(true); pPlotDoc->UpdateAllViews (); - pPlotDoc->Activate(); + pPlotDoc->Activate(); } } @@ -1532,7 +1531,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) pPlotDoc->Modify (true); pPlotDoc->getView()->getFrame()->Show(true); pPlotDoc->UpdateAllViews (); - pPlotDoc->Activate(); + pPlotDoc->Activate(); } } @@ -1633,7 +1632,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) pPlotDoc->Modify (true); pPlotDoc->getView()->getFrame()->Show(true); pPlotDoc->UpdateAllViews (); - pPlotDoc->Activate(); + pPlotDoc->Activate(); } } #endif @@ -2072,7 +2071,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event) return; } else #endif // HAVE_WXTHREADS - { + { pProj = new Projections; pProj->initFromScanner (theScanner); wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT ); @@ -2140,7 +2139,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize=" << m_iDefaultRasterNY << ", ViewRatio=" << m_dDefaultRasterViewRatio << ", nSamples=" << m_iDefaultRasterNSamples;; - + #if HAVE_WXTHREADS if (theApp->getUseBackgroundTasks()) { RasterizerSupervisorThread* pThread = new RasterizerSupervisorThread (this, m_iDefaultRasterNX, m_iDefaultRasterNY, @@ -2165,7 +2164,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) return; } } - + ImageFileDocument* pRasterDoc = theApp->newImageDoc(); if (! pRasterDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -2183,7 +2182,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) rasterView->getFrame()->SetFocus(); rasterView->OnUpdate (rasterView, NULL); } - pRasterDoc->Activate(); + pRasterDoc->Activate(); } } @@ -2459,7 +2458,7 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event) *theApp->getLog() << "Error converting to Polar\n"; return; } - + pPolarDoc = theApp->newImageDoc (); if (! pPolarDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -2477,7 +2476,7 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event) pPolarDoc->Modify (true); pPolarDoc->getView()->getFrame()->Show(true); pPolarDoc->UpdateAllViews (); - pPolarDoc->Activate(); + pPolarDoc->Activate(); } } @@ -2518,45 +2517,50 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pPolarDoc->Modify (true); pPolarDoc->getView()->getFrame()->Show(true); pPolarDoc->UpdateAllViews (); - pPolarDoc->Activate(); + pPolarDoc->Activate(); } } void ProjectionFileView::OnPlotTThetaSampling (wxCommandEvent& event) { - Projections& rProj = GetDocument()->getProjections(); - ParallelRaysums parallel (&rProj); - PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); - PlotFile& rPlot = pPlotDoc->getPlotFile(); - ParallelRaysums::CoordinateContainer& coordContainer = parallel.getCoordinates(); - double* pdT = new double [parallel.getNumCoordinates()]; - double* pdTheta = new double [parallel.getNumCoordinates()]; - - for (int i = 0; i < parallel.getNumCoordinates(); i++) { - pdT[i] = coordContainer[i]->m_dT; - pdTheta[i] = coordContainer[i]->m_dTheta; - } - 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->getView()->getFrame()->Show(true); - pPlotDoc->UpdateAllViews (); - pPlotDoc->Activate(); + DialogGetThetaRange dlgTheta (this->getFrame(), ParallelRaysums::THETA_RANGE_UNCONSTRAINED); + if (dlgTheta.ShowModal() != wxID_OK) return; + + int iThetaRange = dlgTheta.getThetaRange(); + + Projections& rProj = GetDocument()->getProjections(); + ParallelRaysums parallel (&rProj, iThetaRange); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); + PlotFile& rPlot = pPlotDoc->getPlotFile(); + ParallelRaysums::CoordinateContainer& coordContainer = parallel.getCoordinates(); + double* pdT = new double [parallel.getNumCoordinates()]; + double* pdTheta = new double [parallel.getNumCoordinates()]; + + for (int i = 0; i < parallel.getNumCoordinates(); i++) { + pdT[i] = coordContainer[i]->m_dT; + pdTheta[i] = coordContainer[i]->m_dTheta; + } + 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->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } void @@ -2571,7 +2575,7 @@ ProjectionFileView::OnConvertParallel (wxCommandEvent& event) Projections* pProjNew = rProj.interpolateToParallel(); ProjectionFileDocument* pProjDocNew = theApp->newProjectionDoc(); pProjDocNew->setProjections (pProjNew); - + if (ProjectionFileView* projView = pProjDocNew->getView()) { projView->OnUpdate (projView, NULL); if (projView->getCanvas()) @@ -2604,7 +2608,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) defaultROI.m_dXMax = defaultROI.m_dXMin + rProj.phmLen(); defaultROI.m_dYMin = -rProj.phmLen() / 2; defaultROI.m_dYMax = defaultROI.m_dYMin + rProj.phmLen(); - + DialogGetReconstructionParameters dialogReconstruction (getFrameForChild(), m_iDefaultNX, m_iDefaultNY, m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, @@ -2631,7 +2635,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str()); m_iDefaultTrace = dialogReconstruction.getTrace(); dialogReconstruction.getROI (&defaultROI); - + if (m_iDefaultNX <= 0 && m_iDefaultNY <= 0) return; @@ -2681,7 +2685,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) return; } 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(), @@ -2787,13 +2791,13 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image...\tCtrl-M"); convert_menu->AppendSeparator(); convert_menu->Append (PJMENU_CONVERT_PARALLEL, "&Interpolate to Parallel"); - + wxMenu* filter_menu = new wxMenu; filter_menu->Append (PJMENU_ARTIFACT_REDUCTION, "&Artifact Reduction"); - + 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"); @@ -3213,7 +3217,7 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) 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; @@ -3236,12 +3240,12 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) m_pEZPlot->ezset("box"); m_pEZPlot->ezset("grid"); - + double* pdX = new double [iNRecords]; double* pdY = new double [iNRecords]; if (! bScatterPlot) { rPlotFile.getColumn (0, pdX); - + for (int iCol = 1; iCol < iNColumns; iCol++) { rPlotFile.getColumn (iCol, pdY); m_pEZPlot->addCurve (pdX, pdY, iNRecords);