X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=72ba35a88e8035dff3cb91044566a11ab9224a49;hp=1b54cbb93ef99314a0e0780fa7b42e552ebc6ca6;hb=f7ee98f7d964ed361068179f0e7ea4475ed1abdf;hpb=85793a723370de4077cce16c13f926bd317778e9 diff --git a/src/views.cpp b/src/views.cpp index 1b54cbb..72ba35a 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.156 2002/05/30 17:02:32 kevin Exp $ +** $Id$ ** ** 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 @@ -75,24 +75,22 @@ ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoin } ImageFileCanvas::~ImageFileCanvas() -{ - m_pView = NULL; -} +{} -void +void ImageFileCanvas::OnDraw(wxDC& dc) { if (m_pView) m_pView->OnDraw(& dc); } -void +void ImageFileCanvas::DrawRubberBandCursor (wxDC& dc, int x, int y) { const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); int nx = rIF.nx(); int ny = rIF.ny(); - + int yPt = ny - y - 1; dc.SetLogicalFunction (wxINVERT); dc.SetPen (*wxGREEN_PEN); @@ -106,25 +104,25 @@ ImageFileCanvas::GetCurrentCursor (int& x, int& y) { x = m_xCursor; y = m_yCursor; - + if (m_xCursor >= 0 && m_yCursor >= 0) return true; else return false; } -void +void ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) { if (! m_pView) return; - - + + wxClientDC dc(this); PrepareDC(dc); - + wxPoint pt(event.GetLogicalPosition(dc)); - + const ImageFileDocument* pIFDoc = m_pView->GetDocument(); if (! pIFDoc) return; @@ -135,20 +133,21 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) const int yPt = ny - 1 - pt.y; if (event.RightIsDown()) { if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) { - std::ostringstream os; - os << "Image value (" << pt.x << "," << yPt << ") = " << v[pt.x][yPt]; + wxString os; + os << _T("Image value (") << pt.x << _T(",") << yPt << _T(") = ") + << v[pt.x][yPt]; if (rIF.isComplex()) { double dImag = rIF.getImaginaryArray()[pt.x][yPt]; if (dImag < 0) - os << " - " << -dImag; + os << _T(" - ") << -dImag; else - os << " + " << dImag; - os << "i\n"; + os << _T(" + ") << dImag; + os << _T("i\n"); } else - os << "\n"; - *theApp->getLog() << os.str().c_str(); + os << _T("\n"); + *theApp->getLog() << os; } else - *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n"; + *theApp->getLog() << _T("Mouse out of image range (") << pt.x << _T(",") << yPt << _T(")\n"); } else if (event.LeftIsDown() || event.LeftUp() || event.RightUp()) { if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) { @@ -168,12 +167,12 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) pMenu->Enable (IFMENU_PLOT_FFT_COL, true); } } else - *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n"; + *theApp->getLog() << _T("Mouse out of image range (") << pt.x << _T(",") << yPt << _T(")\n"); } if (event.LeftUp()) { - std::ostringstream os; - os << "Selected column " << pt.x << " , row " << yPt << "\n"; - *theApp->getLog() << os.str().c_str(); + wxString os; + os << _T("Selected column ") << pt.x << _T(" , row ") << yPt << _T("\n"); + *theApp->getLog() << os; } } @@ -186,17 +185,32 @@ ImageFileCanvas::OnChar (wxKeyEvent& event) if (m_pView) m_pView->OnUpdate (NULL); } else - wxScrolledWindow::OnChar (event); + event.Skip(); } wxSize ImageFileCanvas::GetBestSize() const { - if (! m_pView) - return wxSize(0,0); - - const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); - return wxSize (rIF.nx(), rIF.ny()); + const int iMinX = 50; + const int iMinY = 20; + wxSize bestSize (iMinX,iMinY); + + if (m_pView) { + const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); + bestSize.Set (rIF.nx(), rIF.ny()); + } + + if (bestSize.x > 800) + bestSize.x = 800; + if (bestSize.y > 800) + bestSize.y = 800; + + if (bestSize.y < iMinY) + bestSize.y = iMinY; + if (bestSize.x < iMinX) + bestSize.x = iMinX; + + return bestSize; } @@ -254,16 +268,16 @@ EVT_MENU(IFMENU_PLOT_FFT_COL, ImageFileView::OnPlotFFTCol) EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram) END_EVENT_TABLE() -ImageFileView::ImageFileView() -: 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; -} +ImageFileView::ImageFileView() + : wxView(), m_pBitmap(0), m_pFrame(0), m_pCanvas(0), m_pFileMenu(0), + m_pFilterMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false), + m_iDefaultExportFormatID(ImageFile::EXPORT_FORMAT_PNG) +{} ImageFileView::~ImageFileView() { GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); - GetDocumentManager()->ActivateView(this, FALSE, TRUE); + GetDocumentManager()->ActivateView(this, FALSE); } @@ -272,9 +286,9 @@ ImageFileView::OnProperties (wxCommandEvent& event) { const ImageFile& rIF = GetDocument()->getImageFile(); if (rIF.nx() == 0 || rIF.ny() == 0) - *theApp->getLog() << "Properties: empty imagefile\n"; + *theApp->getLog() << _T("Properties: empty imagefile\n"); else { - const std::string rFilename = m_pFrame->GetTitle().c_str(); + const std::string rFilename (m_pFrame->GetTitle().mb_str(wxConvUTF8)); std::ostringstream os; double min, max, mean, mode, median, stddev; rIF.statistics (rIF.getArray(), min, max, mean, mode, median, stddev); @@ -293,14 +307,14 @@ ImageFileView::OnProperties (wxCommandEvent& event) if (rIF.nLabels() > 0) { rIF.printLabelsBrief (os); } - *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; - wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); + *theApp->getLog() << _T(">>>>\n") << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("<<<<\n"); + wxMessageDialog dialogMsg (getFrameForChild(), wxConvUTF8.cMB2WX(os.str().c_str()), _T("Imagefile Properties"), wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); } GetDocument()->Activate(); } -void +void ImageFileView::OnScaleAuto (wxCommandEvent& event) { const ImageFile& rIF = GetDocument()->getImageFile(); @@ -316,43 +330,46 @@ ImageFileView::OnScaleAuto (wxCommandEvent& event) m_dMinPixel = dMin; m_dMaxPixel = dMax; m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor(); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); } } GetDocument()->Activate(); } -void +void ImageFileView::OnScaleMinMax (wxCommandEvent& event) { const ImageFile& rIF = GetDocument()->getImageFile(); double min, max; if (! m_bMinSpecified && ! m_bMaxSpecified) rIF.getMinMax (min, max); - + if (m_bMinSpecified) min = m_dMinPixel; if (m_bMaxSpecified) max = m_dMaxPixel; - - DialogGetMinMax dialogMinMax (getFrameForChild(), "Set Image Minimum & Maximum", min, max); + + DialogGetMinMax dialogMinMax (getFrameForChild(), _T("Set Image Minimum & Maximum"), min, max); int retVal = dialogMinMax.ShowModal(); if (retVal == wxID_OK) { m_bMinSpecified = true; m_bMaxSpecified = true; m_dMinPixel = dialogMinMax.getMinimum(); m_dMaxPixel = dialogMinMax.getMaximum(); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); } GetDocument()->Activate(); } -void +void ImageFileView::OnScaleFull (wxCommandEvent& event) { if (m_bMinSpecified || m_bMaxSpecified) { m_bMinSpecified = false; m_bMaxSpecified = false; + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); } GetDocument()->Activate(); @@ -363,12 +380,12 @@ ImageFileView::OnCompare (wxCommandEvent& event) { std::vector vecIF; theApp->getCompatibleImages (GetDocument(), vecIF); - + if (vecIF.size() == 0) { - wxMessageBox("There are no compatible image files open for comparision", "No comparison images"); + wxMessageBox(_T("There are no compatible image files open for comparision"), _T("No comparison images")); } else { - DialogGetComparisonImage dialogGetCompare(getFrameForChild(), "Get Comparison Image", vecIF, true); - + DialogGetComparisonImage dialogGetCompare(getFrameForChild(), _T("Get Comparison Image"), vecIF, true); + if (dialogGetCompare.ShowModal() == wxID_OK) { const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pCompareDoc = dialogGetCompare.getImageFileDocument(); @@ -376,19 +393,19 @@ ImageFileView::OnCompare (wxCommandEvent& event) std::ostringstream os; double min, max, mean, mode, median, stddev; rIF.statistics (min, max, mean, mode, median, stddev); - os << GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; + os << m_pFrame->GetTitle().mb_str(wxConvUTF8) << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; rCompareIF.statistics (min, max, mean, mode, median, stddev); - os << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; + os << dynamic_cast(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8) << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; double d, r, e; rIF.comparativeStatistics (rCompareIF, d, r, e); os << "Comparative Statistics: d=" << d << ", r=" << r << ", e=" << e << "\n"; - *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; + *theApp->getLog() << _T(">>>>\n") << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("<<<<\n"); if (dialogGetCompare.getMakeDifferenceImage()) { ImageFile* pDifferenceImage = new ImageFile; - + pDifferenceImage->setArraySize (rIF.nx(), rIF.ny()); if (! rIF.subtractImages (rCompareIF, *pDifferenceImage)) { - *theApp->getLog() << "Unable to subtract images\n"; + *theApp->getLog() << _T("Unable to subtract images\n"); delete pDifferenceImage; return; } @@ -398,23 +415,24 @@ ImageFileView::OnCompare (wxCommandEvent& event) return; } pDifferenceDoc->setImageFile (pDifferenceImage); - - wxString s = GetFrame()->GetTitle() + ": "; - pDifferenceImage->labelsCopy (rIF, s.c_str()); - s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; - pDifferenceImage->labelsCopy (rCompareIF, s.c_str()); + + wxString s = m_pFrame->GetTitle() + _T(": "); + pDifferenceImage->labelsCopy (rIF, s.mb_str(wxConvUTF8)); + s = dynamic_cast(pCompareDoc->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + pDifferenceImage->labelsCopy (rCompareIF, s.mb_str(wxConvUTF8)); std::ostringstream osLabel; - osLabel << "Compare image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() - << " and " << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": " + osLabel << "Compare image " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() + << " and " << dynamic_cast(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().c_str() << ": " << os.str().c_str(); pDifferenceImage->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pDifferenceDoc->Modify (true); + OnUpdate(this, NULL); pDifferenceDoc->UpdateAllViews(this); - pDifferenceDoc->getView()->setInitialClientSize(); + pDifferenceDoc->getView()->setInitialClientSize(); pDifferenceDoc->Activate(); } - wxMessageBox(os.str().c_str(), "Image Comparison"); + wxMessageBox(wxConvUTF8.cMB2WX(os.str().c_str()), _T("Image Comparison")); } } } @@ -427,6 +445,7 @@ ImageFileView::OnInvertValues (wxCommandEvent& event) rIF.labelAdd ("Invert Pixel Values"); if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -439,6 +458,7 @@ ImageFileView::OnSquare (wxCommandEvent& event) rIF.labelAdd ("Square Pixel Values"); if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -451,6 +471,7 @@ ImageFileView::OnSquareRoot (wxCommandEvent& event) rIF.labelAdd ("Square-root Pixel Values"); if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -463,6 +484,7 @@ ImageFileView::OnLog (wxCommandEvent& event) rIF.labelAdd ("Logrithm base-e Pixel Values"); if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -475,6 +497,7 @@ ImageFileView::OnExp (wxCommandEvent& event) rIF.labelAdd ("Exponent base-e Pixel Values"); if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -484,12 +507,12 @@ ImageFileView::OnAdd (wxCommandEvent& event) { std::vector vecIF; theApp->getCompatibleImages (GetDocument(), vecIF); - + if (vecIF.size() == 0) { - wxMessageBox ("There are no compatible image files open for comparision", "No comparison images"); + wxMessageBox (_T("There are no compatible image files open for comparision"), _T("No comparison images")); } else { - DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Add", vecIF, false); - + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), _T("Get Image to Add"), vecIF, false); + if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); @@ -499,20 +522,21 @@ ImageFileView::OnAdd (wxCommandEvent& event) sys_error (ERR_SEVERE, "Unable to create image file"); return; } - ImageFile& newImage = pNewDoc->getImageFile(); + ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.addImages (rRHSIF, newImage); std::ostringstream os; - os << "Add image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " - << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); - wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; - newImage.labelsCopy (rIF, s.c_str()); - s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; - newImage.labelsCopy (rRHSIF, s.c_str()); + os << "Add image " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " and " + << dynamic_cast(pRHSDoc->GetFirstView()->GetFrame())->GetTitle().c_str(); + wxString s = dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + newImage.labelsCopy (rIF, s.mb_str(wxConvUTF8)); + s = dynamic_cast(pRHSDoc->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + newImage.labelsCopy (rRHSIF, s.mb_str(wxConvUTF8)); newImage.labelAdd (os.str().c_str()); - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); if (theApp->getAskDeleteNewDocs()) pNewDoc->Modify (true); + OnUpdate(this, NULL); pNewDoc->UpdateAllViews (this); pNewDoc->getView()->setInitialClientSize(); pNewDoc->Activate(); @@ -525,12 +549,12 @@ ImageFileView::OnSubtract (wxCommandEvent& event) { std::vector vecIF; theApp->getCompatibleImages (GetDocument(), vecIF); - + if (vecIF.size() == 0) { - wxMessageBox ("There are no compatible image files open for comparision", "No comparison images"); + wxMessageBox (_T("There are no compatible image files open for comparision"), _T("No comparison images")); } else { - DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Subtract", vecIF, false); - + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), _T("Get Image to Subtract"), vecIF, false); + if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); @@ -540,20 +564,21 @@ ImageFileView::OnSubtract (wxCommandEvent& event) sys_error (ERR_SEVERE, "Unable to create image file"); return; } - ImageFile& newImage = pNewDoc->getImageFile(); + ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.subtractImages (rRHSIF, newImage); std::ostringstream os; - os << "Subtract image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " - << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); - wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; - newImage.labelsCopy (rIF, s.c_str()); - s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; - newImage.labelsCopy (rRHSIF, s.c_str()); + os << "Subtract image " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " and " + << dynamic_cast(pRHSDoc->GetFirstView()->GetFrame())->GetTitle().c_str(); + wxString s = dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + newImage.labelsCopy (rIF, s.mb_str(wxConvUTF8)); + s = dynamic_cast(pRHSDoc->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + newImage.labelsCopy (rRHSIF, s.mb_str(wxConvUTF8)); newImage.labelAdd (os.str().c_str()); - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); if (theApp->getAskDeleteNewDocs()) pNewDoc->Modify (true); + OnUpdate(this, NULL); pNewDoc->UpdateAllViews (this); pNewDoc->getView()->setInitialClientSize(); pNewDoc->Activate(); @@ -566,12 +591,12 @@ ImageFileView::OnMultiply (wxCommandEvent& event) { std::vector vecIF; theApp->getCompatibleImages (GetDocument(), vecIF); - + if (vecIF.size() == 0) { - wxMessageBox ("There are no compatible image files open for comparision", "No comparison images"); + wxMessageBox (_T("There are no compatible image files open for comparision"), _T("No comparison images")); } else { - DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Multiply", vecIF, false); - + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), _T("Get Image to Multiply"), vecIF, false); + if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); @@ -581,20 +606,21 @@ ImageFileView::OnMultiply (wxCommandEvent& event) sys_error (ERR_SEVERE, "Unable to create image file"); return; } - ImageFile& newImage = pNewDoc->getImageFile(); + ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.multiplyImages (rRHSIF, newImage); std::ostringstream os; - os << "Multiply image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " - << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); - wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; - newImage.labelsCopy (rIF, s.c_str()); - s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; - newImage.labelsCopy (rRHSIF, s.c_str()); + os << "Multiply image " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " and " + << dynamic_cast(pRHSDoc->GetFirstView()->GetFrame())->GetTitle().c_str(); + wxString s = dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + newImage.labelsCopy (rIF, s.mb_str(wxConvUTF8)); + s = dynamic_cast(pRHSDoc->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + newImage.labelsCopy (rRHSIF, s.mb_str(wxConvUTF8)); newImage.labelAdd (os.str().c_str()); - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); if (theApp->getAskDeleteNewDocs()) pNewDoc->Modify (true); + OnUpdate(this, NULL); pNewDoc->UpdateAllViews (this); pNewDoc->getView()->setInitialClientSize(); pNewDoc->Activate(); @@ -607,12 +633,12 @@ ImageFileView::OnDivide (wxCommandEvent& event) { std::vector vecIF; theApp->getCompatibleImages (GetDocument(), vecIF); - + if (vecIF.size() == 0) { - wxMessageBox ("There are no compatible image files open for comparision", "No comparison images"); + wxMessageBox (_T("There are no compatible image files open for comparision"), _T("No comparison images")); } else { - DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Divide", vecIF, false); - + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), _T("Get Image to Divide"), vecIF, false); + if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); @@ -622,20 +648,21 @@ ImageFileView::OnDivide (wxCommandEvent& event) sys_error (ERR_SEVERE, "Unable to create image file"); return; } - ImageFile& newImage = pNewDoc->getImageFile(); + ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.divideImages (rRHSIF, newImage); std::ostringstream os; - os << "Divide image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " by " - << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); - wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; - newImage.labelsCopy (rIF, s.c_str()); - s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; - newImage.labelsCopy (rRHSIF, s.c_str()); + os << "Divide image " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " by " + << dynamic_cast(pRHSDoc->GetFirstView()->GetFrame())->GetTitle().c_str(); + wxString s = dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + newImage.labelsCopy (rIF, s.mb_str(wxConvUTF8)); + s = dynamic_cast(pRHSDoc->GetFirstView()->GetFrame())->GetTitle() + _T(": "); + newImage.labelsCopy (rRHSIF, s.mb_str(wxConvUTF8)); newImage.labelAdd (os.str().c_str()); - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); if (theApp->getAskDeleteNewDocs()) pNewDoc->Modify (true); + OnUpdate(this, NULL); pNewDoc->UpdateAllViews (this); pNewDoc->getView()->setInitialClientSize(); pNewDoc->Activate(); @@ -655,6 +682,7 @@ ImageFileView::OnFFT (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -669,6 +697,7 @@ ImageFileView::OnIFFT (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -683,6 +712,7 @@ ImageFileView::OnFFTRows (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -697,6 +727,7 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -711,6 +742,7 @@ ImageFileView::OnFFTCols (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -725,6 +757,7 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -734,13 +767,14 @@ void ImageFileView::OnFourier (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); - wxProgressDialog dlgProgress (wxString("Fourier"), wxString("Fourier Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + wxProgressDialog dlgProgress (_T("Fourier"), _T("Fourier Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); rIF.fourier (rIF); rIF.labelAdd ("Fourier Image"); m_bMinSpecified = false; m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -749,13 +783,14 @@ void ImageFileView::OnInverseFourier (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); - wxProgressDialog dlgProgress (wxString("Inverse Fourier"), wxString("Inverse Fourier Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + wxProgressDialog dlgProgress (_T("Inverse Fourier"), _T("Inverse Fourier Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); rIF.inverseFourier (rIF); rIF.labelAdd ("Inverse Fourier Image"); m_bMinSpecified = false; m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -770,6 +805,7 @@ ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -784,6 +820,7 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -798,6 +835,7 @@ ImageFileView::OnMagnitude (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); GetDocument()->Activate(); } @@ -813,6 +851,7 @@ ImageFileView::OnPhase (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); } GetDocument()->Activate(); @@ -829,6 +868,7 @@ ImageFileView::OnReal (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); } GetDocument()->Activate(); @@ -845,25 +885,21 @@ ImageFileView::OnImaginary (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getAskDeleteNewDocs()) GetDocument()->Modify (true); + OnUpdate(this, NULL); GetDocument()->UpdateAllViews (this); } GetDocument()->Activate(); } -ImageFileCanvas* +ImageFileCanvas* ImageFileView::CreateCanvas (wxFrame* parent) { - ImageFileCanvas* pCanvas; - int width, height; - parent->GetClientSize(&width, &height); - - pCanvas = new ImageFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); - - pCanvas->SetScrollbars(20, 20, 50, 50); + ImageFileCanvas* pCanvas = new ImageFileCanvas (this, parent, wxPoint(-1,-1), + wxSize(-1,-1), 0); pCanvas->SetBackgroundColour(*wxWHITE); - pCanvas->Clear(); - + pCanvas->ClearBackground(); + return pCanvas; } @@ -875,126 +911,124 @@ wxDocChildFrame* ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, _T("ImageFile Frame"), wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, _T("ImageFile Frame"), wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #endif 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"); - m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); - m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); - m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); - m_pFileMenu->Append(wxID_REVERT, "Re&vert"); - + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, _T("Cr&eate Phantom...\tCtrl-P")); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, _T("Create &Filter...\tCtrl-F")); + m_pFileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl-O")); + m_pFileMenu->Append(wxID_SAVE, _T("&Save\tCtrl-S")); + m_pFileMenu->Append(wxID_SAVEAS, _T("Save &As...")); + m_pFileMenu->Append(wxID_CLOSE, _T("&Close\tCtrl-W")); + m_pFileMenu->Append(wxID_REVERT, _T("Re&vert")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); - m_pFileMenu->Append(IFMENU_FILE_EXPORT, "Expor&t..."); - + m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, _T("P&roperties\tCtrl-I")); + m_pFileMenu->Append(IFMENU_FILE_EXPORT, _T("Expor&t...")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(wxID_PRINT, "&Print..."); - m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - m_pFileMenu->Append(wxID_PREVIEW, "Print Preview"); + m_pFileMenu->Append(wxID_PRINT, _T("&Print...")); + m_pFileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup...")); + m_pFileMenu->Append(wxID_PREVIEW, _T("Print Preview")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); -#ifdef CTSIM_MDI + m_pFileMenu->Append(MAINMENU_IMPORT, _T("&Import...\tCtrl-M")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); - m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); -#endif + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, _T("Prefere&nces...")); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, _T("E&xit")); GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); - + wxMenu* edit_menu = new wxMenu; - 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"); - + edit_menu->Append(IFMENU_EDIT_COPY, _T("Copy\tCtrl-C")); + edit_menu->Append(IFMENU_EDIT_CUT, _T("Cut\tCtrl-X")); + edit_menu->Append(IFMENU_EDIT_PASTE, _T("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"); - view_menu->Append(IFMENU_VIEW_SCALE_FULL, "Display F&ull Scale\tCtrl-U"); - + view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, _T("Display Scale S&et...\tCtrl-E")); + view_menu->Append(IFMENU_VIEW_SCALE_AUTO, _T("Display Scale &Auto...\tCtrl-A")); + view_menu->Append(IFMENU_VIEW_SCALE_FULL, _T("Display F&ull Scale\tCtrl-U")); + 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->Append (IFMENU_FILTER_INVERTVALUES, _T("In&vert Values")); + m_pFilterMenu->Append (IFMENU_FILTER_SQUARE, _T("&Square")); + m_pFilterMenu->Append (IFMENU_FILTER_SQRT, _T("Square &Root")); + m_pFilterMenu->Append (IFMENU_FILTER_LOG, _T("&Log")); + m_pFilterMenu->Append (IFMENU_FILTER_EXP, _T("E&xp")); m_pFilterMenu->AppendSeparator(); #ifdef HAVE_FFT - 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"); + m_pFilterMenu->Append (IFMENU_FILTER_FFT, _T("2-D &FFT\tCtrl-2")); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT, _T("2-D &IFFT\tAlt-2")); + m_pFilterMenu->Append (IFMENU_FILTER_FFT_ROWS, _T("FFT Rows")); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT_ROWS, _T("IFFT Rows")); + m_pFilterMenu->Append (IFMENU_FILTER_FFT_COLS, _T("FFT Columns")); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT_COLS, _T("IFFT Columns")); + m_pFilterMenu->Append (IFMENU_FILTER_FOURIER, _T("2-D F&ourier")); + m_pFilterMenu->Append (IFMENU_FILTER_INVERSE_FOURIER, _T("2-D Inverse Fo&urier")); #else - m_pFilterMenu->Append (IFMENU_FILTER_FOURIER, "&Fourier"); - m_pFilterMenu->Append (IFMENU_FILTER_INVERSE_FOURIER, "&Inverse Fourier"); + m_pFilterMenu->Append (IFMENU_FILTER_FOURIER, _T("&Fourier")); + m_pFilterMenu->Append (IFMENU_FILTER_INVERSE_FOURIER, _T("&Inverse Fourier")); #endif - 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->Append (IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, _T("Shuffl&e Fourier to Natural Order")); + m_pFilterMenu->Append (IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, _T("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"); - + m_pFilterMenu->Append (IFMENU_FILTER_MAGNITUDE, _T("&Magnitude")); + m_pFilterMenu->Append (IFMENU_FILTER_PHASE, _T("&Phase")); + m_pFilterMenu->Append (IFMENU_FILTER_REAL, _T("Re&al")); + m_pFilterMenu->Append (IFMENU_FILTER_IMAGINARY, _T("Ima&ginary")); + wxMenu* image_menu = new wxMenu; - image_menu->Append (IFMENU_IMAGE_ADD, "&Add..."); - image_menu->Append (IFMENU_IMAGE_SUBTRACT, "&Subtract..."); - image_menu->Append (IFMENU_IMAGE_MULTIPLY, "&Multiply..."); - image_menu->Append (IFMENU_IMAGE_DIVIDE, "&Divide..."); + image_menu->Append (IFMENU_IMAGE_ADD, _T("&Add...")); + image_menu->Append (IFMENU_IMAGE_SUBTRACT, _T("&Subtract...")); + image_menu->Append (IFMENU_IMAGE_MULTIPLY, _T("&Multiply...")); + image_menu->Append (IFMENU_IMAGE_DIVIDE, _T("&Divide...")); image_menu->AppendSeparator(); - image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size..."); + image_menu->Append (IFMENU_IMAGE_SCALESIZE, _T("S&cale Size...")); #if wxUSE_GLCANVAS - image_menu->Append (IFMENU_IMAGE_CONVERT3D, "Convert &3-D\tCtrl-3"); + image_menu->Append (IFMENU_IMAGE_CONVERT3D, _T("Convert &3-D\tCtrl-3")); #endif - + m_pMenuAnalyze = new wxMenu; - m_pMenuAnalyze->Append (IFMENU_PLOT_ROW, "Plot &Row"); - m_pMenuAnalyze->Append (IFMENU_PLOT_COL, "Plot &Column"); - m_pMenuAnalyze->Append (IFMENU_PLOT_HISTOGRAM, "Plot &Histogram"); + m_pMenuAnalyze->Append (IFMENU_PLOT_ROW, _T("Plot &Row")); + m_pMenuAnalyze->Append (IFMENU_PLOT_COL, _T("Plot &Column")); + m_pMenuAnalyze->Append (IFMENU_PLOT_HISTOGRAM, _T("Plot &Histogram")); m_pMenuAnalyze->AppendSeparator(); - m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_ROW, "P&lot FFT Row"); - m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_COL, "Plo&t FFT Column"); + m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_ROW, _T("P&lot FFT Row")); + m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_COL, _T("Plo&t FFT Column")); m_pMenuAnalyze->AppendSeparator(); - m_pMenuAnalyze->Append (IFMENU_COMPARE_IMAGES, "Compare &Images..."); - m_pMenuAnalyze->Append (IFMENU_COMPARE_ROW, "Compare Ro&w"); - m_pMenuAnalyze->Append (IFMENU_COMPARE_COL, "Compare Colu&mn"); + m_pMenuAnalyze->Append (IFMENU_COMPARE_IMAGES, _T("Compare &Images...")); + m_pMenuAnalyze->Append (IFMENU_COMPARE_ROW, _T("Compare Ro&w")); + m_pMenuAnalyze->Append (IFMENU_COMPARE_COL, _T("Compare Colu&mn")); m_pMenuAnalyze->Enable (IFMENU_PLOT_ROW, false); m_pMenuAnalyze->Enable (IFMENU_PLOT_COL, false); m_pMenuAnalyze->Enable (IFMENU_COMPARE_ROW, false); m_pMenuAnalyze->Enable (IFMENU_COMPARE_COL, false); m_pMenuAnalyze->Enable (IFMENU_PLOT_FFT_ROW, false); m_pMenuAnalyze->Enable (IFMENU_PLOT_FFT_COL, false); - + wxMenu *help_menu = new wxMenu; - help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); - help_menu->Append (IDH_QUICKSTART, "&Quick Start"); - help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); - + help_menu->Append(MAINMENU_HELP_CONTENTS, _T("&Contents\tF1")); + help_menu->Append (MAINMENU_HELP_TIPS, _T("&Tips")); + help_menu->Append (IDH_QUICKSTART, _T("&Quick Start")); + help_menu->Append(MAINMENU_HELP_ABOUT, _T("&About")); + wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(m_pFileMenu, "&File"); - menu_bar->Append(edit_menu, "&Edit"); - menu_bar->Append(view_menu, "&View"); - menu_bar->Append(image_menu, "&Image"); - menu_bar->Append(m_pFilterMenu, "Fi<er"); - menu_bar->Append(m_pMenuAnalyze, "&Analyze"); - menu_bar->Append(help_menu, "&Help"); - + + menu_bar->Append(m_pFileMenu, _T("&File")); + menu_bar->Append(edit_menu, _T("&Edit")); + menu_bar->Append(view_menu, _T("&View")); + menu_bar->Append(image_menu, _T("&Image")); + menu_bar->Append(m_pFilterMenu, _T("Fi<er")); + menu_bar->Append(m_pMenuAnalyze, _T("&Analyze")); + menu_bar->Append(help_menu, _T("&Help")); + subframe->SetMenuBar(menu_bar); - + subframe->Centre(wxBOTH); - + 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); @@ -1011,68 +1045,63 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) #if wxUSE_GLCANVAS accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast('3'), IFMENU_IMAGE_CONVERT3D); #endif + wxAcceleratorTable accelTable (iEntry, accelEntries); - subframe->SetAcceleratorTable (accelTable); - + return subframe; } -bool +bool ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { - m_pFrame = CreateChildFrame(doc, this); - m_bMinSpecified = false; m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; - - // int width, height; - // m_pFrame->GetClientSize (&width, &height); - m_pFrame->SetTitle("ImageFileView"); + + m_pFrame = CreateChildFrame(doc, this); + SetFrame (m_pFrame); 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); - m_pFrame->SetFocus(); + m_pFrame->SetClientSize (m_pCanvas->GetBestSize()); + m_pCanvas->SetClientSize (m_pCanvas->GetBestSize()); + m_pFrame->SetTitle(_T("ImageFileView")); + m_pFrame->Show(true); - // Activate(true); - + Activate(true); + return true; } -void +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 +void ImageFileView::OnDraw (wxDC* dc) { - if (m_bitmap.Ok()) - dc->DrawBitmap(m_bitmap, 0, 0, false); - + if (m_pBitmap && m_pBitmap->Ok()) { +#ifdef DEBUG + *theApp->getLog() << _T("Drawing bitmap\n"); +#endif + dc->DrawBitmap(*m_pBitmap, 0, 0, false); + } + int xCursor, yCursor; if (m_pCanvas->GetCurrentCursor (xCursor, yCursor)) m_pCanvas->DrawRubberBandCursor (*dc, xCursor, yCursor); } -void +void ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { const ImageFile& rIF = GetDocument()->getImageFile(); @@ -1098,7 +1127,7 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) m_dMaxPixel = max; } double scaleWidth = m_dMaxPixel - m_dMinPixel; - + unsigned char* imageData = new unsigned char [nx * ny * 3]; if (! imageData) { sys_error (ERR_SEVERE, "Unable to allocate memory for Image display"); @@ -1114,23 +1143,29 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) } } wxImage image (nx, ny, imageData, true); - m_bitmap = image.ConvertToBitmap(); + if (m_pBitmap) { + delete m_pBitmap; + m_pBitmap = NULL; + } +#ifdef DEBUG + *theApp->getLog() << _T("Making new bitmap\n"); +#endif + m_pBitmap = new wxBitmap (image); delete imageData; m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20); m_pCanvas->SetBackgroundColour(*wxWHITE); - } - + } + if (m_pCanvas) m_pCanvas->Refresh(); } -bool +bool ImageFileView::OnClose (bool deleteWindow) { - //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; - + Activate (false); if (m_pCanvas) { m_pCanvas->setView(NULL); @@ -1139,16 +1174,16 @@ ImageFileView::OnClose (bool deleteWindow) wxString s(theApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - + SetFrame(NULL); - + if (deleteWindow) { delete m_pFrame; m_pFrame = NULL; if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround } - + return true; } @@ -1156,9 +1191,10 @@ void ImageFileView::OnEditCopy (wxCommandEvent& event) { wxBitmapDataObject *pBitmapObject = new wxBitmapDataObject; - - pBitmapObject->SetBitmap (m_bitmap); - + + if (m_pBitmap) + pBitmapObject->SetBitmap (*m_pBitmap); + if (wxTheClipboard->Open()) { wxTheClipboard->SetData (pBitmapObject); wxTheClipboard->Close(); @@ -1185,7 +1221,7 @@ void ImageFileView::OnEditPaste (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); - + if (wxTheClipboard->Open()) { wxBitmap bitmap; if (wxTheClipboard->IsSupported (wxDF_BITMAP)) { @@ -1194,13 +1230,13 @@ ImageFileView::OnEditPaste (wxCommandEvent& event) bitmap = bitmapObject.GetBitmap (); } wxTheClipboard->Close(); - + int nx = rIF.nx(); int ny = rIF.ny(); bool bMonochrome = false; if (bitmap.Ok() == true && bitmap.GetWidth() == nx && bitmap.GetHeight() == ny) { - wxImage image (bitmap); + wxImage image (bitmap.ConvertToImage()); double dScale3 = 3 * 255; unsigned char* pixels = image.GetData(); ImageFileArray v = rIF.getArray(); @@ -1243,44 +1279,49 @@ ImageFileView::OnExport (wxCommandEvent& event) if (! m_bMaxSpecified) m_dMaxPixel = max; } - + DialogExportParameters dialogExport (getFrameForChild(), m_iDefaultExportFormatID); if (dialogExport.ShowModal() == wxID_OK) { - wxString strFormatName (dialogExport.getFormatName ()); - m_iDefaultExportFormatID = ImageFile::convertExportFormatNameToID (strFormatName.c_str()); - + wxString strFormatName (dialogExport.getFormatName (), wxConvUTF8); + m_iDefaultExportFormatID = ImageFile::convertExportFormatNameToID (strFormatName.mb_str(wxConvUTF8)); + wxString strExt; wxString strWildcard; if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PGM || m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PGMASCII) { - strExt = ".pgm"; - strWildcard = "PGM Files (*.pgm)|*.pgm"; + strExt = _T(".pgm"); + strWildcard = _T("PGM Files (*.pgm)|*.pgm"); } #ifdef HAVE_PNG else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PNG || m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PNG16) { - strExt = ".png"; - strWildcard = "PNG Files (*.png)|*.png"; + strExt = _T(".png"); + strWildcard = _T("PNG Files (*.png)|*.png"); } #endif #ifdef HAVE_CTN_DICOM else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_DICOM) { - strExt = ""; - strWildcard = "DICOM Files (*.*)|*.*"; + strExt = _T(""); + strWildcard = _T("DICOM Files (*.*)|*.*"); } #endif else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_TEXT) { - strExt = ".txt"; - strWildcard = "Text (*.txt)|*.txt"; + strExt = _T(".txt"); + strWildcard = _T("Text (*.txt)|*.txt"); } else { - strExt = ""; - strWildcard = "Miscellaneous (*.*)|*.*"; + strExt = _T(""); + strWildcard = _T("Miscellaneous (*.*)|*.*"); } - - const wxString& strFilename = wxFileSelector (wxString("Export Filename"), wxString(""), - wxString(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE); + +#if WXWIN_COMPATIBILITY_2_4 + const wxString& strFilename = wxFileSelector (_T("Export Filename"), _T(""), + _T(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE); +#else + const wxString& strFilename = wxFileSelector (_T("Export Filename"), _T(""), + _T(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxSAVE); +#endif if (strFilename) { - rIF.exportImage (strFormatName.c_str(), strFilename.c_str(), 1, 1, m_dMinPixel, m_dMaxPixel); - *theApp->getLog() << "Exported file " << strFilename << "\n"; + rIF.exportImage (strFormatName.mb_str(wxConvUTF8), strFilename.mb_str(wxConvUTF8), 1, 1, m_dMinPixel, m_dMaxPixel); + *theApp->getLog() << _T("Exported file ") << strFilename << _T("\n"); } } } @@ -1292,8 +1333,8 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); unsigned int iOldNX = rIF.nx(); unsigned int iOldNY = rIF.ny(); - - DialogGetXYSize dialogGetXYSize (getFrameForChild(), "Set New X & Y Dimensions", iOldNX, iOldNY); + + DialogGetXYSize dialogGetXYSize (getFrameForChild(), _T("Set New X & Y Dimensions"), iOldNX, iOldNY); if (dialogGetXYSize.ShowModal() == wxID_OK) { unsigned int iNewNX = dialogGetXYSize.getXSize(); unsigned int iNewNY = dialogGetXYSize.getYSize(); @@ -1309,9 +1350,10 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) rScaledIF.labelsCopy (rIF); rScaledIF.labelAdd (os.str().c_str()); rIF.scaleImage (rScaledIF); - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); if (theApp->getAskDeleteNewDocs()) pScaledDoc->Modify (true); + OnUpdate(this, NULL); pScaledDoc->UpdateAllViews (this); pScaledDoc->getView()->setInitialClientSize(); pScaledDoc->Activate(); @@ -1324,13 +1366,12 @@ ImageFileView::OnConvert3d (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); Graph3dFileDocument* pGraph3d = theApp->newGraph3dDoc(); + pGraph3d->getView()->getFrame()->Show (false); pGraph3d->setBadFileOpen(); pGraph3d->createFromImageFile (rIF); - pGraph3d->getView()->OnUpdate (this, NULL); pGraph3d->UpdateAllViews(); - pGraph3d->getView()->getFrame()->SetClientSize (400, 400); pGraph3d->getView()->getFrame()->Show (true); - GetDocumentManager()->ActivateView (pGraph3d->getView(), true, false); + pGraph3d->getView()->Activate(true); ::wxYield(); pGraph3d->getView()->getCanvas()->SetFocus(); } @@ -1341,16 +1382,16 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) { int xCursor, yCursor; if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { - wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error"); + wxMessageBox (_T("No row selected. Please use left mouse button on image to select column"),_T("Error")); return; } - + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); int ny = rIF.ny(); - + if (v != NULL && yCursor < ny) { double* pX = new double [nx]; double* pYReal = new double [nx]; @@ -1397,15 +1438,15 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) } else rPlotFile.setCurveSize (2, nx); rPlotFile.addColumn (0, pX); - rPlotFile.addColumn (1, pYReal); + rPlotFile.addColumn (1, pYReal); if (rIF.isComplex()) { rPlotFile.addColumn (2, pYImag); rPlotFile.addColumn (3, pYMag); } for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str()); - os << " Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); - *theApp->getLog() << os.str().c_str() << "\n"; + os << " Plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); } delete pX; @@ -1427,16 +1468,16 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) { int xCursor, yCursor; if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { - wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); + wxMessageBox (_T("No column selected. Please use left mouse button on image to select column"),_T("Error")); return; } - + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); int ny = rIF.ny(); - + if (v != NULL && xCursor < nx) { double* pX = new double [ny]; double* pYReal = new double [ny]; @@ -1483,15 +1524,15 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) } else rPlotFile.setCurveSize (2, ny); rPlotFile.addColumn (0, pX); - rPlotFile.addColumn (1, pYReal); + rPlotFile.addColumn (1, pYReal); if (rIF.isComplex()) { rPlotFile.addColumn (2, pYImag); rPlotFile.addColumn (3, pYMag); } for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str()); - os << " Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); - *theApp->getLog() << os.str().c_str() << "\n"; + os << " Plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); } delete pX; @@ -1514,46 +1555,46 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) { int xCursor, yCursor; if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { - wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error"); + wxMessageBox (_T("No row selected. Please use left mouse button on image to select column"),_T("Error")); return; } - + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); int ny = rIF.ny(); - + if (v != NULL && yCursor < ny) { - fftw_complex* pcIn = new fftw_complex [nx]; - + fftw_complex* pcIn = static_cast(fftw_malloc (sizeof(fftw_complex) * nx)); + int i; for (i = 0; i < nx; i++) { - pcIn[i].re = v[i][yCursor]; + pcIn[i][0] = v[i][yCursor]; if (rIF.isComplex()) - pcIn[i].im = vImag[i][yCursor]; + pcIn[i][1] = vImag[i][yCursor]; else - pcIn[i].im = 0; + pcIn[i][1] = 0; } - - fftw_plan plan = fftw_create_plan (nx, FFTW_FORWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM); - fftw_one (plan, pcIn, NULL); + + fftw_plan plan = fftw_plan_dft_1d (nx, pcIn, pcIn, FFTW_FORWARD, FFTW_ESTIMATE); + fftw_execute (plan); fftw_destroy_plan (plan); - + double* pX = new double [nx]; double* pYReal = new double [nx]; double* pYImag = new double [nx]; double* pYMag = new double [nx]; for (i = 0; i < nx; i++) { pX[i] = i; - 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); + pYReal[i] = pcIn[i][0] / nx; + pYImag[i] = pcIn[i][1] / nx; + pYMag[i] = ::sqrt (pcIn[i][0] * pcIn[i][0] + pcIn[i][1] * pcIn[i][1]); } Fourier::shuffleFourierToNaturalOrder (pYReal, nx); Fourier::shuffleFourierToNaturalOrder (pYImag, nx); Fourier::shuffleFourierToNaturalOrder (pYMag, nx); - + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); @@ -1585,16 +1626,16 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) rPlotFile.addColumn (3, pYMag); 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"; + os << " FFT Plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); } delete pX; delete pYReal; delete pYImag; delete pYMag; - delete [] pcIn; - + fftw_free(pcIn); + if (theApp->getAskDeleteNewDocs()) pPlotDoc->Modify (true); pPlotDoc->getView()->getFrame()->Show(true); @@ -1608,27 +1649,27 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) { int xCursor, yCursor; if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { - wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); + wxMessageBox (_T("No column selected. Please use left mouse button on image to select column"),_T("Error")); return; } - + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); int ny = rIF.ny(); - + if (v != NULL && xCursor < nx) { fftw_complex* pcIn = new fftw_complex [ny]; double *pdTemp = new double [ny]; - + int i; for (i = 0; i < ny; i++) pdTemp[i] = v[xCursor][i]; Fourier::shuffleNaturalToFourierOrder (pdTemp, ny); - for (i = 0; i < ny; i++) - pcIn[i].re = pdTemp[i]; - + for (i = 0; i < ny; i++) + pcIn[i][0] = pdTemp[i]; + for (i = 0; i < ny; i++) { if (rIF.isComplex()) pdTemp[i] = vImag[xCursor][i]; @@ -1637,23 +1678,23 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) } Fourier::shuffleNaturalToFourierOrder (pdTemp, ny); for (i = 0; i < ny; i++) - pcIn[i].im = pdTemp[i]; - - fftw_plan plan = fftw_create_plan (ny, FFTW_BACKWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM); - fftw_one (plan, pcIn, NULL); + pcIn[i][1] = pdTemp[i]; + + fftw_plan plan = fftw_plan_dft_1d (ny, pcIn, pcIn, FFTW_BACKWARD, FFTW_ESTIMATE); + fftw_execute (plan); fftw_destroy_plan (plan); - + double* pX = new double [ny]; double* pYReal = new double [ny]; double* pYImag = new double [ny]; double* pYMag = new double [ny]; for (i = 0; i < ny; i++) { pX[i] = i; - 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); + pYReal[i] = pcIn[i][0] / ny; + pYImag[i] = pcIn[i][1] / ny; + pYMag[i] = ::sqrt (pcIn[i][0] * pcIn[i][0] + pcIn[i][1] * pcIn[i][1]); } - + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); @@ -1685,8 +1726,8 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) rPlotFile.addColumn (3, pYMag); 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"; + os << " FFT Plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); } delete pX; @@ -1695,7 +1736,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) delete pYMag; delete pdTemp; delete [] pcIn; - + if (theApp->getAskDeleteNewDocs()) pPlotDoc->Modify (true); pPlotDoc->getView()->getFrame()->Show(true); @@ -1710,28 +1751,28 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) { int xCursor, yCursor; if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { - wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); + wxMessageBox (_T("No column selected. Please use left mouse button on image to select column"),_T("Error")); return; } - + std::vector vecIFDoc; theApp->getCompatibleImages (GetDocument(), vecIFDoc); if (vecIFDoc.size() == 0) { - wxMessageBox ("No compatible images for Column Comparison", "Error"); + wxMessageBox (_T("No compatible images for Column Comparison"), _T("Error")); return; } - DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Comparison Image", vecIFDoc, false); - + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), _T("Get Comparison Image"), vecIFDoc, false); + if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFileDocument* pCompareDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rIF = GetDocument()->getImageFile(); const ImageFile& rCompareIF = pCompareDoc->getImageFile(); - + ImageFileArrayConst v1 = rIF.getArray(); ImageFileArrayConst v2 = rCompareIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); - + if (v1 != NULL && xCursor < nx) { double* pX = new double [ny]; double* pY1 = new double [ny]; @@ -1765,23 +1806,24 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) rPlotFile.addColumn (0, pX); rPlotFile.addColumn (1, pY1); rPlotFile.addColumn (2, pY2); - + unsigned int iL; for (iL = 0; iL < rIF.nLabels(); iL++) { - std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); - s += ": "; - s += rIF.labelGet(iL).getLabelString(); - rPlotFile.addDescription (s.c_str()); + std::ostringstream os; + os << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8); + os << ": " << rIF.labelGet(iL).getLabelString(); + rPlotFile.addDescription (os.str().c_str()); } for (iL = 0; iL < rCompareIF.nLabels(); iL++) { - std::string s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); - s += ": "; - s += rCompareIF.labelGet(iL).getLabelString(); - rPlotFile.addDescription (s.c_str()); + std::ostringstream os; + os << dynamic_cast(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8); + os << ": "; + os << rCompareIF.labelGet(iL).getLabelString(); + rPlotFile.addDescription (os.str().c_str()); } - os << " Between " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " - << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); - *theApp->getLog() << os.str().c_str() << "\n"; + os << " Between " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " and " + << dynamic_cast(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().c_str(); + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); } delete pX; @@ -1801,30 +1843,30 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) { int xCursor, yCursor; if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { - wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); + wxMessageBox (_T("No column selected. Please use left mouse button on image to select column"),_T("Error")); return; } - + std::vector vecIFDoc; theApp->getCompatibleImages (GetDocument(), vecIFDoc); - + if (vecIFDoc.size() == 0) { - wxMessageBox ("No compatible images for Row Comparison", "Error"); + wxMessageBox (_T("No compatible images for Row Comparison"), _T("Error")); return; } - - DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Comparison Image", vecIFDoc, false); - + + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), _T("Get Comparison Image"), vecIFDoc, false); + if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFileDocument* pCompareDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rIF = GetDocument()->getImageFile(); const ImageFile& rCompareIF = pCompareDoc->getImageFile(); - + ImageFileArrayConst v1 = rIF.getArray(); ImageFileArrayConst v2 = rCompareIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); - + if (v1 != NULL && yCursor < ny) { double* pX = new double [nx]; double* pY1 = new double [nx]; @@ -1860,20 +1902,21 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) rPlotFile.addColumn (2, pY2); unsigned int iL; for (iL = 0; iL < rIF.nLabels(); iL++) { - std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); - s += ": "; - s += rIF.labelGet(iL).getLabelString(); - rPlotFile.addDescription (s.c_str()); + std::ostringstream os; + os << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8); + os << ": "; + os << rIF.labelGet(iL).getLabelString(); + rPlotFile.addDescription (os.str().c_str()); } for (iL = 0; iL < rCompareIF.nLabels(); iL++) { - std::string s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); - s += ": "; - s += rCompareIF.labelGet(iL).getLabelString(); - rPlotFile.addDescription (s.c_str()); + std::ostringstream os; + os << dynamic_cast(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8) << ": " + << rCompareIF.labelGet(iL).getLabelString(); + rPlotFile.addDescription (os.str().c_str()); } - os << " Between " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " - << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); - *theApp->getLog() << os.str().c_str() << "\n"; + os << " Between " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8) << " and " + << dynamic_cast(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().c_str(); + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); } delete pX; @@ -1892,25 +1935,25 @@ static int NUMBER_HISTOGRAM_BINS = 256; void ImageFileView::OnPlotHistogram (wxCommandEvent& event) -{ +{ const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); - + if (v != NULL && nx > 0 && ny > 0) { PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); return; } - + double* pX = new double [NUMBER_HISTOGRAM_BINS]; double* pY = new double [NUMBER_HISTOGRAM_BINS]; double dMin, dMax; rIF.getMinMax (dMin, dMax); 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; @@ -1921,7 +1964,7 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) if (iBin >= 0 && iBin < NUMBER_HISTOGRAM_BINS) pY[iBin] += 1; } - + PlotFile& rPlotFile = pPlotDoc->getPlotFile(); std::ostringstream os; os << "Histogram"; @@ -1936,13 +1979,13 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) rPlotFile.addColumn (0, pX); rPlotFile.addColumn (1, pY); for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) { - std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); - s += ": "; - s += rIF.labelGet(iL).getLabelString(); - rPlotFile.addDescription (s.c_str()); + std::ostringstream os; + os << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8); + os << ": " << rIF.labelGet(iL).getLabelString(); + rPlotFile.addDescription (os.str().c_str()); } - os << " plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); - *theApp->getLog() << os.str().c_str() << "\n"; + os << " plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); delete pX; delete pY; @@ -1958,9 +2001,8 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) // PhantomCanvas PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style) -: wxScrolledWindow(frame, -1, pos, size, style) + : wxScrolledWindow(frame, -1, pos, size, style), m_pView(v) { - m_pView = v; } PhantomCanvas::~PhantomCanvas () @@ -1968,7 +2010,7 @@ PhantomCanvas::~PhantomCanvas () m_pView = NULL; } -void +void PhantomCanvas::OnDraw (wxDC& dc) { if (m_pView) @@ -1980,7 +2022,7 @@ PhantomCanvas::GetBestSize() const { if (! m_pView) return wxSize(0,0); - + int xSize, ySize; theApp->getMainFrame()->GetClientSize (&xSize, &ySize); xSize = maxValue (xSize, ySize); @@ -2005,7 +2047,7 @@ EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomFileView::OnRasterize) EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections) END_EVENT_TABLE() -PhantomFileView::PhantomFileView() +PhantomFileView::PhantomFileView() : wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0) { #if defined(DEBUG) || defined(_DEBUG) @@ -2025,8 +2067,8 @@ PhantomFileView::PhantomFileView() m_dDefaultScanRatio = 1; m_iDefaultGeometry = Scanner::GEOMETRY_PARALLEL; m_iDefaultTrace = Trace::TRACE_NONE; - -#ifdef DEBUG + +#ifdef DEBUG m_iDefaultRasterNX = 115; m_iDefaultRasterNY = 115; m_iDefaultRasterNSamples = 1; @@ -2041,7 +2083,7 @@ PhantomFileView::PhantomFileView() PhantomFileView::~PhantomFileView() { GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); - GetDocumentManager()->ActivateView(this, FALSE, TRUE); + GetDocumentManager()->ActivateView(this, FALSE); } void @@ -2056,8 +2098,8 @@ PhantomFileView::OnProperties (wxCommandEvent& event) #if DEBUG rPhantom.print (os); #endif - *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; - wxMessageBox (os.str().c_str(), "Phantom Properties"); + *theApp->getLog() << _T(">>>>\n") << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("<<<<\n"); + wxMessageBox (wxConvUTF8.cMB2WX(os.str().c_str()), _T("Phantom Properties")); GetDocument()->Activate(); } @@ -2065,14 +2107,14 @@ PhantomFileView::OnProperties (wxCommandEvent& event) void PhantomFileView::OnProjections (wxCommandEvent& event) { - DialogGetProjectionParameters dialogProjection (getFrameForChild(), - m_iDefaultNDet, m_iDefaultNView, m_iDefaultOffsetView, m_iDefaultNSample, m_dDefaultRotation, - m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio, + DialogGetProjectionParameters dialogProjection (getFrameForChild(), + 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(); - if (retVal != wxID_OK) + if (retVal != wxID_OK) return; - + m_iDefaultNDet = dialogProjection.getNDet(); m_iDefaultNView = dialogProjection.getNView(); m_iDefaultOffsetView = dialogProjection.getOffsetView(); @@ -2083,45 +2125,45 @@ PhantomFileView::OnProjections (wxCommandEvent& event) m_dDefaultCenterDetectorLength = dialogProjection.getCenterDetectorLengthRatio(); m_dDefaultViewRatio = dialogProjection.getViewRatio(); m_dDefaultScanRatio = dialogProjection.getScanRatio(); - wxString sGeometry = dialogProjection.getGeometry(); - m_iDefaultGeometry = Scanner::convertGeometryNameToID (sGeometry.c_str()); + wxString sGeometry (dialogProjection.getGeometry(), wxConvUTF8); + m_iDefaultGeometry = Scanner::convertGeometryNameToID (sGeometry.mb_str(wxConvUTF8)); double dRotationRadians = m_dDefaultRotation; m_dDefaultRotation /= TWOPI; // convert back to fraction of a circle - - if (m_iDefaultNDet <= 0 || m_iDefaultNView <= 0 || sGeometry == "") + + if (m_iDefaultNDet <= 0 || m_iDefaultNView <= 0 || sGeometry == _T("")) return; - + const Phantom& rPhantom = GetDocument()->getPhantom(); - Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultOffsetView, m_iDefaultNSample, + Scanner theScanner (rPhantom, sGeometry.mb_str(wxConvUTF8), 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"; - msg += theScanner.failMessage().c_str(); - *theApp->getLog() << msg << "\n"; - wxMessageBox (msg, "Error"); + wxString msg = _T("Failed making scanner\n"); + msg += wxConvUTF8.cMB2WX(theScanner.failMessage().c_str()); + *theApp->getLog() << msg << _T("\n"); + wxMessageBox (msg, _T("Error")); return; } - + std::ostringstream os; - os << "Projections for " << rPhantom.name() - << ": nDet=" << m_iDefaultNDet - << ", nView=" << m_iDefaultNView - << ", gantry offset=" << m_iDefaultOffsetView - << ", 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; if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { pProj = new Projections; pProj->initFromScanner (theScanner); - + ProjectionsDialog dialogProjections (theScanner, *pProj, rPhantom, m_iDefaultTrace, dynamic_cast(getFrameForChild())); for (int iView = 0; iView < pProj->nView(); iView++) { ::wxYield(); @@ -2132,15 +2174,17 @@ PhantomFileView::OnProjections (wxCommandEvent& event) ::wxYield(); while (dialogProjections.isPaused()) { ::wxYield(); - ::wxUsleep(50); + ::wxMilliSleep(50); } } } else { #if HAVE_WXTHREADS if (theApp->getUseBackgroundTasks()) { - ProjectorSupervisorThread* pProjector = new ProjectorSupervisorThread (this, m_iDefaultNDet, - m_iDefaultNView, m_iDefaultOffsetView, sGeometry.c_str(), m_iDefaultNSample, dRotationRadians, - m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio, os.str().c_str()); + ProjectorSupervisorThread* pProjector = new ProjectorSupervisorThread + (this, m_iDefaultNDet, m_iDefaultNView, m_iDefaultOffsetView, + sGeometry.mb_str(wxConvUTF8), m_iDefaultNSample, dRotationRadians, + m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, + m_dDefaultScanRatio, wxConvUTF8.cMB2WX(os.str().c_str())); if (pProjector->Create() != wxTHREAD_NO_ERROR) { sys_error (ERR_SEVERE, "Error creating projector thread"); delete pProjector; @@ -2149,28 +2193,28 @@ PhantomFileView::OnProjections (wxCommandEvent& event) 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 ); + wxProgressDialog dlgProgress (_T("Projection"), _T("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, theScanner.offsetView(), true, m_iDefaultTrace); - if ((i + 1) % ITER_PER_UPDATE == 0) - if (! dlgProgress.Update (i+1)) { - delete pProj; - return; - } + if ((i + 1) % ITER_PER_UPDATE == 0) + if (! dlgProgress.Update (i+1)) { + delete pProj; + return; + } } } } - - *theApp->getLog() << os.str().c_str() << "\n"; + + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); pProj->setRemark (os.str()); pProj->setCalcTime (timer.timerEnd()); - + ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc(); if (! pProjectionDoc) { sys_error (ERR_SEVERE, "Unable to create projection document"); @@ -2179,21 +2223,20 @@ PhantomFileView::OnProjections (wxCommandEvent& event) pProjectionDoc->setProjections (pProj); if (theApp->getAskDeleteNewDocs()) pProjectionDoc-> Modify(true); + OnUpdate(this, NULL); pProjectionDoc->UpdateAllViews (this); pProjectionDoc->getView()->setInitialClientSize(); pProjectionDoc->Activate(); } - - void PhantomFileView::OnRasterize (wxCommandEvent& event) { - DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, + DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio); int retVal = dialogRaster.ShowModal(); if (retVal != wxID_OK) return; - + m_iDefaultRasterNX = dialogRaster.getXSize(); m_iDefaultRasterNY = dialogRaster.getYSize(); m_iDefaultRasterNSamples = dialogRaster.getNSamples(); @@ -2202,47 +2245,49 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) m_iDefaultRasterNSamples = 1; if (m_dDefaultRasterViewRatio < 0) m_dDefaultRasterViewRatio = 0; - if (m_iDefaultRasterNX <= 0 || m_iDefaultRasterNY <= 0) + if (m_iDefaultRasterNX <= 0 || m_iDefaultRasterNY <= 0) return; - + const Phantom& rPhantom = GetDocument()->getPhantom(); std::ostringstream os; - os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize=" - << m_iDefaultRasterNY << ", ViewRatio=" << m_dDefaultRasterViewRatio << ", nSamples=" + 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, - m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio, os.str().c_str()); + RasterizerSupervisorThread* pThread = new RasterizerSupervisorThread + (this, m_iDefaultRasterNX, m_iDefaultRasterNY, + m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio, + wxConvUTF8.cMB2WX(os.str().c_str())); if (pThread->Create() != wxTHREAD_NO_ERROR) { - *theApp->getLog() << "Error creating rasterizer thread\n"; + *theApp->getLog() << _T("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 ); + wxProgressDialog dlgProgress (_T("Rasterize"), + _T("Rasterization Progress"), + 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 ((i + 1) % ITER_PER_UPDATE == 0) - if (! dlgProgress.Update (i+1)) { - delete pImageFile; - return; - } + rPhantom.convertToImagefile (*pImageFile, m_dDefaultRasterViewRatio, + m_iDefaultRasterNSamples, Trace::TRACE_NONE, + i, 1, true); + if ((i + 1) % ITER_PER_UPDATE == 0) + if (! dlgProgress.Update (i+1)) { + delete pImageFile; + return; + } } - + ImageFileDocument* pRasterDoc = theApp->newImageDoc(); if (! pRasterDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -2251,7 +2296,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) pRasterDoc->setImageFile (pImageFile); if (theApp->getAskDeleteNewDocs()) pRasterDoc->Modify (true); - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); pImageFile->labelAdd (os.str().c_str(), timer.timerEnd()); pRasterDoc->UpdateAllViews(this); @@ -2261,15 +2306,14 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) } -PhantomCanvas* +PhantomCanvas* PhantomFileView::CreateCanvas (wxFrame *parent) { - PhantomCanvas* pCanvas; - - pCanvas = new PhantomCanvas (this, parent, wxPoint(0, 0), wxSize(0,0), 0); + PhantomCanvas* pCanvas = new PhantomCanvas (this, parent, wxPoint(-1,-1), + wxSize(-1,-1), 0); pCanvas->SetBackgroundColour(*wxWHITE); - pCanvas->Clear(); - + pCanvas->ClearBackground(); + return pCanvas; } @@ -2281,68 +2325,66 @@ wxDocChildFrame* PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, _T("Phantom Frame"), wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, _T("Phantom Frame"), wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #endif 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"); - m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); - m_pFileMenu->Append(wxID_CLOSE, "&Close"); - + + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, _T("Cr&eate Phantom...\tCtrl-P")); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, _T("Create &Filter...\tCtrl-F")); + m_pFileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl-O")); + m_pFileMenu->Append(wxID_SAVEAS, _T("Save &As...")); + m_pFileMenu->Append(wxID_CLOSE, _T("&Close")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(PHMMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); - + m_pFileMenu->Append(PHMMENU_FILE_PROPERTIES, _T("P&roperties\tCtrl-I")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(wxID_PRINT, "&Print..."); - m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->Append(wxID_PRINT, _T("&Print...")); + m_pFileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup...")); + m_pFileMenu->Append(wxID_PREVIEW, _T("Print Pre&view")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); -#ifdef CTSIM_MDI + m_pFileMenu->Append(MAINMENU_IMPORT, _T("&Import...\tCtrl-M")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); - m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); -#endif + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, _T("Prefere&nces...")); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, _T("E&xit")); GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); - + wxMenu *process_menu = new wxMenu; - process_menu->Append(PHMMENU_PROCESS_RASTERIZE, "&Rasterize...\tCtrl-R"); - process_menu->Append(PHMMENU_PROCESS_PROJECTIONS, "&Projections...\tCtrl-J"); - + process_menu->Append(PHMMENU_PROCESS_RASTERIZE, _T("&Rasterize...\tCtrl-R")); + process_menu->Append(PHMMENU_PROCESS_PROJECTIONS, _T("&Projections...\tCtrl-J")); + wxMenu *help_menu = new wxMenu; - help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); - help_menu->Append (IDH_QUICKSTART, "&Quick Start"); - help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); - + help_menu->Append(MAINMENU_HELP_CONTENTS, _T("&Contents\tF1")); + help_menu->Append (MAINMENU_HELP_TIPS, _T("&Tips")); + help_menu->Append (IDH_QUICKSTART, _T("&Quick Start")); + help_menu->Append(MAINMENU_HELP_ABOUT, _T("&About")); + wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(m_pFileMenu, "&File"); - menu_bar->Append(process_menu, "&Process"); - menu_bar->Append(help_menu, "&Help"); - + + menu_bar->Append(m_pFileMenu, _T("&File")); + menu_bar->Append(process_menu, _T("&Process")); + menu_bar->Append(help_menu, _T("&Help")); + subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - + wxAcceleratorEntry accelEntries[3]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('J'), PHMMENU_PROCESS_PROJECTIONS); accelEntries[1].Set (wxACCEL_CTRL, static_cast('R'), PHMMENU_PROCESS_RASTERIZE); accelEntries[2].Set (wxACCEL_CTRL, static_cast('I'), PHMMENU_FILE_PROPERTIES); wxAcceleratorTable accelTable (3, accelEntries); subframe->SetAcceleratorTable (accelTable); - + return subframe; } -bool +bool PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_pFrame = CreateChildFrame(doc, this); @@ -2350,28 +2392,27 @@ 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"); + m_pFrame->SetTitle (_T("PhantomFileView")); m_pFrame->Show(true); Activate(true); - + return true; } -void +void PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { if (m_pCanvas) m_pCanvas->Refresh(); } -bool +bool PhantomFileView::OnClose (bool deleteWindow) { - //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; - + Activate(false); if (m_pCanvas) { m_pCanvas->setView(NULL); @@ -2380,16 +2421,16 @@ PhantomFileView::OnClose (bool deleteWindow) wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - + SetFrame(NULL); - + if (deleteWindow) { delete m_pFrame; m_pFrame = NULL; if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround } - + return true; } @@ -2418,7 +2459,7 @@ ProjectionFileCanvas::~ProjectionFileCanvas () m_pView = NULL; } -void +void ProjectionFileCanvas::OnDraw(wxDC& dc) { if (m_pView) @@ -2428,16 +2469,26 @@ ProjectionFileCanvas::OnDraw(wxDC& dc) wxSize ProjectionFileCanvas::GetBestSize () const { - wxSize best (0, 0); - if (! m_pView) - return best; + const int iMinX = 50; + const int iMinY = 20; + wxSize bestSize (iMinX,iMinY); if (m_pView) { Projections& rProj = m_pView->GetDocument()->getProjections(); - best.Set (rProj.nDet(), rProj.nView()); + bestSize.Set (rProj.nDet(), rProj.nView()); } - - return best; + + if (bestSize.x > 800) + bestSize.x = 800; + if (bestSize.y > 800) + bestSize.y = 800; + + if (bestSize.x < iMinX) + bestSize.x = iMinX; + if (bestSize.y < iMinY) + bestSize.y = iMinY; + + return bestSize; } @@ -2460,8 +2511,8 @@ EVT_MENU(PJMENU_PLOT_HISTOGRAM, ProjectionFileView::OnPlotHistogram) END_EVENT_TABLE() -ProjectionFileView::ProjectionFileView() -: wxView(), m_pFrame(0), m_pCanvas(0), m_pFileMenu(0) +ProjectionFileView::ProjectionFileView() + : wxView(), m_pBitmap(0), m_pFrame(0), m_pCanvas(0), m_pFileMenu(0) { #ifdef DEBUG m_iDefaultNX = 115; @@ -2470,7 +2521,7 @@ ProjectionFileView::ProjectionFileView() m_iDefaultNX = 256; m_iDefaultNY = 256; #endif - + m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT; m_dDefaultFilterParam = 1.; #if HAVE_FFTW @@ -2480,22 +2531,22 @@ ProjectionFileView::ProjectionFileView() m_iDefaultFilterMethod = ProcessSignal::FILTER_METHOD_CONVOLUTION; m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT; #endif - m_iDefaultZeropad = 1; + m_iDefaultZeropad = 2; m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF; m_iDefaultInterpolation = Backprojector::INTERP_LINEAR; m_iDefaultInterpParam = 1; m_iDefaultTrace = Trace::TRACE_NONE; - + m_iDefaultPolarNX = 256; m_iDefaultPolarNY = 256; m_iDefaultPolarInterpolation = Projections::POLAR_INTERP_BILINEAR; - m_iDefaultPolarZeropad = 1; + m_iDefaultPolarZeropad = 2; } ProjectionFileView::~ProjectionFileView() { GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); - GetDocumentManager()->ActivateView(this, FALSE, TRUE);; + GetDocumentManager()->ActivateView(this, FALSE);; } void @@ -2504,8 +2555,8 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) const Projections& rProj = GetDocument()->getProjections(); std::ostringstream os; rProj.printScanInfo(os); - *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; - wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION); + *theApp->getLog() << _T(">>>>\n") << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("<<<<\n"); + wxMessageDialog dialogMsg (getFrameForChild(), wxConvUTF8.cMB2WX(os.str().c_str()), _T("Projection File Properties"), wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); GetDocument()->Activate(); } @@ -2515,18 +2566,18 @@ 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"); @@ -2535,8 +2586,8 @@ ProjectionFileView::OnConvertRectangular (wxCommandEvent& event) 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"; + os << "Convert projection file " << getFrame()->GetTitle().c_str() << " to rectangular image"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pRectDoc->Modify (true); @@ -2549,24 +2600,23 @@ void ProjectionFileView::OnConvertPolar (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); - DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert Polar", m_iDefaultPolarNX, m_iDefaultPolarNY, + DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), _T("Convert Polar"), m_iDefaultPolarNX, m_iDefaultPolarNY, 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()); + wxProgressDialog dlgProgress (_T("Convert Polar"), _T("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + wxString strInterpolation (dialogPolar.getInterpolationName(), wxConvUTF8); m_iDefaultPolarNX = dialogPolar.getXSize(); m_iDefaultPolarNY = dialogPolar.getYSize(); - ImageFileDocument* pPolarDoc = theApp->newImageDoc(); ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY); - m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str()); - + m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.mb_str(wxConvUTF8)); + if (! rProj.convertPolar (*pIF, m_iDefaultPolarInterpolation)) { delete pIF; - *theApp->getLog() << "Error converting to Polar\n"; + *theApp->getLog() << _T("Error converting to Polar\n"); return; } - - pPolarDoc = theApp->newImageDoc (); + + ImageFileDocument* pPolarDoc = theApp->newImageDoc(); if (! pPolarDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -2574,10 +2624,10 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event) pPolarDoc->setImageFile (pIF); pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); std::ostringstream os; - os << "Convert projection file " << GetFrame()->GetTitle().c_str() << " to polar image: xSize=" - << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" + os << "Convert projection file " << getFrame()->GetTitle().c_str() << " to polar image: xSize=" + << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" << strInterpolation.c_str(); - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pPolarDoc->Modify (true); @@ -2591,20 +2641,20 @@ void ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); - DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert to FFT Polar", m_iDefaultPolarNX, m_iDefaultPolarNY, + DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), _T("Convert to FFT Polar"), m_iDefaultPolarNX, m_iDefaultPolarNY, 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()); + wxProgressDialog dlgProgress (_T("Convert FFT Polar"), _T("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + wxString strInterpolation (dialogPolar.getInterpolationName(), wxConvUTF8); 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()); + + m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.mb_str(wxConvUTF8)); if (! rProj.convertFFTPolar (*pIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad)) { delete pIF; - *theApp->getLog() << "Error converting to polar\n"; + *theApp->getLog() << _T("Error converting to polar\n"); return; } ImageFileDocument* pPolarDoc = theApp->newImageDoc(); @@ -2615,10 +2665,10 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pPolarDoc->setImageFile (pIF); pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); std::ostringstream os; - os << "Convert projection file " << GetFrame()->GetTitle().c_str() << " to FFT polar image: xSize=" - << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" + os << "Convert projection file " << getFrame()->GetTitle().c_str() << " to FFT polar image: xSize=" + << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" << strInterpolation.c_str() << ", zeropad=" << m_iDefaultPolarZeropad; - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pPolarDoc->Modify (true); @@ -2634,9 +2684,9 @@ ProjectionFileView::OnPlotTThetaSampling (wxCommandEvent& event) 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(); @@ -2644,7 +2694,7 @@ ProjectionFileView::OnPlotTThetaSampling (wxCommandEvent& event) 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; @@ -2673,11 +2723,11 @@ ProjectionFileView::OnPlotTThetaSampling (wxCommandEvent& event) void ProjectionFileView::OnPlotHistogram (wxCommandEvent& event) -{ +{ Projections& rProj = GetDocument()->getProjections(); int nDet = rProj.nDet(); int nView = rProj.nView(); - + if (nDet < 1 || nView < 1) return; @@ -2686,7 +2736,7 @@ ProjectionFileView::OnPlotHistogram (wxCommandEvent& event) 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]; @@ -2704,7 +2754,7 @@ ProjectionFileView::OnPlotHistogram (wxCommandEvent& event) 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; @@ -2716,7 +2766,7 @@ ProjectionFileView::OnPlotHistogram (wxCommandEvent& event) if (iBin >= 0 && iBin < NUMBER_HISTOGRAM_BINS) pY[iBin] += 1; } - } + } PlotFile& rPlotFile = pPlotDoc->getPlotFile(); std::ostringstream os; os << "Histogram"; @@ -2731,8 +2781,8 @@ ProjectionFileView::OnPlotHistogram (wxCommandEvent& event) 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"; + os << " plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); delete pX; delete pY; @@ -2749,14 +2799,14 @@ ProjectionFileView::OnConvertParallel (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); if (rProj.geometry() == Scanner::GEOMETRY_PARALLEL) { - wxMessageBox ("Projections are already parallel", "Error"); + wxMessageBox (_T("Projections are already parallel"), _T("Error")); return; } - wxProgressDialog dlgProgress (wxString("Convert to Parallel"), wxString("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + wxProgressDialog dlgProgress (_T("Convert to Parallel"), _T("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); Projections* pProjNew = rProj.interpolateToParallel(); ProjectionFileDocument* pProjDocNew = theApp->newProjectionDoc(); - pProjDocNew->setProjections (pProjNew); - + pProjDocNew->setProjections (pProjNew); + if (ProjectionFileView* projView = pProjDocNew->getView()) { projView->OnUpdate (projView, NULL); if (projView->getCanvas()) @@ -2766,7 +2816,7 @@ ProjectionFileView::OnConvertParallel (wxCommandEvent& event) pFrame->SetFocus(); pFrame->Raise(); } - GetDocumentManager()->ActivateView (projView, true, false); + GetDocumentManager()->ActivateView (projView, true); } if (theApp->getAskDeleteNewDocs()) pProjDocNew-> Modify(true); @@ -2779,20 +2829,20 @@ void ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); - DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Fourier Reconstruction", m_iDefaultPolarNX, m_iDefaultPolarNY, + DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), _T("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()); + wxProgressDialog dlgProgress (_T("Reconstruction Fourier"), _T("Reconstruction Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + wxString strInterpolation (dialogPolar.getInterpolationName(), wxConvUTF8); 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()); + + m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.mb_str(wxConvUTF8)); if (! rProj.convertFFTPolar (*pIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad)) { delete pIF; - *theApp->getLog() << "Error converting to polar\n"; + *theApp->getLog() << _T("Error converting to polar\n"); return; } #ifdef HAVE_FFT @@ -2809,10 +2859,10 @@ ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) 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"; + os << "Reconstruct Fourier " << getFrame()->GetTitle().mb_str(wxConvUTF8) << ": xSize=" + << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" + << strInterpolation.mb_str(wxConvUTF8) << ", zeropad=" << m_iDefaultPolarZeropad; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pPolarDoc->Modify (true); @@ -2844,51 +2894,51 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar 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, + + DialogGetReconstructionParameters dialogReconstruction (getFrameForChild(), m_iDefaultNX, m_iDefaultNY, + m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, + m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, m_iDefaultTrace, &defaultROI); - + int retVal = dialogReconstruction.ShowModal(); if (retVal != wxID_OK) return; - + m_iDefaultNX = dialogReconstruction.getXSize(); m_iDefaultNY = dialogReconstruction.getYSize(); - wxString optFilterName = dialogReconstruction.getFilterName(); - m_iDefaultFilter = SignalFilter::convertFilterNameToID (optFilterName.c_str()); + wxString optFilterName (dialogReconstruction.getFilterName(), wxConvUTF8); + m_iDefaultFilter = SignalFilter::convertFilterNameToID (optFilterName.mb_str(wxConvUTF8)); m_dDefaultFilterParam = dialogReconstruction.getFilterParam(); - wxString optFilterMethodName = dialogReconstruction.getFilterMethodName(); - m_iDefaultFilterMethod = ProcessSignal::convertFilterMethodNameToID(optFilterMethodName.c_str()); + wxString optFilterMethodName (dialogReconstruction.getFilterMethodName(), wxConvUTF8); + m_iDefaultFilterMethod = ProcessSignal::convertFilterMethodNameToID(optFilterMethodName.mb_str(wxConvUTF8)); m_iDefaultZeropad = dialogReconstruction.getZeropad(); - wxString optFilterGenerationName = dialogReconstruction.getFilterGenerationName(); - m_iDefaultFilterGeneration = ProcessSignal::convertFilterGenerationNameToID (optFilterGenerationName.c_str()); - wxString optInterpName = dialogReconstruction.getInterpName(); - m_iDefaultInterpolation = Backprojector::convertInterpNameToID (optInterpName.c_str()); + wxString optFilterGenerationName (dialogReconstruction.getFilterGenerationName(), wxConvUTF8); + m_iDefaultFilterGeneration = ProcessSignal::convertFilterGenerationNameToID (optFilterGenerationName.mb_str(wxConvUTF8)); + wxString optInterpName (dialogReconstruction.getInterpName(), wxConvUTF8); + m_iDefaultInterpolation = Backprojector::convertInterpNameToID (optInterpName.mb_str(wxConvUTF8)); m_iDefaultInterpParam = dialogReconstruction.getInterpParam(); - wxString optBackprojectName = dialogReconstruction.getBackprojectName(); - m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str()); + wxString optBackprojectName (dialogReconstruction.getBackprojectName(), wxConvUTF8); + m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.mb_str(wxConvUTF8)); m_iDefaultTrace = dialogReconstruction.getTrace(); dialogReconstruction.getROI (&defaultROI); - - if (m_iDefaultNX <= 0 && m_iDefaultNY <= 0) + + if (m_iDefaultNX <= 0 && m_iDefaultNY <= 0) return; - + std::ostringstream os; - 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(); + os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.mb_str(wxConvUTF8) << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.mb_str(wxConvUTF8) << ", FilterGeneration=" << optFilterGenerationName.mb_str(wxConvUTF8) << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.mb_str(wxConvUTF8) << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.mb_str(wxConvUTF8); if (bRebinToParallel) os << "; Interpolate to Parallel"; - + Timer timerRecon; ImageFile* pImageFile = NULL; if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { 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, + Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.mb_str(wxConvUTF8), + m_dDefaultFilterParam, optFilterMethodName.mb_str(wxConvUTF8), m_iDefaultZeropad, optFilterGenerationName.mb_str(wxConvUTF8), + optInterpName.mb_str(wxConvUTF8), m_iDefaultInterpParam, optBackprojectName.mb_str(wxConvUTF8), m_iDefaultTrace, &defaultROI, bRebinToParallel); - + ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, *pImageFile, m_iDefaultTrace, getFrameForChild()); for (int iView = 0; iView < rProj.nView(); iView++) { ::wxYield(); @@ -2901,7 +2951,7 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar ::wxYield(); while (pDlgReconstruct->isPaused()) { ::wxYield(); - ::wxUsleep(50); + ::wxMilliSleep(50); } } pReconstructor->postProcessing(); @@ -2910,10 +2960,13 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar } else { #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(), optInterpName.c_str(), m_iDefaultInterpParam, - optBackprojectName.c_str(), os.str().c_str(), &defaultROI, bRebinToParallel); + ReconstructorSupervisorThread* pReconstructor = new ReconstructorSupervisorThread + (this, m_iDefaultNX, m_iDefaultNY, optFilterName.mb_str(wxConvUTF8), + m_dDefaultFilterParam, optFilterMethodName.mb_str(wxConvUTF8), + m_iDefaultZeropad, optFilterGenerationName.mb_str(wxConvUTF8), + optInterpName.mb_str(wxConvUTF8), m_iDefaultInterpParam, + optBackprojectName.mb_str(wxConvUTF8), + wxConvUTF8.cMB2WX(os.str().c_str()), &defaultROI, bRebinToParallel); if (pReconstructor->Create() != wxTHREAD_NO_ERROR) { sys_error (ERR_SEVERE, "Error creating reconstructor thread"); delete pReconstructor; @@ -2922,23 +2975,23 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar pReconstructor->SetPriority (60); pReconstructor->Run(); return; - } else + } else #endif { pImageFile = new ImageFile (m_iDefaultNX, m_iDefaultNY); - wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT ); - 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, + wxProgressDialog dlgProgress (_T("Reconstruction"), _T("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT ); + Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.mb_str(wxConvUTF8), + m_dDefaultFilterParam, optFilterMethodName.mb_str(wxConvUTF8), m_iDefaultZeropad, optFilterGenerationName.mb_str(wxConvUTF8), + optInterpName.mb_str(wxConvUTF8), m_iDefaultInterpParam, optBackprojectName.mb_str(wxConvUTF8), m_iDefaultTrace, &defaultROI, bRebinToParallel); - + for (int iView = 0; iView < rProj.nView(); iView++) { pReconstructor->reconstructView (iView, 1); - if ((iView + 1) % ITER_PER_UPDATE == 0) - if (! dlgProgress.Update (iView + 1)) { - delete pReconstructor; - return; // don't make new window, thread will do this - } + if ((iView + 1) % ITER_PER_UPDATE == 0) + if (! dlgProgress.Update (iView + 1)) { + delete pReconstructor; + return; // don't make new window, thread will do this + } } pReconstructor->postProcessing(); delete pReconstructor; @@ -2949,9 +3002,9 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar sys_error (ERR_SEVERE, "Unable to create image file"); return; } - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); pImageFile->labelAdd (rProj.getLabel()); - pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd()); + pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd()); pReconDoc->setImageFile (pImageFile); if (theApp->getAskDeleteNewDocs()) @@ -2968,19 +3021,19 @@ ProjectionFileView::OnArtifactReduction (wxCommandEvent& event) } -ProjectionFileCanvas* +ProjectionFileCanvas* ProjectionFileView::CreateCanvas (wxFrame *parent) { ProjectionFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - - pCanvas = new ProjectionFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); - + + pCanvas = new ProjectionFileCanvas (this, parent, wxPoint(-1,-1), wxSize(width, height), 0); + pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); - pCanvas->Clear(); - + pCanvas->ClearBackground(); + return pCanvas; } @@ -2992,76 +3045,73 @@ wxDocChildFrame* ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #ifdef CTSIM_MDI - wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, _T("Projection Frame"), wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, _T("Projection Frame"), wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #endif 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"); - m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); - m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); - m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); - + + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, _T("Cr&eate Phantom...\tCtrl-P")); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, _T("Create &Filter...\tCtrl-F")); + m_pFileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl-O")); + m_pFileMenu->Append(wxID_SAVE, _T("&Save\tCtrl-S")); + m_pFileMenu->Append(wxID_SAVEAS, _T("Save &As...")); + m_pFileMenu->Append(wxID_CLOSE, _T("&Close\tCtrl-W")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); - + m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, _T("P&roperties\tCtrl-I")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(wxID_PRINT, "&Print..."); - m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->Append(wxID_PRINT, _T("&Print...")); + m_pFileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup...")); + m_pFileMenu->Append(wxID_PREVIEW, _T("Print Pre&view")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); -#ifdef CTSIM_MDI + m_pFileMenu->Append(MAINMENU_IMPORT, _T("&Import...\tCtrl-M")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); - m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); -#endif + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, _T("Prefere&nces...")); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, _T("E&xit")); GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); 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, "FF&T->Polar Image...\tCtrl-T"); - convert_menu->AppendSeparator(); - convert_menu->Append (PJMENU_CONVERT_PARALLEL, "&Interpolate to Parallel"); - + + m_pConvertMenu = new wxMenu; + m_pConvertMenu->Append (PJMENU_CONVERT_RECTANGULAR, _T("&Rectangular Image")); + m_pConvertMenu->Append (PJMENU_CONVERT_POLAR, _T("&Polar Image...\tCtrl-L")); + m_pConvertMenu->Append (PJMENU_CONVERT_FFT_POLAR, _T("FF&T->Polar Image...\tCtrl-T")); + m_pConvertMenu->AppendSeparator(); + m_pConvertMenu->Append (PJMENU_CONVERT_PARALLEL, _T("&Interpolate to Parallel")); + // wxMenu* filter_menu = new wxMenu; - // filter_menu->Append (PJMENU_ARTIFACT_REDUCTION, "&Artifact Reduction"); - + // filter_menu->Append (PJMENU_ARTIFACT_REDUCTION, _T("&Artifact Reduction")); + wxMenu* analyze_menu = new wxMenu; - 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"); - // still buggy - // reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier"); - + analyze_menu->Append (PJMENU_PLOT_HISTOGRAM, _T("&Plot Histogram")); + analyze_menu->Append (PJMENU_PLOT_TTHETA_SAMPLING, _T("Plot T-T&heta Sampling...\tCtrl-H")); + + m_pReconstructMenu = new wxMenu; + m_pReconstructMenu->Append (PJMENU_RECONSTRUCT_FBP, _T("&Filtered Backprojection...\tCtrl-R"), _T("Reconstruct image using filtered backprojection")); + m_pReconstructMenu->Append (PJMENU_RECONSTRUCT_FBP_REBIN, _T("Filtered &Backprojection (Rebin to Parallel)...\tCtrl-B"), _T("Reconstruct image using filtered backprojection")); + m_pReconstructMenu->Append (PJMENU_RECONSTRUCT_FOURIER, _T("&Inverse Fourier...\tCtrl-E"), _T("Direct inverse Fourier")); + wxMenu *help_menu = new wxMenu; - help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); - help_menu->Append (IDH_QUICKSTART, "&Quick Start"); - help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); - + help_menu->Append(MAINMENU_HELP_CONTENTS, _T("&Contents\tF1")); + help_menu->Append (MAINMENU_HELP_TIPS, _T("&Tips")); + help_menu->Append (IDH_QUICKSTART, _T("&Quick Start")); + help_menu->Append(MAINMENU_HELP_ABOUT, _T("&About")); + wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append (m_pFileMenu, "&File"); - menu_bar->Append (convert_menu, "&Convert"); - // 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"); - - subframe->SetMenuBar(menu_bar); + + menu_bar->Append (m_pFileMenu, _T("&File")); + menu_bar->Append (m_pConvertMenu, _T("&Convert")); + // menu_bar->Append (filter_menu, _T("Fi<er")); + menu_bar->Append (analyze_menu, _T("&Analyze")); + menu_bar->Append (m_pReconstructMenu, _T("&Reconstruct")); + menu_bar->Append (help_menu, _T("&Help")); + + subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - + wxAcceleratorEntry accelEntries[7]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('L'), PJMENU_CONVERT_POLAR); accelEntries[1].Set (wxACCEL_CTRL, static_cast('T'), PJMENU_CONVERT_FFT_POLAR); @@ -3072,57 +3122,61 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) accelEntries[6].Set (wxACCEL_CTRL, static_cast('H'), PJMENU_PLOT_TTHETA_SAMPLING); wxAcceleratorTable accelTable (7, accelEntries); subframe->SetAcceleratorTable (accelTable); - + return subframe; } -bool +bool ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_pFrame = CreateChildFrame(doc, this); SetFrame(m_pFrame); - - int width, height; - m_pFrame->GetClientSize (&width, &height); - m_pFrame->SetTitle ("ProjectionFileView"); m_pCanvas = CreateCanvas (m_pFrame); - + m_pFrame->SetClientSize (m_pCanvas->GetBestSize()); + m_pCanvas->SetClientSize (m_pCanvas->GetBestSize()); + m_pFrame->SetTitle (_T("ProjectionFileView")); + m_pFrame->Show(true); Activate(true); - + return true; } -void +void ProjectionFileView::OnDraw (wxDC* dc) { - if (m_bitmap.Ok()) - dc->DrawBitmap (m_bitmap, 0, 0, false); + if (m_pBitmap && m_pBitmap->Ok()) + dc->DrawBitmap (*m_pBitmap, 0, 0, false); } -void +void ProjectionFileView::setInitialClientSize () { - wxSize bestSize = m_pCanvas->GetBestSize(); - - if (bestSize.x > 800) - bestSize.x = 800; - if (bestSize.y > 800) - bestSize.y = 800; + if (m_pFrame && m_pCanvas) { + wxSize bestSize = m_pCanvas->GetBestSize(); - m_pFrame->SetClientSize (bestSize); - m_pFrame->Show (true); - m_pFrame->SetFocus(); -} + m_pFrame->SetClientSize (bestSize); + m_pFrame->Show (true); + m_pFrame->SetFocus(); + } +} -void +void ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { const Projections& rProj = GetDocument()->getProjections(); const int nDet = rProj.nDet(); const int nView = rProj.nView(); + if (rProj.geometry() == Scanner::GEOMETRY_PARALLEL) { + m_pReconstructMenu->Enable (PJMENU_RECONSTRUCT_FBP_REBIN, false); + m_pConvertMenu->Enable (PJMENU_CONVERT_PARALLEL, false); + } else { + m_pReconstructMenu->Enable (PJMENU_RECONSTRUCT_FBP_REBIN, true); + m_pConvertMenu->Enable (PJMENU_CONVERT_PARALLEL, true); + } + if (nDet != 0 && nView != 0) { const DetectorArray& detarray = rProj.getDetectorArray(0); const DetectorValue* detval = detarray.detValues(); @@ -3138,7 +3192,7 @@ ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) max = detval[ix]; } } - + unsigned char* imageData = new unsigned char [nDet * nView * 3]; if (! imageData) { sys_error (ERR_SEVERE, "Unable to allocate memory for image display"); @@ -3156,10 +3210,14 @@ ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) } } wxImage image (nDet, nView, imageData, true); - m_bitmap = image.ConvertToBitmap(); + if (m_pBitmap) { + delete m_pBitmap; + m_pBitmap = NULL; + } + m_pBitmap = new wxBitmap (image); delete imageData; } - + m_pCanvas->SetScrollbars(20, 20, nDet/20, nView/20); m_pCanvas->SetBackgroundColour(*wxWHITE); @@ -3167,31 +3225,31 @@ ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) m_pCanvas->Refresh(); } -bool +bool ProjectionFileView::OnClose (bool deleteWindow) { - //GetDocumentManager()->ActivateView (this, false, true); + //GetDocumentManager()->ActivateView (this, false); if (! GetDocument() || ! GetDocument()->Close()) return false; - + Activate(false); if (m_pCanvas) { - m_pCanvas->setView(NULL); + m_pCanvas->setView(NULL); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - + SetFrame(NULL); - + if (deleteWindow) { delete m_pFrame; m_pFrame = NULL; if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround } - + return true; } @@ -3199,34 +3257,22 @@ ProjectionFileView::OnClose (bool deleteWindow) // PlotFileCanvas PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style) -: wxScrolledWindow(frame, -1, pos, size, style) + : wxScrolledWindow(frame, -1, pos, size, style), m_pView(v) { - m_pView = v; } -wxSize -PlotFileCanvas::GetBestSize() const +PlotFileCanvas::~PlotFileCanvas () { - 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 () +wxSize +PlotFileCanvas::GetBestSize() const { - m_pView = NULL; + return wxSize (500, 300); } -void + +void PlotFileCanvas::OnDraw(wxDC& dc) { if (m_pView) @@ -3245,8 +3291,9 @@ EVT_MENU(PLOTMENU_VIEW_SCALE_AUTO, PlotFileView::OnScaleAuto) EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull) END_EVENT_TABLE() -PlotFileView::PlotFileView() -: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pEZPlot(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) +PlotFileView::PlotFileView() +: wxView(), m_pFrame(0), m_pCanvas(0), m_pEZPlot(0), m_pFileMenu(0), + m_bMinSpecified(false), m_bMaxSpecified(false) { } @@ -3254,8 +3301,9 @@ PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; - - GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE); } void @@ -3265,14 +3313,15 @@ PlotFileView::OnProperties (wxCommandEvent& event) std::ostringstream os; os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n"; rPlot.printHeadersBrief (os); - *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<<\n"; - wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION); + *theApp->getLog() << _T(">>>>\n") << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("<<<<<\n"); + wxMessageDialog dialogMsg (getFrameForChild(), wxConvUTF8.cMB2WX(os.str().c_str()), _T("Plot File Properties"), + wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); GetDocument()->Activate(); } -void +void PlotFileView::OnScaleAuto (wxCommandEvent& event) { const PlotFile& rPlotFile = GetDocument()->getPlotFile(); @@ -3294,26 +3343,26 @@ PlotFileView::OnScaleAuto (wxCommandEvent& event) GetDocument()->Activate(); } -void +void PlotFileView::OnScaleMinMax (wxCommandEvent& event) { const PlotFile& rPlotFile = GetDocument()->getPlotFile(); double min; double max; - + if (! m_bMinSpecified || ! m_bMaxSpecified) { if (! rPlotFile.getMinMax (1, min, max)) { - *theApp->getLog() << "Error: unable to find Min/Max\n"; + *theApp->getLog() << _T("Error: unable to find Min/Max\n"); return; } } - + if (m_bMinSpecified) min = m_dMinPixel; if (m_bMaxSpecified) max = m_dMaxPixel; - - DialogGetMinMax dialogMinMax (getFrameForChild(), "Set Y-axis Minimum & Maximum", min, max); + + DialogGetMinMax dialogMinMax (getFrameForChild(), _T("Set Y-axis Minimum & Maximum"), min, max); int retVal = dialogMinMax.ShowModal(); if (retVal == wxID_OK) { m_bMinSpecified = true; @@ -3325,7 +3374,7 @@ PlotFileView::OnScaleMinMax (wxCommandEvent& event) GetDocument()->Activate(); } -void +void PlotFileView::OnScaleFull (wxCommandEvent& event) { if (m_bMinSpecified || m_bMaxSpecified) { @@ -3337,18 +3386,15 @@ PlotFileView::OnScaleFull (wxCommandEvent& event) } -PlotFileCanvas* +PlotFileCanvas* PlotFileView::CreateCanvas (wxFrame* parent) { PlotFileCanvas* pCanvas; - int width, height; - parent->GetClientSize(&width, &height); - - pCanvas = new PlotFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); - + + pCanvas = new PlotFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), 0); pCanvas->SetBackgroundColour(*wxWHITE); - pCanvas->Clear(); - + pCanvas->ClearBackground(); + return pCanvas; } @@ -3360,58 +3406,56 @@ wxDocChildFrame* PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #ifdef CTSIM_MDI - wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(10, 10), wxSize(500, 300), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, _T("Plot Frame"), wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(10, 10), wxSize(500, 300), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, _T("Plot Frame"), wxPoint(-1,-1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE); #endif 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"); - m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); - m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); - m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); - + + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, _T("Cr&eate Phantom...\tCtrl-P")); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, _T("Create &Filter...\tCtrl-F")); + m_pFileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl-O")); + m_pFileMenu->Append(wxID_SAVE, _T("&Save\tCtrl-S")); + m_pFileMenu->Append(wxID_SAVEAS, _T("Save &As...")); + m_pFileMenu->Append(wxID_CLOSE, _T("&Close\tCtrl-W")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(PLOTMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); - + m_pFileMenu->Append(PLOTMENU_FILE_PROPERTIES, _T("P&roperties\tCtrl-I")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(wxID_PRINT, "&Print..."); - m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->Append(wxID_PRINT, _T("&Print...")); + m_pFileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup...")); + m_pFileMenu->Append(wxID_PREVIEW, _T("Print Pre&view")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); -#ifdef CTSIM_MDI + m_pFileMenu->Append(MAINMENU_IMPORT, _T("&Import...\tCtrl-M")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); - m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); -#endif + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, _T("Prefere&nces...")); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, _T("E&xit")); GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); - + wxMenu *view_menu = new wxMenu; - view_menu->Append(PLOTMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...\tCtrl-E"); - view_menu->Append(PLOTMENU_VIEW_SCALE_AUTO, "Display Scale &Auto...\tCtrl-A"); - view_menu->Append(PLOTMENU_VIEW_SCALE_FULL, "Display &Full Scale\tCtrl-U"); - + view_menu->Append(PLOTMENU_VIEW_SCALE_MINMAX, _T("Display Scale &Set...\tCtrl-E")); + view_menu->Append(PLOTMENU_VIEW_SCALE_AUTO, _T("Display Scale &Auto...\tCtrl-A")); + view_menu->Append(PLOTMENU_VIEW_SCALE_FULL, _T("Display &Full Scale\tCtrl-U")); + wxMenu *help_menu = new wxMenu; - help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); - help_menu->Append (IDH_QUICKSTART, "&Quick Start"); - help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); - + help_menu->Append(MAINMENU_HELP_CONTENTS, _T("&Contents\tF1")); + help_menu->Append (MAINMENU_HELP_TIPS, _T("&Tips")); + help_menu->Append (IDH_QUICKSTART, _T("&Quick Start")); + help_menu->Append(MAINMENU_HELP_ABOUT, _T("&About")); + wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(m_pFileMenu, "&File"); - menu_bar->Append(view_menu, "&View"); - menu_bar->Append(help_menu, "&Help"); - + + menu_bar->Append(m_pFileMenu, _T("&File")); + menu_bar->Append(view_menu, _T("&View")); + menu_bar->Append(help_menu, _T("&Help")); + subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - + wxAcceleratorEntry accelEntries[4]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('E'), PLOTMENU_VIEW_SCALE_MINMAX); accelEntries[1].Set (wxACCEL_CTRL, static_cast('A'), PLOTMENU_VIEW_SCALE_AUTO); @@ -3419,39 +3463,51 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) accelEntries[3].Set (wxACCEL_CTRL, static_cast('I'), PLOTMENU_FILE_PROPERTIES); wxAcceleratorTable accelTable (4, accelEntries); subframe->SetAcceleratorTable (accelTable); - + return subframe; } -bool +bool PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { - m_pFrame = CreateChildFrame(doc, this); - SetFrame(m_pFrame); - m_bMinSpecified = false; m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; - - int width, height; - m_pFrame->GetClientSize(&width, &height); - m_pFrame->SetTitle ("Plot File"); + + m_pFrame = CreateChildFrame(doc, this); + SetFrame(m_pFrame); m_pCanvas = CreateCanvas (m_pFrame); - + m_pFrame->SetClientSize (m_pCanvas->GetBestSize()); + m_pCanvas->SetClientSize (m_pCanvas->GetBestSize()); + m_pFrame->SetTitle (_T("Plot File")); + m_pFrame->Show(true); Activate(true); - + return true; } -void +void +PlotFileView::setInitialClientSize () +{ + if (m_pFrame && m_pCanvas) { + wxSize bestSize = m_pCanvas->GetBestSize(); + + m_pFrame->SetClientSize (bestSize); + m_pFrame->Show (true); + m_pFrame->SetFocus(); + } +} + + +void PlotFileView::OnDraw (wxDC* dc) { const PlotFile& rPlotFile = GetDocument()->getPlotFile(); const int iNColumns = rPlotFile.getNumColumns(); const int iNRecords = rPlotFile.getNumRecords(); - + if (iNColumns > 0 && iNRecords > 0) { int xsize, ysize; m_pCanvas->GetClientSize (&xsize, &ysize); @@ -3463,42 +3519,42 @@ PlotFileView::OnDraw (wxDC* dc) } -void +void PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { 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 = new EZPlot; - + for (unsigned int iEzset = 0; iEzset < rPlotFile.getNumEzsetCommands(); iEzset++) m_pEZPlot->ezset (rPlotFile.getEzsetCommand (iEzset)); - + if (m_bMinSpecified) { std::ostringstream os; os << "ymin " << m_dMinPixel; m_pEZPlot->ezset (os.str()); } - + if (m_bMaxSpecified) { std::ostringstream os; os << "ymax " << m_dMaxPixel; m_pEZPlot->ezset (os.str()); } - + 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); @@ -3511,18 +3567,17 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) delete pdX; delete pdY; } - + if (m_pCanvas) m_pCanvas->Refresh(); } -bool +bool PlotFileView::OnClose (bool deleteWindow) { - //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; - + Activate(false); if (m_pCanvas) { m_pCanvas->setView (NULL); @@ -3531,7 +3586,7 @@ PlotFileView::OnClose (bool deleteWindow) wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - + SetFrame(NULL); if (deleteWindow) { delete m_pFrame; @@ -3539,7 +3594,7 @@ PlotFileView::OnClose (bool deleteWindow) if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround } - + return true; } @@ -3549,26 +3604,26 @@ PlotFileView::OnClose (bool deleteWindow) IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) -TextFileView::~TextFileView() +TextFileView::~TextFileView() { GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); - GetDocumentManager()->ActivateView(this, FALSE, TRUE);; + GetDocumentManager()->ActivateView(this, FALSE);; } bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_pFrame = CreateChildFrame(doc, this); SetFrame (m_pFrame); - + int width, height; m_pFrame->GetClientSize(&width, &height); - m_pFrame->SetTitle("TextFile"); - m_pCanvas = new TextFileCanvas (this, m_pFrame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY); - m_pFrame->SetTitle("Log"); - + m_pFrame->SetTitle(_T("TextFile")); + m_pCanvas = new TextFileCanvas (this, m_pFrame, wxPoint(-1,-1), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY); + m_pFrame->SetTitle(_T("Log")); + m_pFrame->Show (true); Activate (true); - + return true; } @@ -3581,17 +3636,17 @@ void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) { } -bool +bool TextFileView::OnClose (bool deleteWindow) { if (! theApp->getMainFrame()->getShuttingDown()) return false; - + Activate(false); - //GetDocumentManager()->ActivateView (this, false, true); + //GetDocumentManager()->ActivateView (this, false); if (! GetDocument() || ! GetDocument()->Close()) return false; - + SetFrame(NULL); if (deleteWindow) { delete m_pFrame; @@ -3599,7 +3654,7 @@ TextFileView::OnClose (bool deleteWindow) if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround } - + return TRUE; } @@ -3611,56 +3666,54 @@ wxDocChildFrame* TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(0,0), wxDEFAULT_FRAME_STYLE, "Log"); + wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, _T("TextFile Frame"), wxPoint(-1, -1), wxSize(-1,-1), wxDEFAULT_FRAME_STYLE, _T("Log")); #else - wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE, "Log"); + wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, _T("TextFile Frame"), wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE, _T("Log")); #endif 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"); - m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); - m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); - // m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); - + + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, _T("Cr&eate Phantom...\tCtrl-P")); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, _T("Create &Filter...\tCtrl-F")); + m_pFileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl-O")); + m_pFileMenu->Append(wxID_SAVE, _T("&Save\tCtrl-S")); + m_pFileMenu->Append(wxID_SAVEAS, _T("Save &As...")); + // m_pFileMenu->Append(wxID_CLOSE, _T("&Close\tCtrl-W")); + m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(wxID_PRINT, "&Print..."); - m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->Append(wxID_PRINT, _T("&Print...")); + m_pFileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup...")); + m_pFileMenu->Append(wxID_PREVIEW, _T("Print Pre&view")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); -#ifdef CTSIM_MDI + m_pFileMenu->Append(MAINMENU_IMPORT, _T("&Import...\tCtrl-M")); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); - m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); -#endif + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, _T("Prefere&nces...")); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, _T("E&xit")); GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); - + wxMenu *help_menu = new wxMenu; - help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); - help_menu->Append (IDH_QUICKSTART, "&Quick Start"); - help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); - + help_menu->Append(MAINMENU_HELP_CONTENTS, _T("&Contents\tF1")); + help_menu->Append (MAINMENU_HELP_TIPS, _T("&Tips")); + help_menu->Append (IDH_QUICKSTART, _T("&Quick Start")); + help_menu->Append(MAINMENU_HELP_ABOUT, _T("&About")); + wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(m_pFileMenu, "&File"); - menu_bar->Append(help_menu, "&Help"); - + + menu_bar->Append(m_pFileMenu, _T("&File")); + menu_bar->Append(help_menu, _T("&Help")); + subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - + return subframe; } // Define a constructor for my text subwindow TextFileCanvas::TextFileCanvas (TextFileView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style) -: wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v) + : wxTextCtrl (frame, -1, _T(""), pos, size, style), m_pView(v) { }