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) {
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;
}
}
ImageFileView::~ImageFileView()
{
GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
- GetDocumentManager()->ActivateView(this, FALSE, TRUE);
+ GetDocumentManager()->ActivateView(this, FALSE);
}
{
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);
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();
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;
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();
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<wxFrame*>(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;
}
}
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<wxFrame*>(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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str()
+ << " and " << dynamic_cast<wxFrame*>(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().c_str() << ": "
<< os.str().c_str();
pDifferenceImage->labelAdd (os.str().c_str());
if (theApp->getAskDeleteNewDocs())
pDifferenceDoc->getView()->setInitialClientSize();
pDifferenceDoc->Activate();
}
- wxMessageBox(os.str().c_str(), "Image Comparison");
+ wxMessageBox(wxConvUTF8.cMB2WX(os.str().c_str()), _T("Image Comparison"));
}
}
}
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();
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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " and "
+ << dynamic_cast<wxFrame*>(pRHSDoc->GetFirstView()->GetFrame())->GetTitle().c_str();
+ wxString s = dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle() + _T(": ");
+ newImage.labelsCopy (rIF, s.mb_str(wxConvUTF8));
+ s = dynamic_cast<wxFrame*>(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);
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();
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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " and "
+ << dynamic_cast<wxFrame*>(pRHSDoc->GetFirstView()->GetFrame())->GetTitle().c_str();
+ wxString s = dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle() + _T(": ");
+ newImage.labelsCopy (rIF, s.mb_str(wxConvUTF8));
+ s = dynamic_cast<wxFrame*>(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);
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();
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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " and "
+ << dynamic_cast<wxFrame*>(pRHSDoc->GetFirstView()->GetFrame())->GetTitle().c_str();
+ wxString s = dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle() + _T(": ");
+ newImage.labelsCopy (rIF, s.mb_str(wxConvUTF8));
+ s = dynamic_cast<wxFrame*>(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);
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();
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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " by "
+ << dynamic_cast<wxFrame*>(pRHSDoc->GetFirstView()->GetFrame())->GetTitle().c_str();
+ wxString s = dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle() + _T(": ");
+ newImage.labelsCopy (rIF, s.mb_str(wxConvUTF8));
+ s = dynamic_cast<wxFrame*>(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);
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;
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;
ImageFileCanvas* pCanvas = new ImageFileCanvas (this, parent, wxPoint(-1,-1),
wxSize(-1,-1), 0);
pCanvas->SetBackgroundColour(*wxWHITE);
- pCanvas->Clear();
+ pCanvas->ClearBackground();
return pCanvas;
}
ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
#if CTSIM_MDI
- wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1,-1), wxSize(-1,-1), 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(-1,-1), 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");
+ 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");
+ 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_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);
m_pCanvas = CreateCanvas (m_pFrame);
m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
- m_pFrame->SetTitle("ImageFileView");
+ m_pFrame->SetTitle(_T("ImageFileView"));
m_pFrame->Show(true);
Activate(true);
{
if (m_pBitmap && m_pBitmap->Ok()) {
#ifdef DEBUG
- *theApp->getLog() << "Drawing bitmap\n";
+ *theApp->getLog() << _T("Drawing bitmap\n");
#endif
dc->DrawBitmap(*m_pBitmap, 0, 0, false);
}
m_pBitmap = NULL;
}
#ifdef DEBUG
- *theApp->getLog() << "Making new bitmap\n";
+ *theApp->getLog() << _T("Making new bitmap\n");
#endif
m_pBitmap = new wxBitmap (image);
delete imageData;
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");
}
}
}
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();
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);
{
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;
}
}
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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str();
+ *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
delete pX;
{
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;
}
}
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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str();
+ *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
delete pX;
{
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;
}
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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str();
+ *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
delete pX;
{
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;
}
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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str();
+ *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
delete pX;
{
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<ImageFileDocument*> 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();
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<wxFrame*>(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<wxFrame*>(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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str() << " and "
+ << dynamic_cast<wxFrame*>(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().c_str();
+ *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
delete pX;
{
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;
}
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();
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<wxFrame*>(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<wxFrame*>(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<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8) << " and "
+ << dynamic_cast<wxFrame*>(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().c_str();
+ *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
delete pX;
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<wxFrame*>(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<wxFrame*>(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;
PhantomFileView::~PhantomFileView()
{
GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
- GetDocumentManager()->ActivateView(this, FALSE, TRUE);
+ GetDocumentManager()->ActivateView(this, FALSE);
}
void
#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();
}
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;
}
::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;
{
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);
}
}
- *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());
pProjectionDoc->getView()->setInitialClientSize();
pProjectionDoc->Activate();
}
-
-
void
PhantomFileView::OnRasterize (wxCommandEvent& event)
{
#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);
{
ImageFile* pImageFile = new ImageFile (m_iDefaultRasterNX, m_iDefaultRasterNY);
- wxProgressDialog dlgProgress (wxString("Rasterize"),
- wxString("Rasterization Progress"),
+ wxProgressDialog dlgProgress (_T("Rasterize"),
+ _T("Rasterization Progress"),
pImageFile->nx() + 1,
getFrameForChild(),
wxPD_CAN_ABORT );
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);
PhantomCanvas* pCanvas = new PhantomCanvas (this, parent, wxPoint(-1,-1),
wxSize(-1,-1), 0);
pCanvas->SetBackgroundColour(*wxWHITE);
- pCanvas->Clear();
+ pCanvas->ClearBackground();
return pCanvas;
}
PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
#if CTSIM_MDI
- wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(-1,-1), wxSize(-1,-1), 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(-1,-1), wxSize(-1,-1), 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");
+ 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");
+ 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);
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);
ProjectionFileView::~ProjectionFileView()
{
GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
- GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
+ GetDocumentManager()->ActivateView(this, FALSE);;
}
void
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();
}
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);
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();
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->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="
+ 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);
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();
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="
+ 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);
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<wxFrame*>(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;
{
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);
pFrame->SetFocus();
pFrame->Raise();
}
- GetDocumentManager()->ActivateView (projView, true, false);
+ GetDocumentManager()->ActivateView (projView, true);
}
if (theApp->getAskDeleteNewDocs())
pProjDocNew-> Modify(true);
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
pPolarDoc->setImageFile (pIF);
pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime());
std::ostringstream os;
- os << "Reconstruct Fourier " << GetFrame()->GetTitle().c_str() << ": xSize="
+ os << "Reconstruct Fourier " << getFrame()->GetTitle().mb_str(wxConvUTF8) << ": xSize="
<< m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation="
- << strInterpolation.c_str() << ", zeropad=" << m_iDefaultPolarZeropad;
- *theApp->getLog() << os.str().c_str() << "\n";
+ << 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);
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);
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";
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());
::wxYield();
while (pDlgReconstruct->isPaused()) {
::wxYield();
- ::wxUsleep(50);
+ ::wxMilliSleep(50);
}
}
pReconstructor->postProcessing();
} 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;
#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++) {
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());
pCanvas->SetScrollbars(20, 20, 50, 50);
pCanvas->SetBackgroundColour(*wxWHITE);
- pCanvas->Clear();
+ pCanvas->ClearBackground();
return pCanvas;
}
ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
#ifdef CTSIM_MDI
- wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(-1,-1), wxSize(-1,-1), 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(-1,-1), wxSize(-1,-1), 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");
+ 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");
+ 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);
m_pConvertMenu = new wxMenu;
- m_pConvertMenu->Append (PJMENU_CONVERT_RECTANGULAR, "&Rectangular Image");
- m_pConvertMenu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L");
- m_pConvertMenu->Append (PJMENU_CONVERT_FFT_POLAR, "FF&T->Polar Image...\tCtrl-T");
+ 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, "&Interpolate to Parallel");
+ 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");
+ 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, "&Filtered Backprojection...\tCtrl-R", "Reconstruct image using filtered backprojection");
- m_pReconstructMenu->Append (PJMENU_RECONSTRUCT_FBP_REBIN, "Filtered &Backprojection (Rebin to Parallel)...\tCtrl-B", "Reconstruct image using filtered backprojection");
- m_pReconstructMenu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Inverse Fourier...\tCtrl-E", "Direct inverse Fourier");
+ 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 (m_pConvertMenu, "&Convert");
- // menu_bar->Append (filter_menu, "Fi<er");
- menu_bar->Append (analyze_menu, "&Analyze");
- menu_bar->Append (m_pReconstructMenu, "&Reconstruct");
- menu_bar->Append (help_menu, "&Help");
+ 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);
m_pCanvas = CreateCanvas (m_pFrame);
m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
- m_pFrame->SetTitle ("ProjectionFileView");
+ m_pFrame->SetTitle (_T("ProjectionFileView"));
m_pFrame->Show(true);
Activate(true);
bool
ProjectionFileView::OnClose (bool deleteWindow)
{
- //GetDocumentManager()->ActivateView (this, false, true);
+ //GetDocumentManager()->ActivateView (this, false);
if (! GetDocument() || ! GetDocument()->Close())
return false;
delete m_pEZPlot;
GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
- GetDocumentManager()->ActivateView(this, FALSE, TRUE);
+ GetDocumentManager()->ActivateView(this, FALSE);
}
void
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();
}
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_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;
pCanvas = new PlotFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), 0);
pCanvas->SetBackgroundColour(*wxWHITE);
- pCanvas->Clear();
+ pCanvas->ClearBackground();
return pCanvas;
}
PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
#ifdef CTSIM_MDI
- wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(-1,-1), wxSize(-1,-1), 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(-1,-1), wxSize(-1,-1), 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");
+ 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");
+ 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);
m_pCanvas = CreateCanvas (m_pFrame);
m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
- m_pFrame->SetTitle ("Plot File");
+ m_pFrame->SetTitle (_T("Plot File"));
m_pFrame->Show(true);
Activate(true);
TextFileView::~TextFileView()
{
GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
- GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
+ GetDocumentManager()->ActivateView(this, FALSE);;
}
bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
int width, height;
m_pFrame->GetClientSize(&width, &height);
- m_pFrame->SetTitle("TextFile");
+ 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("Log");
+ m_pFrame->SetTitle(_T("Log"));
m_pFrame->Show (true);
Activate (true);
return false;
Activate(false);
- //GetDocumentManager()->ActivateView (this, false, true);
+ //GetDocumentManager()->ActivateView (this, false);
if (! GetDocument() || ! GetDocument()->Close())
return false;
TextFileView::CreateChildFrame (wxDocument *doc, wxView *view)
{
#if CTSIM_MDI
- wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(-1,-1), 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");
+ 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");
+ 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);
// 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)
{
}