X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=3a91f6eaa76d63c0efb53fba8488529b856cdb68;hp=8b40f35744b2fd2039288dfa165e1e3d2c4401a7;hb=21a3eb69ff13b601703cfdcca278a3f60e949737;hpb=4433641931aa27fd6a2b5ecd0102e6c5bbbccc46 diff --git a/src/views.cpp b/src/views.cpp index 8b40f35..3a91f6e 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -1,7 +1,7 @@ /***************************************************************************** ** FILE IDENTIFICATION ** -** Name: view.cpp +** Name: views.cpp ** Purpose: View & Canvas routines for CTSim program ** Programmer: Kevin Rosenberg ** Date Started: July 2000 @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.cpp,v 1.137 2001/03/13 08:24:41 kevin Exp $ +** $Id: views.cpp,v 1.153 2002/05/03 09:57:41 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 @@ -241,6 +241,8 @@ EVT_MENU(IFMENU_FILTER_IFFT_COLS, ImageFileView::OnIFFTCols) #endif EVT_MENU(IFMENU_FILTER_MAGNITUDE, ImageFileView::OnMagnitude) EVT_MENU(IFMENU_FILTER_PHASE, ImageFileView::OnPhase) +EVT_MENU(IFMENU_FILTER_REAL, ImageFileView::OnReal) +EVT_MENU(IFMENU_FILTER_IMAGINARY, ImageFileView::OnImaginary) EVT_MENU(IFMENU_PLOT_ROW, ImageFileView::OnPlotRow) EVT_MENU(IFMENU_PLOT_COL, ImageFileView::OnPlotCol) #ifdef HAVE_FFT @@ -251,7 +253,7 @@ EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram) END_EVENT_TABLE() ImageFileView::ImageFileView() -: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) +: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_pFilterMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) { m_iDefaultExportFormatID = ImageFile::EXPORT_FORMAT_PNG; } @@ -406,9 +408,8 @@ ImageFileView::OnCompare (wxCommandEvent& event) pDifferenceImage->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pDifferenceDoc->Modify (true); - pDifferenceDoc->UpdateAllViews (this); - pDifferenceDoc->getView()->OnUpdate (this, NULL); - pDifferenceDoc->getView()->getFrame()->Show(true); + pDifferenceDoc->UpdateAllViews(this); + pDifferenceDoc->getView()->setInitialClientSize(); pDifferenceDoc->Activate(); } wxMessageBox(os.str().c_str(), "Image Comparison"); @@ -511,7 +512,7 @@ ImageFileView::OnAdd (wxCommandEvent& event) if (theApp->getAskDeleteNewDocs()) pNewDoc->Modify (true); pNewDoc->UpdateAllViews (this); - pNewDoc->getView()->getFrame()->Show(true); + pNewDoc->getView()->setInitialClientSize(); pNewDoc->Activate(); } } @@ -552,7 +553,7 @@ ImageFileView::OnSubtract (wxCommandEvent& event) if (theApp->getAskDeleteNewDocs()) pNewDoc->Modify (true); pNewDoc->UpdateAllViews (this); - pNewDoc->getView()->getFrame()->Show(true); + pNewDoc->getView()->setInitialClientSize(); pNewDoc->Activate(); } } @@ -593,7 +594,7 @@ ImageFileView::OnMultiply (wxCommandEvent& event) if (theApp->getAskDeleteNewDocs()) pNewDoc->Modify (true); pNewDoc->UpdateAllViews (this); - pNewDoc->getView()->getFrame()->Show(true); + pNewDoc->getView()->setInitialClientSize(); pNewDoc->Activate(); } } @@ -634,7 +635,7 @@ ImageFileView::OnDivide (wxCommandEvent& event) if (theApp->getAskDeleteNewDocs()) pNewDoc->Modify (true); pNewDoc->UpdateAllViews (this); - pNewDoc->getView()->getFrame()->Show(true); + pNewDoc->getView()->setInitialClientSize(); pNewDoc->Activate(); } } @@ -787,11 +788,25 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event) void ImageFileView::OnMagnitude (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + rIF.magnitude (rIF); + rIF.labelAdd ("Magnitude"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); +} + +void +ImageFileView::OnPhase (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); if (rIF.isComplex()) { - rIF.magnitude (rIF); - rIF.labelAdd ("Magnitude of complex-image"); + rIF.phase (rIF); + rIF.labelAdd ("Phase of complex-image"); m_bMinSpecified = false; m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) @@ -802,12 +817,28 @@ ImageFileView::OnMagnitude (wxCommandEvent& event) } void -ImageFileView::OnPhase (wxCommandEvent& event) +ImageFileView::OnReal (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); if (rIF.isComplex()) { - rIF.phase (rIF); - rIF.labelAdd ("Phase of complex-image"); + rIF.real (rIF); + rIF.labelAdd ("Real component of complex-image"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + } + GetDocument()->Activate(); +} + +void +ImageFileView::OnImaginary (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + if (rIF.isComplex()) { + rIF.imaginary (rIF); + rIF.labelAdd ("Imaginary component of complex-image"); m_bMinSpecified = false; m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) @@ -849,7 +880,6 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) theApp->setIconForFrame (subframe); m_pFileMenu = new wxMenu; - m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); m_pFileMenu->Append(wxID_OPEN, "&Open...\tCtrl-O"); @@ -860,7 +890,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); - m_pFileMenu->Append(IFMENU_FILE_EXPORT, "&Export..."); + m_pFileMenu->Append(IFMENU_FILE_EXPORT, "Expor&t..."); m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(wxID_PRINT, "&Print..."); @@ -886,30 +916,33 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) view_menu->Append(IFMENU_VIEW_SCALE_AUTO, "Display Scale &Auto...\tCtrl-A"); view_menu->Append(IFMENU_VIEW_SCALE_FULL, "Display F&ull Scale\tCtrl-U"); - wxMenu* filter_menu = new wxMenu; - filter_menu->Append (IFMENU_FILTER_INVERTVALUES, "&Invert Values"); - filter_menu->Append (IFMENU_FILTER_SQUARE, "&Square"); - filter_menu->Append (IFMENU_FILTER_SQRT, "Square &Root"); - filter_menu->Append (IFMENU_FILTER_LOG, "&Log"); - filter_menu->Append (IFMENU_FILTER_EXP, "&Exp"); - filter_menu->AppendSeparator(); + m_pFilterMenu = new wxMenu; + m_pFilterMenu->Append (IFMENU_FILTER_INVERTVALUES, "In&vert Values"); + m_pFilterMenu->Append (IFMENU_FILTER_SQUARE, "&Square"); + m_pFilterMenu->Append (IFMENU_FILTER_SQRT, "Square &Root"); + m_pFilterMenu->Append (IFMENU_FILTER_LOG, "&Log"); + m_pFilterMenu->Append (IFMENU_FILTER_EXP, "E&xp"); + m_pFilterMenu->AppendSeparator(); #ifdef HAVE_FFT - filter_menu->Append (IFMENU_FILTER_FFT, "2-D &FFT"); - filter_menu->Append (IFMENU_FILTER_IFFT, "2-D &IFFT"); - filter_menu->Append (IFMENU_FILTER_FFT_ROWS, "FFT Rows"); - filter_menu->Append (IFMENU_FILTER_IFFT_ROWS, "IFFT Rows"); - filter_menu->Append (IFMENU_FILTER_FFT_COLS, "FFT Columns"); - filter_menu->Append (IFMENU_FILTER_IFFT_COLS, "IFFT Columns"); - filter_menu->Append (IFMENU_FILTER_FOURIER, "2-D F&ourier"); - filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "2-D Inverse Fo&urier"); + m_pFilterMenu->Append (IFMENU_FILTER_FFT, "2-D &FFT\tCtrl-2"); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT, "2-D &IFFT\tAlt-2"); + m_pFilterMenu->Append (IFMENU_FILTER_FFT_ROWS, "FFT Rows"); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT_ROWS, "IFFT Rows"); + m_pFilterMenu->Append (IFMENU_FILTER_FFT_COLS, "FFT Columns"); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT_COLS, "IFFT Columns"); + m_pFilterMenu->Append (IFMENU_FILTER_FOURIER, "2-D F&ourier"); + m_pFilterMenu->Append (IFMENU_FILTER_INVERSE_FOURIER, "2-D Inverse Fo&urier"); #else - filter_menu->Append (IFMENU_FILTER_FOURIER, "&Fourier"); - filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "&Inverse Fourier"); + m_pFilterMenu->Append (IFMENU_FILTER_FOURIER, "&Fourier"); + m_pFilterMenu->Append (IFMENU_FILTER_INVERSE_FOURIER, "&Inverse Fourier"); #endif - filter_menu->Append (IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, "S&huffle Fourier to Natural Order"); - filter_menu->Append (IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, "Shu&ffle Natural to Fourier Order"); - filter_menu->Append (IFMENU_FILTER_MAGNITUDE, "&Magnitude"); - filter_menu->Append (IFMENU_FILTER_PHASE, "&Phase"); + m_pFilterMenu->Append (IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, "Shuffl&e Fourier to Natural Order"); + m_pFilterMenu->Append (IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, "Shuffle &Natural to Fourier Order"); + m_pFilterMenu->AppendSeparator(); + m_pFilterMenu->Append (IFMENU_FILTER_MAGNITUDE, "&Magnitude"); + m_pFilterMenu->Append (IFMENU_FILTER_PHASE, "&Phase"); + m_pFilterMenu->Append (IFMENU_FILTER_REAL, "Re&al"); + m_pFilterMenu->Append (IFMENU_FILTER_IMAGINARY, "Ima&ginary"); wxMenu* image_menu = new wxMenu; image_menu->Append (IFMENU_IMAGE_ADD, "&Add..."); @@ -952,7 +985,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) menu_bar->Append(edit_menu, "&Edit"); menu_bar->Append(view_menu, "&View"); menu_bar->Append(image_menu, "&Image"); - menu_bar->Append(filter_menu, "Fi<er"); + menu_bar->Append(m_pFilterMenu, "Fi<er"); menu_bar->Append(m_pMenuAnalyze, "&Analyze"); menu_bar->Append(help_menu, "&Help"); @@ -960,7 +993,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) subframe->Centre(wxBOTH); - wxAcceleratorEntry accelEntries[8]; + wxAcceleratorEntry accelEntries[10]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('A'), IFMENU_VIEW_SCALE_AUTO); accelEntries[1].Set (wxACCEL_CTRL, static_cast('U'), IFMENU_VIEW_SCALE_FULL); accelEntries[2].Set (wxACCEL_CTRL, static_cast('E'), IFMENU_VIEW_SCALE_MINMAX); @@ -968,12 +1001,15 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) accelEntries[4].Set (wxACCEL_CTRL, static_cast('C'), IFMENU_EDIT_COPY); accelEntries[5].Set (wxACCEL_CTRL, static_cast('X'), IFMENU_EDIT_CUT); accelEntries[6].Set (wxACCEL_CTRL, static_cast('V'), IFMENU_EDIT_PASTE); + int iEntry = 7; +#ifdef HAVE_FFT + accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast('2'), IFMENU_FILTER_FFT); + accelEntries[iEntry++].Set (wxACCEL_ALT, static_cast('2'), IFMENU_FILTER_IFFT); +#endif #if wxUSE_GLCANVAS - accelEntries[7].Set (wxACCEL_CTRL, static_cast('3'), IFMENU_IMAGE_CONVERT3D); - wxAcceleratorTable accelTable (8, accelEntries); -#else - wxAcceleratorTable accelTable (7, accelEntries); + accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast('3'), IFMENU_IMAGE_CONVERT3D); #endif + wxAcceleratorTable accelTable (iEntry, accelEntries); subframe->SetAcceleratorTable (accelTable); @@ -990,29 +1026,41 @@ ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; - int width, height; - m_pFrame->GetClientSize (&width, &height); + // int width, height; + // m_pFrame->GetClientSize (&width, &height); m_pFrame->SetTitle("ImageFileView"); m_pCanvas = CreateCanvas (m_pFrame); - int x, y; // X requires a forced resize - m_pFrame->GetSize(&x, &y); - m_pFrame->SetSize(-1, -1, x, y); + // int x, y; // X requires a forced resize + // m_pFrame->GetSize(&x, &y); + // m_pFrame->SetSize(-1, -1, x, y); m_pFrame->SetFocus(); m_pFrame->Show(true); - Activate(true); + // Activate(true); return true; } +void +ImageFileView::setInitialClientSize () +{ + if (m_pFrame && m_pCanvas) { + wxSize bestSize = m_pCanvas->GetBestSize(); + + if (bestSize.x > 800) + bestSize.x = 800; + if (bestSize.y > 800) + bestSize.y = 800; + + m_pFrame->SetClientSize (bestSize); + m_pFrame->Show (true); + m_pFrame->SetFocus(); + } +} + void ImageFileView::OnDraw (wxDC* dc) { - wxSize sizeWindow = m_pFrame->GetClientSize(); - wxSize sizeBest = m_pCanvas->GetBestSize(); - if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y) - m_pFrame->SetClientSize (sizeBest); - if (m_bitmap.Ok()) dc->DrawBitmap(m_bitmap, 0, 0, false); @@ -1026,6 +1074,15 @@ void ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { const ImageFile& rIF = GetDocument()->getImageFile(); + if (m_pFilterMenu && rIF.isComplex()) { + m_pFilterMenu->Enable(IFMENU_FILTER_REAL, true); + m_pFilterMenu->Enable(IFMENU_FILTER_IMAGINARY, true); + m_pFilterMenu->Enable(IFMENU_FILTER_PHASE, true); + } else { + m_pFilterMenu->Enable(IFMENU_FILTER_REAL, false); + m_pFilterMenu->Enable(IFMENU_FILTER_IMAGINARY, false); + m_pFilterMenu->Enable(IFMENU_FILTER_PHASE, false); + } ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -1057,10 +1114,6 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) wxImage image (nx, ny, imageData, true); m_bitmap = image.ConvertToBitmap(); delete imageData; - int xSize = nx; - int ySize = ny; - ySize = clamp (ySize, 0, 800); - m_pFrame->SetClientSize (xSize, ySize); m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20); m_pCanvas->SetBackgroundColour(*wxWHITE); } @@ -1142,17 +1195,26 @@ ImageFileView::OnEditPaste (wxCommandEvent& event) int nx = rIF.nx(); int ny = rIF.ny(); + bool bMonochrome = false; + if (bitmap.Ok() == true && bitmap.GetWidth() == nx && bitmap.GetHeight() == ny) { wxImage image (bitmap); + double dScale3 = 3 * 255; unsigned char* pixels = image.GetData(); ImageFileArray v = rIF.getArray(); - for (int ix = 0; ix < rIF.nx(); ix++) { - for (int iy = 0; iy < rIF.ny(); iy++) { + for (unsigned int ix = 0; ix < rIF.nx(); ix++) { + for (unsigned int iy = 0; iy < rIF.ny(); iy++) { unsigned int iBase = 3 * (iy * nx + ix); - double dR = pixels[iBase] / 255.; - double dG = pixels[iBase+1] / 255.; - double dB = pixels[iBase+2] / 255.; - v[ix][ny - 1 - iy] = ImageFile::colorToGrayscale (dR, dG, dB); + if (ix == 0 && iy == 0 && (pixels[iBase] == pixels[iBase+1] && pixels[iBase+1] == pixels[iBase+2])) + bMonochrome = true; + if (bMonochrome) { + v[ix][ny - 1 - iy] = (pixels[iBase]+pixels[iBase+1]+pixels[iBase+2]) / dScale3; + } else { + double dR = pixels[iBase] / 255.; + double dG = pixels[iBase+1] / 255.; + double dB = pixels[iBase+2] / 255.; + v[ix][ny - 1 - iy] = ImageFile::colorToGrayscale (dR, dG, dB); + } } } OnUpdate(this, NULL); @@ -1203,6 +1265,10 @@ ImageFileView::OnExport (wxCommandEvent& event) strWildcard = "DICOM Files (*.*)|*.*"; } #endif + else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_TEXT) { + strExt = ".txt"; + strWildcard = "Text (*.txt)|*.txt"; + } else { strExt = ""; strWildcard = "Miscellaneous (*.*)|*.*"; @@ -1245,7 +1311,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) if (theApp->getAskDeleteNewDocs()) pScaledDoc->Modify (true); pScaledDoc->UpdateAllViews (this); - pScaledDoc->getView()->getFrame()->Show(true); + pScaledDoc->getView()->setInitialClientSize(); pScaledDoc->Activate(); } } @@ -1468,7 +1534,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) pcIn[i].im = 0; } - fftw_plan plan = fftw_create_plan (nx, FFTW_FORWARD, FFTW_IN_PLACE); + fftw_plan plan = fftw_create_plan (nx, FFTW_FORWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM); fftw_one (plan, pcIn, NULL); fftw_destroy_plan (plan); @@ -1478,8 +1544,8 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) double* pYMag = new double [nx]; for (i = 0; i < nx; i++) { pX[i] = i; - pYReal[i] = pcIn[i].re; - pYImag[i] = pcIn[i].im; + pYReal[i] = pcIn[i].re / nx; + pYImag[i] = pcIn[i].im / nx; pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im); } Fourier::shuffleFourierToNaturalOrder (pYReal, nx); @@ -1571,7 +1637,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) for (i = 0; i < ny; i++) pcIn[i].im = pdTemp[i]; - fftw_plan plan = fftw_create_plan (ny, FFTW_BACKWARD, FFTW_IN_PLACE); + fftw_plan plan = fftw_create_plan (ny, FFTW_BACKWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM); fftw_one (plan, pcIn, NULL); fftw_destroy_plan (plan); @@ -1581,8 +1647,8 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) double* pYMag = new double [ny]; for (i = 0; i < ny; i++) { pX[i] = i; - pYReal[i] = pcIn[i].re; - pYImag[i] = pcIn[i].im; + pYReal[i] = pcIn[i].re / ny; + pYImag[i] = pcIn[i].im / ny; pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im); } @@ -1873,7 +1939,7 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) s += rIF.labelGet(iL).getLabelString(); rPlotFile.addDescription (s.c_str()); } - os << " Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); + os << " plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); *theApp->getLog() << os.str().c_str() << "\n"; rPlotFile.addDescription (os.str().c_str()); delete pX; @@ -1916,7 +1982,11 @@ PhantomCanvas::GetBestSize() const int xSize, ySize; theApp->getMainFrame()->GetClientSize (&xSize, &ySize); xSize = maxValue (xSize, ySize); +#ifdef CTSIM_MDI ySize = xSize = (xSize / 4); +#else + ySize = xSize; +#endif return wxSize (xSize, ySize); } @@ -1944,6 +2014,7 @@ PhantomFileView::PhantomFileView() m_iDefaultNView = 320; m_iDefaultNSample = 2; #endif + m_iDefaultOffsetView = 0; m_dDefaultRotation = 1; m_dDefaultFocalLength = 2; m_dDefaultCenterDetectorLength = 2; @@ -1992,7 +2063,7 @@ void PhantomFileView::OnProjections (wxCommandEvent& event) { DialogGetProjectionParameters dialogProjection (getFrameForChild(), - m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, + m_iDefaultNDet, m_iDefaultNView, m_iDefaultOffsetView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio, m_iDefaultGeometry, m_iDefaultTrace); int retVal = dialogProjection.ShowModal(); @@ -2001,6 +2072,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event) m_iDefaultNDet = dialogProjection.getNDet(); m_iDefaultNView = dialogProjection.getNView(); + m_iDefaultOffsetView = dialogProjection.getOffsetView(); m_iDefaultNSample = dialogProjection.getNSamples(); m_iDefaultTrace = dialogProjection.getTrace(); m_dDefaultRotation = dialogProjection.getRotAngle(); @@ -2017,7 +2089,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event) return; const Phantom& rPhantom = GetDocument()->getPhantom(); - Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, + Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultOffsetView, m_iDefaultNSample, dRotationRadians, m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio); if (theScanner.fail()) { wxString msg = "Failed making scanner\n"; @@ -2028,13 +2100,18 @@ PhantomFileView::OnProjections (wxCommandEvent& event) } std::ostringstream os; - os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet - << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample - << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength + os << "Projections for " << rPhantom.name() + << ": nDet=" << m_iDefaultNDet + << ", nView=" << m_iDefaultNView + << ", gantry offset=" << m_iDefaultOffsetView + << ", 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()); + << ", ViewRatio=" << m_dDefaultViewRatio + << ", ScanRatio=" << m_dDefaultScanRatio + << ", Geometry=" << sGeometry.c_str() + << ", FanBeamAngle=" << convertRadiansToDegrees (theScanner.fanBeamAngle()); Timer timer; Projections* pProj = NULL; @@ -2059,7 +2136,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event) #if HAVE_WXTHREADS if (theApp->getUseBackgroundTasks()) { ProjectorSupervisorThread* pProjector = new ProjectorSupervisorThread (this, m_iDefaultNDet, - m_iDefaultNView, sGeometry.c_str(), m_iDefaultNSample, dRotationRadians, + m_iDefaultNView, m_iDefaultOffsetView, sGeometry.c_str(), m_iDefaultNSample, dRotationRadians, 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"); @@ -2076,7 +2153,8 @@ PhantomFileView::OnProjections (wxCommandEvent& event) pProj->initFromScanner (theScanner); wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT ); for (int i = 0; i < pProj->nView(); i++) { - theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace); + //theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace); + theScanner.collectProjections (*pProj, rPhantom, i, 1, theScanner.offsetView(), true, m_iDefaultTrace); if (! dlgProgress.Update (i+1)) { delete pProj; return; @@ -2095,21 +2173,10 @@ PhantomFileView::OnProjections (wxCommandEvent& event) return; } pProjectionDoc->setProjections (pProj); - ProjectionFileView* projView = pProjectionDoc->getView(); - if (projView) { - projView->OnUpdate (projView, NULL); - if (projView->getCanvas()) - projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView); - if (wxFrame* pFrame = projView->getFrame()) { - pFrame->Show(true); - pFrame->SetFocus(); - pFrame->Raise(); - } - GetDocumentManager()->ActivateView (projView, true, false); - } if (theApp->getAskDeleteNewDocs()) pProjectionDoc-> Modify(true); pProjectionDoc->UpdateAllViews (this); + pProjectionDoc->getView()->setInitialClientSize(); pProjectionDoc->Activate(); } @@ -2154,14 +2221,15 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) #endif { ImageFile* pImageFile = new ImageFile (m_iDefaultRasterNX, m_iDefaultRasterNY); + wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), - pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT ); + pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT ); Timer timer; for (unsigned int i = 0; i < pImageFile->nx(); i++) { rPhantom.convertToImagefile (*pImageFile, m_dDefaultRasterViewRatio, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true); if (! dlgProgress.Update (i+1)) { - delete pImageFile; - return; + delete pImageFile; + return; } } @@ -2173,15 +2241,11 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) pRasterDoc->setImageFile (pImageFile); if (theApp->getAskDeleteNewDocs()) pRasterDoc->Modify (true); - pRasterDoc->UpdateAllViews (this); - pRasterDoc->getView()->getFrame()->Show(true); *theApp->getLog() << os.str().c_str() << "\n"; pImageFile->labelAdd (os.str().c_str(), timer.timerEnd()); - ImageFileView* rasterView = pRasterDoc->getView(); - if (rasterView) { - rasterView->getFrame()->SetFocus(); - rasterView->OnUpdate (rasterView, NULL); - } + + pRasterDoc->UpdateAllViews(this); + pRasterDoc->getView()->setInitialClientSize(); pRasterDoc->Activate(); } } @@ -2276,15 +2340,8 @@ PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) m_pCanvas = CreateCanvas (m_pFrame); m_pFrame->SetClientSize (m_pCanvas->GetBestSize()); m_pCanvas->SetClientSize (m_pCanvas->GetBestSize()); - m_pFrame->SetTitle ("PhantomFileView"); - -#ifdef __X__ - int x, y; // X requires a forced resize - m_pFrame->GetSize(&x, &y); - m_pFrame->SetSize(-1, -1, x, y); -#endif - + m_pFrame->Show(true); Activate(true); @@ -2362,6 +2419,9 @@ wxSize ProjectionFileCanvas::GetBestSize () const { wxSize best (0, 0); + if (! m_pView) + return best; + if (m_pView) { Projections& rProj = m_pView->GetDocument()->getProjections(); best.Set (rProj.nDet(), rProj.nView()); @@ -2380,11 +2440,13 @@ EVT_MENU(PJMENU_FILE_PROPERTIES, ProjectionFileView::OnProperties) EVT_MENU(PJMENU_RECONSTRUCT_FBP, ProjectionFileView::OnReconstructFBP) EVT_MENU(PJMENU_RECONSTRUCT_FBP_REBIN, ProjectionFileView::OnReconstructFBPRebin) EVT_MENU(PJMENU_RECONSTRUCT_FOURIER, ProjectionFileView::OnReconstructFourier) +EVT_MENU(PJMENU_CONVERT_RECTANGULAR, ProjectionFileView::OnConvertRectangular) EVT_MENU(PJMENU_CONVERT_POLAR, ProjectionFileView::OnConvertPolar) EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar) EVT_MENU(PJMENU_CONVERT_PARALLEL, ProjectionFileView::OnConvertParallel) EVT_MENU(PJMENU_PLOT_TTHETA_SAMPLING, ProjectionFileView::OnPlotTThetaSampling) -EVT_MENU(PJMENU_ARTIFACT_REDUCTION, ProjectionFileView::OnArtifactReduction) +EVT_MENU(PJMENU_PLOT_HISTOGRAM, ProjectionFileView::OnPlotHistogram) + // EVT_MENU(PJMENU_ARTIFACT_REDUCTION, ProjectionFileView::OnArtifactReduction) END_EVENT_TABLE() @@ -2439,12 +2501,46 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) } +void +ProjectionFileView::OnConvertRectangular (wxCommandEvent& event) +{ + Projections& rProj = GetDocument()->getProjections(); + + int nDet = rProj.nDet(); + int nView = rProj.nView(); + ImageFile* pIF = new ImageFile (nDet, nView); + ImageFileArray v = pIF->getArray(); + for (int iv = 0; iv < nView; iv++) { + DetectorValue* detval = rProj.getDetectorArray(iv).detValues(); + + for (int id = 0; id < nDet; id++) + v[id][iv] = detval[id]; + } + + ImageFileDocument* pRectDoc = theApp->newImageDoc (); + if (! pRectDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + pRectDoc->setImageFile (pIF); + pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); + std::ostringstream os; + os << "Convert projection file " << GetFrame()->GetTitle().c_str() << " to rectangular image"; + *theApp->getLog() << os.str().c_str() << "\n"; + pIF->labelAdd (os.str().c_str()); + if (theApp->getAskDeleteNewDocs()) + pRectDoc->Modify (true); + pRectDoc->UpdateAllViews(); + pRectDoc->getView()->setInitialClientSize(); + pRectDoc->Activate(); +} + void ProjectionFileView::OnConvertPolar (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert Polar", m_iDefaultPolarNX, m_iDefaultPolarNY, - m_iDefaultPolarInterpolation, -1); + m_iDefaultPolarInterpolation, -1, IDH_DLG_POLAR); if (dialogPolar.ShowModal() == wxID_OK) { wxProgressDialog dlgProgress (wxString("Convert Polar"), wxString("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); wxString strInterpolation (dialogPolar.getInterpolationName()); @@ -2475,8 +2571,8 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event) pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pPolarDoc->Modify (true); - pPolarDoc->getView()->getFrame()->Show(true); pPolarDoc->UpdateAllViews (); + pPolarDoc->getView()->setInitialClientSize(); pPolarDoc->Activate(); } } @@ -2486,7 +2582,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert to FFT Polar", m_iDefaultPolarNX, m_iDefaultPolarNY, - m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad); + m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad, IDH_DLG_FFT_POLAR); if (dialogPolar.ShowModal() == wxID_OK) { wxProgressDialog dlgProgress (wxString("Convert FFT Polar"), wxString("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); wxString strInterpolation (dialogPolar.getInterpolationName()); @@ -2516,8 +2612,8 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pPolarDoc->Modify (true); - pPolarDoc->getView()->getFrame()->Show(true); - pPolarDoc->UpdateAllViews (); + pPolarDoc->UpdateAllViews (this); + pPolarDoc->getView()->setInitialClientSize(); pPolarDoc->Activate(); } } @@ -2564,6 +2660,80 @@ ProjectionFileView::OnPlotTThetaSampling (wxCommandEvent& event) pPlotDoc->Activate(); } + +void +ProjectionFileView::OnPlotHistogram (wxCommandEvent& event) +{ + Projections& rProj = GetDocument()->getProjections(); + int nDet = rProj.nDet(); + int nView = rProj.nView(); + + if (nDet < 1 || nView < 1) + return; + + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); + if (! pPlotDoc) { + sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); + return; + } + + DetectorValue* pdDetval = rProj.getDetectorArray(0).detValues(); + double dMin = pdDetval[0], dMax = pdDetval[0]; + + for (int iv = 0; iv < nView; iv++) { + pdDetval = rProj.getDetectorArray(iv).detValues(); + for (int id = 0; id < nDet; id++) { + double dV = pdDetval[id]; + if (dV < dMin) + dMin = dV; + else if (dV > dMax) + dMax = dV; + } + } + + double* pX = new double [NUMBER_HISTOGRAM_BINS]; + double* pY = new double [NUMBER_HISTOGRAM_BINS]; + double dBinWidth = (dMax - dMin) / NUMBER_HISTOGRAM_BINS; + + for (int i = 0; i < NUMBER_HISTOGRAM_BINS; i++) { + pX[i] = dMin + (i + 0.5) * dBinWidth; + pY[i] = 0; + } + for (int j = 0; j < nView; j++) { + pdDetval = rProj.getDetectorArray(j).detValues(); + for (int id = 0; id < nDet; id++) { + int iBin = nearest ((pdDetval[id] - dMin) / dBinWidth); + if (iBin >= 0 && iBin < NUMBER_HISTOGRAM_BINS) + pY[iBin] += 1; + } + } + PlotFile& rPlotFile = pPlotDoc->getPlotFile(); + std::ostringstream os; + os << "Histogram"; + std::string title("title "); + title += os.str(); + rPlotFile.addEzsetCommand (title.c_str()); + rPlotFile.addEzsetCommand ("xlabel Detector Value"); + rPlotFile.addEzsetCommand ("ylabel Count"); + rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("grid"); + rPlotFile.setCurveSize (2, NUMBER_HISTOGRAM_BINS); + rPlotFile.addColumn (0, pX); + rPlotFile.addColumn (1, pY); + rPlotFile.addDescription (rProj.remark()); + os << " plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); + *theApp->getLog() << os.str().c_str() << "\n"; + rPlotFile.addDescription (os.str().c_str()); + delete pX; + delete pY; + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); +} + + void ProjectionFileView::OnConvertParallel (wxCommandEvent& event) { @@ -2591,13 +2761,55 @@ ProjectionFileView::OnConvertParallel (wxCommandEvent& event) if (theApp->getAskDeleteNewDocs()) pProjDocNew-> Modify(true); pProjDocNew->UpdateAllViews (this); + pProjDocNew->getView()->setInitialClientSize(); pProjDocNew->Activate(); } void ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) { - wxMessageBox ("Fourier Reconstruction is not yet supported", "Unimplemented function"); + Projections& rProj = GetDocument()->getProjections(); + DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Fourier Reconstruction", m_iDefaultPolarNX, m_iDefaultPolarNY, + m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad, IDH_DLG_RECON_FOURIER); + if (dialogPolar.ShowModal() == wxID_OK) { + wxProgressDialog dlgProgress (wxString("Reconstruction Fourier"), wxString("Reconstruction Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + wxString strInterpolation (dialogPolar.getInterpolationName()); + m_iDefaultPolarNX = dialogPolar.getXSize(); + m_iDefaultPolarNY = dialogPolar.getYSize(); + m_iDefaultPolarZeropad = dialogPolar.getZeropad(); + ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY); + + m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str()); + if (! rProj.convertFFTPolar (*pIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad)) { + delete pIF; + *theApp->getLog() << "Error converting to polar\n"; + return; + } +#ifdef HAVE_FFT + pIF->ifft(*pIF); +#endif + pIF->magnitude(*pIF); + Fourier::shuffleFourierToNaturalOrder (*pIF); + + ImageFileDocument* pPolarDoc = theApp->newImageDoc(); + if (! pPolarDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + pPolarDoc->setImageFile (pIF); + pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); + std::ostringstream os; + os << "Reconstruct Fourier " << GetFrame()->GetTitle().c_str() << ": xSize=" + << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" + << strInterpolation.c_str() << ", zeropad=" << m_iDefaultPolarZeropad; + *theApp->getLog() << os.str().c_str() << "\n"; + pIF->labelAdd (os.str().c_str()); + if (theApp->getAskDeleteNewDocs()) + pPolarDoc->Modify (true); + pPolarDoc->UpdateAllViews (); + pPolarDoc->getView()->setInitialClientSize(); + pPolarDoc->Activate(); + } } void @@ -2657,7 +2869,7 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar 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(); if (bRebinToParallel) os << "; Interpolate to Parallel"; - + Timer timerRecon; ImageFile* pImageFile = NULL; if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { @@ -2726,19 +2938,16 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar sys_error (ERR_SEVERE, "Unable to create image file"); return; } + *theApp->getLog() << os.str().c_str() << "\n"; + pImageFile->labelAdd (rProj.getLabel()); + pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd()); + pReconDoc->setImageFile (pImageFile); if (theApp->getAskDeleteNewDocs()) pReconDoc->Modify (true); - pReconDoc->UpdateAllViews (this); + pReconDoc->UpdateAllViews(); + pReconDoc->getView()->setInitialClientSize(); pReconDoc->Activate(); - if (ImageFileView* rasterView = pReconDoc->getView()) { - rasterView->OnUpdate (rasterView, NULL); - rasterView->getFrame()->SetFocus(); - rasterView->getFrame()->Show(true); - } - *theApp->getLog() << os.str().c_str() << "\n"; - pImageFile->labelAdd (rProj.getLabel()); - pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd()); } @@ -2805,22 +3014,24 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *convert_menu = new wxMenu; + convert_menu->Append (PJMENU_CONVERT_RECTANGULAR, "&Rectangular Image"); convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L"); - convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image...\tCtrl-M"); + convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "FF&T->Polar Image...\tCtrl-T"); 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* 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"); - + analyze_menu->Append (PJMENU_PLOT_HISTOGRAM, "&Plot Histogram"); + analyze_menu->Append (PJMENU_PLOT_TTHETA_SAMPLING, "Plot T-T&heta Sampling...\tCtrl-H"); + 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_FBP_REBIN, "Filtered &Backprojection (Rebin to Parallel)...\tCtrl-B", "Reconstruct image using filtered backprojection"); - reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier"); - reconstruct_menu->Enable (PJMENU_RECONSTRUCT_FOURIER, false); + // still buggy + // reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier"); wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); @@ -2832,7 +3043,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) menu_bar->Append (m_pFileMenu, "&File"); menu_bar->Append (convert_menu, "&Convert"); - menu_bar->Append (filter_menu, "Fi<er"); + // menu_bar->Append (filter_menu, "Fi<er"); menu_bar->Append (analyze_menu, "&Analyze"); menu_bar->Append (reconstruct_menu, "&Reconstruct"); menu_bar->Append (help_menu, "&Help"); @@ -2842,12 +3053,12 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxAcceleratorEntry accelEntries[7]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('L'), PJMENU_CONVERT_POLAR); - accelEntries[1].Set (wxACCEL_CTRL, static_cast('M'), PJMENU_CONVERT_FFT_POLAR); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('T'), PJMENU_CONVERT_FFT_POLAR); accelEntries[2].Set (wxACCEL_CTRL, static_cast('R'), PJMENU_RECONSTRUCT_FBP); accelEntries[3].Set (wxACCEL_CTRL, static_cast('B'), PJMENU_RECONSTRUCT_FBP_REBIN); accelEntries[4].Set (wxACCEL_CTRL, static_cast('E'), PJMENU_RECONSTRUCT_FOURIER); accelEntries[5].Set (wxACCEL_CTRL, static_cast('I'), PJMENU_FILE_PROPERTIES); - accelEntries[6].Set (wxACCEL_CTRL, static_cast('T'), PJMENU_PLOT_TTHETA_SAMPLING); + accelEntries[6].Set (wxACCEL_CTRL, static_cast('H'), PJMENU_PLOT_TTHETA_SAMPLING); wxAcceleratorTable accelTable (7, accelEntries); subframe->SetAcceleratorTable (accelTable); @@ -2866,12 +3077,6 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) m_pFrame->SetTitle ("ProjectionFileView"); m_pCanvas = CreateCanvas (m_pFrame); -#ifdef __X__ - int x, y; // X requires a forced resize - m_pFrame->GetSize(&x, &y); - m_pFrame->SetSize(-1, -1, x, y); -#endif - m_pFrame->Show(true); Activate(true); @@ -2881,17 +3086,26 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) void ProjectionFileView::OnDraw (wxDC* dc) { - wxSize clientSize = m_pFrame->GetClientSize(); - wxSize bestSize = m_pCanvas->GetBestSize(); - - if (clientSize.x > bestSize.x || clientSize.y > bestSize.y) - m_pFrame->SetClientSize (bestSize); - if (m_bitmap.Ok()) dc->DrawBitmap (m_bitmap, 0, 0, false); } +void +ProjectionFileView::setInitialClientSize () +{ + wxSize bestSize = m_pCanvas->GetBestSize(); + + if (bestSize.x > 800) + bestSize.x = 800; + if (bestSize.y > 800) + bestSize.y = 800; + + m_pFrame->SetClientSize (bestSize); + m_pFrame->Show (true); + m_pFrame->SetFocus(); +} + void ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { @@ -2933,16 +3147,13 @@ ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) wxImage image (nDet, nView, imageData, true); m_bitmap = image.ConvertToBitmap(); delete imageData; - int xSize = nDet; - int ySize = nView; - xSize = clamp (xSize, 0, 800); - ySize = clamp (ySize, 0, 800); - m_pFrame->SetClientSize (xSize, ySize); - m_pCanvas->SetScrollbars (20, 20, nDet/20, nView/20); } - if (m_pCanvas) - m_pCanvas->Refresh(); + m_pCanvas->SetScrollbars(20, 20, nDet/20, nView/20); + m_pCanvas->SetBackgroundColour(*wxWHITE); + + if (m_pCanvas) + m_pCanvas->Refresh(); } bool @@ -2982,6 +3193,23 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& m_pView = v; } +wxSize +PlotFileCanvas::GetBestSize() const +{ + if (! m_pView) + return wxSize(0,0); + + int xSize, ySize; + theApp->getMainFrame()->GetClientSize (&xSize, &ySize); + xSize = maxValue (xSize, ySize); +#ifdef CTSIM_MDI + ySize = xSize = (xSize / 4); +#else + ySize = xSize; +#endif + return wxSize (xSize, ySize); +} + PlotFileCanvas::~PlotFileCanvas () { m_pView = NULL; @@ -3200,12 +3428,6 @@ PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) m_pFrame->SetTitle ("Plot File"); m_pCanvas = CreateCanvas (m_pFrame); -#ifdef __X__ - int x, y; // X requires a forced resize - m_pFrame->GetSize(&x, &y); - m_pFrame->SetSize(-1, -1, x, y); -#endif - m_pFrame->Show(true); Activate(true); @@ -3333,13 +3555,6 @@ bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) m_pCanvas = new TextFileCanvas (this, m_pFrame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY); m_pFrame->SetTitle("Log"); -#ifdef __X__ - // X seems to require a forced resize - int x, y; - frame->GetSize(&x, &y); - frame->SetSize(-1, -1, x, y); -#endif - m_pFrame->Show (true); Activate (true); @@ -3442,3 +3657,17 @@ TextFileCanvas::~TextFileCanvas () { m_pView = NULL; } + +wxSize +TextFileCanvas::GetBestSize() const +{ + int xSize, ySize; + theApp->getMainFrame()->GetClientSize (&xSize, &ySize); + xSize = maxValue (xSize, ySize); +#ifdef CTSIM_MDI + ySize = xSize = (xSize / 4); +#else + ySize = xSize; +#endif + return wxSize (xSize, ySize); +}