/*****************************************************************************
** FILE IDENTIFICATION
**
-** Name: view.cpp
+** Name: views.cpp
** Purpose: View & Canvas routines for CTSim program
** Programmer: Kevin Rosenberg
** Date Started: July 2000
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.147 2001/09/27 02:11:29 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
#include <sstream_subst>
#endif
+// Used to reduce calls to progress bar update function
+const short int ITER_PER_UPDATE = 10;
// ImageFileCanvas
}
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);
{
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;
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;
}
}
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;
}
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);
}
{
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();
}
-void
+void
ImageFileView::OnScaleAuto (wxCommandEvent& event)
{
const ImageFile& rIF = GetDocument()->getImageFile();
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();
{
std::vector<ImageFileDocument*> 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();
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;
}
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->Modify (true);
- pDifferenceDoc->UpdateAllViews (this);
- pDifferenceDoc->getView()->OnUpdate (this, NULL);
- pDifferenceDoc->getView()->getFrame()->Show(true);
+ OnUpdate(this, NULL);
+ pDifferenceDoc->UpdateAllViews(this);
+ pDifferenceDoc->getView()->setInitialClientSize();
pDifferenceDoc->Activate();
}
- wxMessageBox(os.str().c_str(), "Image Comparison");
+ wxMessageBox(wxConvUTF8.cMB2WX(os.str().c_str()), _T("Image Comparison"));
}
}
}
rIF.labelAdd ("Invert Pixel Values");
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
rIF.labelAdd ("Square Pixel Values");
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
rIF.labelAdd ("Square-root Pixel Values");
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
rIF.labelAdd ("Logrithm base-e Pixel Values");
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
rIF.labelAdd ("Exponent base-e Pixel Values");
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
{
std::vector<ImageFileDocument*> 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();
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<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);
pNewDoc->UpdateAllViews (this);
- pNewDoc->getView()->getFrame()->Show(true);
+ pNewDoc->getView()->setInitialClientSize();
pNewDoc->Activate();
}
}
{
std::vector<ImageFileDocument*> 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();
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<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);
pNewDoc->UpdateAllViews (this);
- pNewDoc->getView()->getFrame()->Show(true);
+ pNewDoc->getView()->setInitialClientSize();
pNewDoc->Activate();
}
}
{
std::vector<ImageFileDocument*> 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();
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<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);
pNewDoc->UpdateAllViews (this);
- pNewDoc->getView()->getFrame()->Show(true);
+ pNewDoc->getView()->setInitialClientSize();
pNewDoc->Activate();
}
}
{
std::vector<ImageFileDocument*> 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();
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<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);
pNewDoc->UpdateAllViews (this);
- pNewDoc->getView()->getFrame()->Show(true);
+ pNewDoc->getView()->setInitialClientSize();
pNewDoc->Activate();
}
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
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();
}
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();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
GetDocument()->Activate();
}
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
}
GetDocument()->Activate();
m_bMaxSpecified = false;
if (theApp->getAskDeleteNewDocs())
GetDocument()->Modify (true);
+ OnUpdate(this, NULL);
GetDocument()->UpdateAllViews (this);
}
GetDocument()->Activate();
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;
}
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<int>('A'), IFMENU_VIEW_SCALE_AUTO);
accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('U'), IFMENU_VIEW_SCALE_FULL);
#if wxUSE_GLCANVAS
accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast<int>('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);
-
+
return true;
}
-void
+void
+ImageFileView::setInitialClientSize ()
+{
+ if (m_pFrame && m_pCanvas) {
+ wxSize bestSize = m_pCanvas->GetBestSize();
+
+ m_pFrame->SetClientSize (bestSize);
+ m_pFrame->Show (true);
+ m_pFrame->SetFocus();
+ }
+}
+
+void
ImageFileView::OnDraw (wxDC* dc)
{
- wxSize sizeWindow = m_pFrame->GetClientSize();
- wxSize sizeBest = m_pCanvas->GetBestSize();
- if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y)
- m_pFrame->SetClientSize (sizeBest);
-
- if (m_bitmap.Ok())
- dc->DrawBitmap(m_bitmap, 0, 0, false);
-
+ 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();
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");
}
}
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;
- int xSize = nx;
- int ySize = ny;
- ySize = clamp (ySize, 0, 800);
- m_pFrame->SetClientSize (xSize, ySize);
m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20);
m_pCanvas->SetBackgroundColour(*wxWHITE);
- }
-
+ }
+
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);
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;
}
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();
ImageFileView::OnEditPaste (wxCommandEvent& event)
{
ImageFile& rIF = GetDocument()->getImageFile();
-
+
if (wxTheClipboard->Open()) {
wxBitmap bitmap;
if (wxTheClipboard->IsSupported (wxDF_BITMAP)) {
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();
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");
}
}
}
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();
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()->getFrame()->Show(true);
+ pScaledDoc->getView()->setInitialClientSize();
pScaledDoc->Activate();
}
}
{
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();
}
{
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];
} 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<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;
}
-
+
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];
} 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<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;
}
-
+
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_complex*>(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");
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;
delete pYReal;
delete pYImag;
delete pYMag;
- delete [] pcIn;
-
+ fftw_free(pcIn);
+
if (theApp->getAskDeleteNewDocs())
pPlotDoc->Modify (true);
pPlotDoc->getView()->getFrame()->Show(true);
{
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];
}
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");
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;
delete pYMag;
delete pdTemp;
delete [] pcIn;
-
+
if (theApp->getAskDeleteNewDocs())
pPlotDoc->Modify (true);
pPlotDoc->getView()->getFrame()->Show(true);
{
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();
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];
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<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;
}
-
+
std::vector<ImageFileDocument*> 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];
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;
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;
if (iBin >= 0 && iBin < NUMBER_HISTOGRAM_BINS)
pY[iBin] += 1;
}
-
+
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
os << "Histogram";
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;
// 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 ()
m_pView = NULL;
}
-void
+void
PhantomCanvas::OnDraw (wxDC& dc)
{
if (m_pView)
{
if (! m_pView)
return wxSize(0,0);
-
+
int xSize, ySize;
theApp->getMainFrame()->GetClientSize (&xSize, &ySize);
xSize = maxValue<int> (xSize, ySize);
#ifdef CTSIM_MDI
ySize = xSize = (xSize / 4);
#else
- ySize = xSize;
+ xSize = ySize = static_cast<int>(ySize * .7);
#endif
+
return wxSize (xSize, ySize);
}
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)
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;
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();
}
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();
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<wxWindow*>(getFrameForChild()));
for (int iView = 0; iView < pProj->nView(); iView++) {
::wxYield();
::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;
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 (! 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");
return;
}
pProjectionDoc->setProjections (pProj);
- ProjectionFileView* projView = pProjectionDoc->getView();
- if (projView) {
- projView->OnUpdate (projView, NULL);
- if (projView->getCanvas())
- projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView);
- if (wxFrame* pFrame = projView->getFrame()) {
- pFrame->Show(true);
- pFrame->SetFocus();
- pFrame->Raise();
- }
- GetDocumentManager()->ActivateView (projView, true, false);
- }
if (theApp->getAskDeleteNewDocs())
pProjectionDoc-> Modify(true);
+ 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();
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 (! 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");
pRasterDoc->setImageFile (pImageFile);
if (theApp->getAskDeleteNewDocs())
pRasterDoc->Modify (true);
- pRasterDoc->UpdateAllViews (this);
- pRasterDoc->getView()->getFrame()->Show(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());
- ImageFileView* rasterView = pRasterDoc->getView();
- if (rasterView) {
- rasterView->getFrame()->SetFocus();
- rasterView->OnUpdate (rasterView, NULL);
- }
+
+ pRasterDoc->UpdateAllViews(this);
+ pRasterDoc->getView()->setInitialClientSize();
pRasterDoc->Activate();
}
}
-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;
}
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<int>('J'), PHMMENU_PROCESS_PROJECTIONS);
accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('R'), PHMMENU_PROCESS_RASTERIZE);
accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('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);
m_pCanvas = CreateCanvas (m_pFrame);
m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
-
- m_pFrame->SetTitle ("PhantomFileView");
-
-#ifdef __X__
- int x, y; // X requires a forced resize
- m_pFrame->GetSize(&x, &y);
- m_pFrame->SetSize(-1, -1, x, y);
-#endif
-
+ m_pFrame->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);
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;
}
m_pView = NULL;
}
-void
+void
ProjectionFileCanvas::OnDraw(wxDC& dc)
{
if (m_pView)
wxSize
ProjectionFileCanvas::GetBestSize () const
{
- wxSize best (0, 0);
+ 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;
}
EVT_MENU(PJMENU_CONVERT_PARALLEL, ProjectionFileView::OnConvertParallel)
EVT_MENU(PJMENU_PLOT_TTHETA_SAMPLING, ProjectionFileView::OnPlotTThetaSampling)
EVT_MENU(PJMENU_PLOT_HISTOGRAM, ProjectionFileView::OnPlotHistogram)
-EVT_MENU(PJMENU_ARTIFACT_REDUCTION, ProjectionFileView::OnArtifactReduction)
+ // EVT_MENU(PJMENU_ARTIFACT_REDUCTION, ProjectionFileView::OnArtifactReduction)
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;
m_iDefaultNX = 256;
m_iDefaultNY = 256;
#endif
-
+
m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT;
m_dDefaultFilterParam = 1.;
#if HAVE_FFTW
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
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();
}
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");
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);
- pRectDoc->getView()->getFrame()->Show(true);
- pRectDoc->UpdateAllViews ();
+ pRectDoc->UpdateAllViews();
+ pRectDoc->getView()->setInitialClientSize();
pRectDoc->Activate();
}
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;
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);
- pPolarDoc->getView()->getFrame()->Show(true);
pPolarDoc->UpdateAllViews ();
+ pPolarDoc->getView()->setInitialClientSize();
pPolarDoc->Activate();
}
}
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="
- << 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);
- pPolarDoc->getView()->getFrame()->Show(true);
- pPolarDoc->UpdateAllViews ();
+ pPolarDoc->UpdateAllViews (this);
+ pPolarDoc->getView()->setInitialClientSize();
pPolarDoc->Activate();
}
}
DialogGetThetaRange dlgTheta (this->getFrame(), ParallelRaysums::THETA_RANGE_UNCONSTRAINED);
if (dlgTheta.ShowModal() != wxID_OK)
return;
-
+
int iThetaRange = dlgTheta.getThetaRange();
-
+
Projections& rProj = GetDocument()->getProjections();
ParallelRaysums parallel (&rProj, iThetaRange);
PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
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;
void
ProjectionFileView::OnPlotHistogram (wxCommandEvent& event)
-{
+{
Projections& rProj = GetDocument()->getProjections();
int nDet = rProj.nDet();
int nView = rProj.nView();
-
+
if (nDet < 1 || nView < 1)
return;
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];
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;
if (iBin >= 0 && iBin < NUMBER_HISTOGRAM_BINS)
pY[iBin] += 1;
}
- }
+ }
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
os << "Histogram";
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);
-
+ pProjDocNew->setProjections (pProjNew);
+
if (ProjectionFileView* projView = pProjDocNew->getView()) {
projView->OnUpdate (projView, NULL);
if (projView->getCanvas())
pFrame->SetFocus();
pFrame->Raise();
}
- GetDocumentManager()->ActivateView (projView, true, false);
+ GetDocumentManager()->ActivateView (projView, true);
}
if (theApp->getAskDeleteNewDocs())
pProjDocNew-> Modify(true);
pProjDocNew->UpdateAllViews (this);
+ pProjDocNew->getView()->setInitialClientSize();
pProjDocNew->Activate();
}
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="
- << 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);
- pPolarDoc->getView()->getFrame()->Show(true);
pPolarDoc->UpdateAllViews ();
+ pPolarDoc->getView()->setInitialClientSize();
pPolarDoc->Activate();
}
}
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();
::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;
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 (! 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;
sys_error (ERR_SEVERE, "Unable to create image file");
return;
}
+ *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
+ pImageFile->labelAdd (rProj.getLabel());
+ pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());
+
pReconDoc->setImageFile (pImageFile);
if (theApp->getAskDeleteNewDocs())
pReconDoc->Modify (true);
- pReconDoc->UpdateAllViews (this);
+ pReconDoc->UpdateAllViews();
+ pReconDoc->getView()->setInitialClientSize();
pReconDoc->Activate();
- if (ImageFileView* rasterView = pReconDoc->getView()) {
- rasterView->OnUpdate (rasterView, NULL);
- rasterView->getFrame()->SetFocus();
- rasterView->getFrame()->Show(true);
- }
- *theApp->getLog() << os.str().c_str() << "\n";
- pImageFile->labelAdd (rProj.getLabel());
- pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());
}
}
-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;
}
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");
-
- wxMenu* filter_menu = new wxMenu;
- filter_menu->Append (PJMENU_ARTIFACT_REDUCTION, "&Artifact Reduction");
-
+
+ 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, _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");
- 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<int>('L'), PJMENU_CONVERT_POLAR);
accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('T'), PJMENU_CONVERT_FFT_POLAR);
accelEntries[6].Set (wxACCEL_CTRL, static_cast<int>('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);
-
-#ifdef __X__
- int x, y; // X requires a forced resize
- m_pFrame->GetSize(&x, &y);
- m_pFrame->SetSize(-1, -1, x, y);
-#endif
-
+ m_pFrame->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)
{
- wxSize clientSize = m_pFrame->GetClientSize();
- wxSize bestSize = m_pCanvas->GetBestSize();
-
- if (clientSize.x > bestSize.x || clientSize.y > bestSize.y)
- m_pFrame->SetClientSize (bestSize);
-
- if (m_bitmap.Ok())
- dc->DrawBitmap (m_bitmap, 0, 0, false);
+ if (m_pBitmap && m_pBitmap->Ok())
+ dc->DrawBitmap (*m_pBitmap, 0, 0, false);
}
-void
+void
+ProjectionFileView::setInitialClientSize ()
+{
+ if (m_pFrame && m_pCanvas) {
+ wxSize bestSize = m_pCanvas->GetBestSize();
+
+ m_pFrame->SetClientSize (bestSize);
+ m_pFrame->Show (true);
+ m_pFrame->SetFocus();
+ }
+}
+
+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();
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");
}
}
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;
- int xSize = nDet;
- int ySize = nView;
- xSize = clamp (xSize, 0, 800);
- ySize = clamp (ySize, 0, 800);
- m_pFrame->SetClientSize (xSize, ySize);
- m_pCanvas->SetScrollbars (20, 20, nDet/20, nView/20);
- }
-
- if (m_pCanvas)
- m_pCanvas->Refresh();
+ }
+
+ m_pCanvas->SetScrollbars(20, 20, nDet/20, nView/20);
+ m_pCanvas->SetBackgroundColour(*wxWHITE);
+
+ if (m_pCanvas)
+ m_pCanvas->Refresh();
}
-bool
+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;
}
// 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;
}
PlotFileCanvas::~PlotFileCanvas ()
{
- m_pView = NULL;
}
-void
+wxSize
+PlotFileCanvas::GetBestSize() const
+{
+ return wxSize (500, 300);
+}
+
+
+void
PlotFileCanvas::OnDraw(wxDC& dc)
{
if (m_pView)
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)
{
}
{
if (m_pEZPlot)
delete m_pEZPlot;
-
- GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+
+ GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ 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();
}
-void
+void
PlotFileView::OnScaleAuto (wxCommandEvent& event)
{
const PlotFile& rPlotFile = GetDocument()->getPlotFile();
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;
GetDocument()->Activate();
}
-void
+void
PlotFileView::OnScaleFull (wxCommandEvent& event)
{
if (m_bMinSpecified || m_bMaxSpecified) {
}
-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;
}
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<int>('E'), PLOTMENU_VIEW_SCALE_MINMAX);
accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('A'), PLOTMENU_VIEW_SCALE_AUTO);
accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('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);
-
-#ifdef __X__
- int x, y; // X requires a forced resize
- m_pFrame->GetSize(&x, &y);
- m_pFrame->SetSize(-1, -1, x, y);
-#endif
-
+ m_pFrame->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);
}
-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);
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);
wxString s(wxTheApp->GetAppName());
if (m_pFrame)
m_pFrame->SetTitle(s);
-
+
SetFrame(NULL);
if (deleteWindow) {
delete m_pFrame;
if (GetDocument() && GetDocument()->getBadFileOpen())
::wxYield(); // wxWindows bug workaround
}
-
+
return true;
}
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");
-
-#ifdef __X__
- // X seems to require a forced resize
- int x, y;
- frame->GetSize(&x, &y);
- frame->SetSize(-1, -1, x, y);
-#endif
-
+ m_pFrame->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;
}
{
}
-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;
if (GetDocument() && GetDocument()->getBadFileOpen())
::wxYield(); // wxWindows bug workaround
}
-
+
return TRUE;
}
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)
{
}
{
m_pView = NULL;
}
+
+wxSize
+TextFileCanvas::GetBestSize() const
+{
+ int xSize, ySize;
+ theApp->getMainFrame()->GetClientSize (&xSize, &ySize);
+ xSize = maxValue<int> (xSize, ySize);
+#ifdef CTSIM_MDI
+ ySize = xSize = (xSize / 4);
+#else
+ ySize = xSize;
+#endif
+ return wxSize (xSize, ySize);
+}
projects / ctsim.git / blobdiff