** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.48 2001/01/02 13:57:30 kevin Exp $
+** $Id: views.cpp,v 1.68 2001/01/20 08:10:33 kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
wxPoint pt(event.GetLogicalPosition(dc));
- const ImageFile& rIF = m_pView->GetDocument()->getImageFile();
+ const ImageFileDocument* pIFDoc = m_pView->GetDocument();
+ if (! pIFDoc)
+ return;
+ const ImageFile& rIF = pIFDoc->getImageFile();
ImageFileArrayConst v = rIF.getArray();
int nx = rIF.nx();
int ny = rIF.ny();
}
}
+wxSize
+ImageFileCanvas::GetBestSize() const
+{
+ if (! m_pView)
+ return wxSize(0,0);
+
+ const ImageFile& rIF = m_pView->GetDocument()->getImageFile();
+ return wxSize (rIF.nx(), rIF.ny());
+}
+
+
// ImageFileView
IMPLEMENT_DYNAMIC_CLASS(ImageFileView, wxView)
EVT_MENU(IFMENU_FILE_PROPERTIES, ImageFileView::OnProperties)
EVT_MENU(IFMENU_VIEW_SCALE_MINMAX, ImageFileView::OnScaleMinMax)
EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto)
+EVT_MENU(IFMENU_VIEW_SCALE_FULL, ImageFileView::OnScaleFull)
EVT_MENU(IFMENU_COMPARE_IMAGES, ImageFileView::OnCompare)
EVT_MENU(IFMENU_COMPARE_ROW, ImageFileView::OnCompareRow)
EVT_MENU(IFMENU_COMPARE_COL, ImageFileView::OnCompareCol)
EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply)
EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide)
EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize)
-#ifdef HAVE_FFTW
+#ifdef HAVE_FFT
EVT_MENU(IFMENU_FILTER_FFT, ImageFileView::OnFFT)
EVT_MENU(IFMENU_FILTER_IFFT, ImageFileView::OnIFFT)
+EVT_MENU(IFMENU_FILTER_FFT_ROWS, ImageFileView::OnFFTRows)
+EVT_MENU(IFMENU_FILTER_IFFT_ROWS, ImageFileView::OnIFFTRows)
+EVT_MENU(IFMENU_FILTER_FFT_COLS, ImageFileView::OnFFTCols)
+EVT_MENU(IFMENU_FILTER_IFFT_COLS, ImageFileView::OnIFFTCols)
#endif
EVT_MENU(IFMENU_FILTER_MAGNITUDE, ImageFileView::OnMagnitude)
EVT_MENU(IFMENU_FILTER_PHASE, ImageFileView::OnPhase)
EVT_MENU(IFMENU_PLOT_ROW, ImageFileView::OnPlotRow)
EVT_MENU(IFMENU_PLOT_COL, ImageFileView::OnPlotCol)
+#ifdef HAVE_FFT
+EVT_MENU(IFMENU_PLOT_FFT_ROW, ImageFileView::OnPlotFFTRow)
+EVT_MENU(IFMENU_PLOT_FFT_COL, ImageFileView::OnPlotFFTCol)
+#endif
EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram)
END_EVENT_TABLE()
rIF.printLabelsBrief (os);
}
*theApp->getLog() << os.str().c_str();
- wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
+ wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
dialogMsg.ShowModal();
}
}
const ImageFile& rIF = GetDocument()->getImageFile();
double min, max, mean, mode, median, stddev;
rIF.statistics(min, max, mean, mode, median, stddev);
- DialogAutoScaleParameters dialogAutoScale (m_frame, mean, mode, median, stddev, m_dAutoScaleFactor);
+ DialogAutoScaleParameters dialogAutoScale (getFrameForChild(), mean, mode, median, stddev, m_dAutoScaleFactor);
int iRetVal = dialogAutoScale.ShowModal();
if (iRetVal == wxID_OK) {
m_bMinSpecified = true;
if (m_bMaxSpecified)
max = m_dMaxPixel;
- DialogGetMinMax dialogMinMax (m_frame, "Set Image Minimum & Maximum", min, max);
+ DialogGetMinMax dialogMinMax (getFrameForChild(), "Set Image Minimum & Maximum", min, max);
int retVal = dialogMinMax.ShowModal();
if (retVal == wxID_OK) {
m_bMinSpecified = true;
}
}
+void
+ImageFileView::OnScaleFull (wxCommandEvent& event)
+{
+ if (m_bMinSpecified || m_bMaxSpecified) {
+ m_bMinSpecified = false;
+ m_bMaxSpecified = false;
+ OnUpdate (this, NULL);
+ }
+}
+
void
ImageFileView::OnCompare (wxCommandEvent& event)
{
if (vecIF.size() == 0) {
wxMessageBox("There are no compatible image files open for comparision", "No comparison images");
} else {
- DialogGetComparisonImage dialogGetCompare(m_frame, "Get Comparison Image", vecIF, true);
+ DialogGetComparisonImage dialogGetCompare(getFrameForChild(), "Get Comparison Image", vecIF, true);
if (dialogGetCompare.ShowModal() == wxID_OK) {
const ImageFile& rIF = GetDocument()->getImageFile();
std::ostringstream os;
double min, max, mean, mode, median, stddev;
rIF.statistics (min, max, mean, mode, median, stddev);
- os << rIF.getFilename() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n";
+ os << GetFrame()->GetTitle().c_str() << ": 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 << "\n";
return;
}
- wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": ";
+ wxString s = GetFrame()->GetTitle() + ": ";
differenceImage.labelsCopy (rIF, s.c_str());
s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle() + ": ";
differenceImage.labelsCopy (rCompareIF, s.c_str());
if (vecIF.size() == 0) {
wxMessageBox ("There are no compatible image files open for comparision", "No comparison images");
} else {
- DialogGetComparisonImage dialogGetCompare (m_frame, "Get Image to Add", vecIF, false);
+ DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Add", vecIF, false);
if (dialogGetCompare.ShowModal() == wxID_OK) {
ImageFile& rIF = GetDocument()->getImageFile();
if (vecIF.size() == 0) {
wxMessageBox ("There are no compatible image files open for comparision", "No comparison images");
} else {
- DialogGetComparisonImage dialogGetCompare (m_frame, "Get Image to Subtract", vecIF, false);
+ DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Subtract", vecIF, false);
if (dialogGetCompare.ShowModal() == wxID_OK) {
ImageFile& rIF = GetDocument()->getImageFile();
if (vecIF.size() == 0) {
wxMessageBox ("There are no compatible image files open for comparision", "No comparison images");
} else {
- DialogGetComparisonImage dialogGetCompare (m_frame, "Get Image to Multiply", vecIF, false);
+ DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Multiply", vecIF, false);
if (dialogGetCompare.ShowModal() == wxID_OK) {
ImageFile& rIF = GetDocument()->getImageFile();
if (vecIF.size() == 0) {
wxMessageBox ("There are no compatible image files open for comparision", "No comparison images");
} else {
- DialogGetComparisonImage dialogGetCompare (m_frame, "Get Image to Divide", vecIF, false);
+ DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Divide", vecIF, false);
if (dialogGetCompare.ShowModal() == wxID_OK) {
ImageFile& rIF = GetDocument()->getImageFile();
}
-#ifdef HAVE_FFTW
+#ifdef HAVE_FFT
void
ImageFileView::OnFFT (wxCommandEvent& event)
{
ImageFile& rIF = GetDocument()->getImageFile();
- wxProgressDialog dlgProgress (wxString("FFT"), wxString("FFT Progress"), 1, m_frame, wxPD_APP_MODAL);
rIF.fft (rIF);
rIF.labelAdd ("FFT Image");
m_bMinSpecified = false;
ImageFileView::OnIFFT (wxCommandEvent& event)
{
ImageFile& rIF = GetDocument()->getImageFile();
- wxProgressDialog dlgProgress (wxString("IFFT"), wxString("IFFT Progress"), 1, m_frame, wxPD_APP_MODAL);
rIF.ifft (rIF);
rIF.labelAdd ("IFFT Image");
m_bMinSpecified = false;
GetDocument()->Modify(TRUE);
GetDocument()->UpdateAllViews(this);
}
+
+void
+ImageFileView::OnFFTRows (wxCommandEvent& event)
+{
+ ImageFile& rIF = GetDocument()->getImageFile();
+ rIF.fftRows (rIF);
+ rIF.labelAdd ("FFT Rows");
+ m_bMinSpecified = false;
+ m_bMaxSpecified = false;
+ if (theApp->getSetModifyNewDocs())
+ GetDocument()->Modify(TRUE);
+ GetDocument()->UpdateAllViews(this);
+}
+
+void
+ImageFileView::OnIFFTRows (wxCommandEvent& event)
+{
+ ImageFile& rIF = GetDocument()->getImageFile();
+ rIF.ifftRows (rIF);
+ rIF.labelAdd ("IFFT Rows");
+ m_bMinSpecified = false;
+ m_bMaxSpecified = false;
+ if (theApp->getSetModifyNewDocs())
+ GetDocument()->Modify(TRUE);
+ GetDocument()->UpdateAllViews(this);
+}
+
+void
+ImageFileView::OnFFTCols (wxCommandEvent& event)
+{
+ ImageFile& rIF = GetDocument()->getImageFile();
+ rIF.fftCols (rIF);
+ rIF.labelAdd ("FFT Columns");
+ m_bMinSpecified = false;
+ m_bMaxSpecified = false;
+ if (theApp->getSetModifyNewDocs())
+ GetDocument()->Modify(TRUE);
+ GetDocument()->UpdateAllViews(this);
+}
+
+void
+ImageFileView::OnIFFTCols (wxCommandEvent& event)
+{
+ ImageFile& rIF = GetDocument()->getImageFile();
+ rIF.ifftCols (rIF);
+ rIF.labelAdd ("IFFT Columns");
+ m_bMinSpecified = false;
+ m_bMaxSpecified = false;
+ if (theApp->getSetModifyNewDocs())
+ GetDocument()->Modify(TRUE);
+ GetDocument()->UpdateAllViews(this);
+}
#endif
void
ImageFileView::OnFourier (wxCommandEvent& event)
{
ImageFile& rIF = GetDocument()->getImageFile();
- wxProgressDialog dlgProgress (wxString("Fourier"), wxString("Fourier Progress"), 1, m_frame, wxPD_APP_MODAL);
+ wxProgressDialog dlgProgress (wxString("Fourier"), wxString("Fourier Progress"), 1, getFrameForChild(), wxPD_APP_MODAL);
rIF.fourier (rIF);
rIF.labelAdd ("Fourier Image");
m_bMinSpecified = false;
GetDocument()->Modify(TRUE);
GetDocument()->UpdateAllViews(this);
}
+
void
ImageFileView::OnInverseFourier (wxCommandEvent& event)
{
ImageFile& rIF = GetDocument()->getImageFile();
- wxProgressDialog dlgProgress (wxString("Inverse Fourier"), wxString("Inverse Fourier Progress"), 1, m_frame, wxPD_APP_MODAL);
+ wxProgressDialog dlgProgress (wxString("Inverse Fourier"), wxString("Inverse Fourier Progress"), 1, getFrameForChild(), wxPD_APP_MODAL);
rIF.inverseFourier (rIF);
rIF.labelAdd ("Inverse Fourier Image");
m_bMinSpecified = false;
wxFrame*
ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
- wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
-
+#if CTSIM_MDI
+ wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
+#else
+ wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
+#endif
+ theApp->setIconForFrame (subframe);
+
wxMenu *file_menu = new wxMenu;
- file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
- file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...");
- file_menu->Append(wxID_OPEN, "&Open...");
- file_menu->Append(wxID_SAVE, "&Save");
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
+ file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
+ file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
+ file_menu->Append(wxID_SAVE, "&Save\tCtrl-S");
file_menu->Append(wxID_SAVEAS, "Save &As...");
- file_menu->Append(wxID_CLOSE, "&Close");
+ file_menu->Append(wxID_CLOSE, "&Close\tCtrl-W");
file_menu->AppendSeparator();
file_menu->Append(IFMENU_FILE_PROPERTIES, "P&roperties");
file_menu->Append(wxID_PREVIEW, "Print Pre&view");
wxMenu *view_menu = new wxMenu;
- view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...");
- view_menu->Append(IFMENU_VIEW_SCALE_AUTO, "Display Scale &Auto...");
+ 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");
wxMenu* filter_menu = new wxMenu;
filter_menu->Append (IFMENU_FILTER_INVERTVALUES, "&Invert Values");
filter_menu->Append (IFMENU_FILTER_LOG, "&Log");
filter_menu->Append (IFMENU_FILTER_EXP, "&Exp");
filter_menu->AppendSeparator();
-#ifdef HAVE_FFTW
- filter_menu->Append (IFMENU_FILTER_FFT, "&FFT");
- filter_menu->Append (IFMENU_FILTER_IFFT, "&IFFT");
+#ifdef HAVE_FFT
+ filter_menu->Append (IFMENU_FILTER_FFT, "2D &FFT");
+ filter_menu->Append (IFMENU_FILTER_IFFT, "2D &IFFT");
+ filter_menu->Append (IFMENU_FILTER_FFT_ROWS, "FFT Rows");
+ filter_menu->Append (IFMENU_FILTER_IFFT_ROWS, "IFFT Rows");
+ filter_menu->Append (IFMENU_FILTER_FFT_COLS, "FFT Columns");
+ filter_menu->Append (IFMENU_FILTER_IFFT_COLS, "IFFT Columns");
filter_menu->Append (IFMENU_FILTER_FOURIER, "F&ourier");
filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "Inverse Fo&urier");
#else
analyze_menu->Append (IFMENU_PLOT_COL, "Plot &Column");
analyze_menu->Append (IFMENU_PLOT_HISTOGRAM, "Plot &Histogram");
analyze_menu->AppendSeparator();
+ analyze_menu->Append (IFMENU_PLOT_FFT_ROW, "Plot FFT Row");
+ analyze_menu->Append (IFMENU_PLOT_FFT_COL, "Plot FFT Column");
+ analyze_menu->AppendSeparator();
analyze_menu->Append (IFMENU_COMPARE_IMAGES, "Compare &Images...");
analyze_menu->Append (IFMENU_COMPARE_ROW, "Compare &Row");
analyze_menu->Append (IFMENU_COMPARE_COL, "Compare &Column");
wxMenu *help_menu = new wxMenu;
+ help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
+ help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(filter_menu, "Fi<er");
menu_bar->Append(analyze_menu, "&Analyze");
menu_bar->Append(help_menu, "&Help");
-
+
subframe->SetMenuBar(menu_bar);
subframe->Centre(wxBOTH);
+ wxAcceleratorEntry accelEntries[10];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
+ accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
+ accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
+ accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
+ accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
+ accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('A'), IFMENU_VIEW_SCALE_AUTO);
+ accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('U'), IFMENU_VIEW_SCALE_FULL);
+ accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('E'), IFMENU_VIEW_SCALE_MINMAX);
+ wxAcceleratorTable accelTable (10, accelEntries);
+ subframe->SetAcceleratorTable (accelTable);
+
return subframe;
}
void
ImageFileView::OnDraw (wxDC* dc)
{
+ wxSize sizeWindow = m_frame->GetClientSize();
+ wxSize sizeBest = m_canvas->GetBestSize();
+ if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y)
+ m_frame->SetClientSize (sizeBest);
+
if (m_bitmap.Ok())
dc->DrawBitmap(m_bitmap, 0, 0, false);
return false;
m_canvas->Clear();
- m_canvas->m_pView = NULL;
+ //m_canvas->m_pView = NULL;
m_canvas = NULL;
wxString s(theApp->GetAppName());
if (m_frame)
m_dMaxPixel = max;
}
- DialogExportParameters dialogExport (m_frame, m_iDefaultExportFormatID);
+ DialogExportParameters dialogExport (getFrameForChild(), m_iDefaultExportFormatID);
if (dialogExport.ShowModal() == wxID_OK) {
wxString strFormatName (dialogExport.getFormatName ());
m_iDefaultExportFormatID = ImageFile::convertFormatNameToID (strFormatName.c_str());
unsigned int iOldNX = rIF.nx();
unsigned int iOldNY = rIF.ny();
- DialogGetXYSize dialogGetXYSize (m_frame, "Set New X & Y Dimensions", iOldNX, iOldNY);
+ DialogGetXYSize dialogGetXYSize (getFrameForChild(), "Set New X & Y Dimensions", iOldNX, iOldNY);
if (dialogGetXYSize.ShowModal() == wxID_OK) {
unsigned int iNewNX = dialogGetXYSize.getXSize();
unsigned int iNewNY = dialogGetXYSize.getYSize();
}
ImageFile& rScaledIF = pScaledDoc->getImageFile();
rScaledIF.setArraySize (iNewNX, iNewNY);
+ rScaledIF.labelsCopy (rIF);
rScaledIF.labelAdd (os.str().c_str());
rIF.scaleImage (rScaledIF);
*theApp->getLog() << os.str().c_str() << "\n";
const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(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* pY = new double [nx];
+ double* pYReal = new double [nx];
+ double *pYImag = NULL;
+ double *pYMag = NULL;
+ if (rIF.isComplex()) {
+ pYImag = new double [nx];
+ pYMag = new double [nx];
+ }
for (int i = 0; i < nx; i++) {
pX[i] = i;
- pY[i] = v[i][yCursor];
+ pYReal[i] = v[i][yCursor];
+ if (rIF.isComplex()) {
+ pYImag[i] = vImag[i][yCursor];
+ pYMag[i] = ::sqrt (v[i][yCursor] * v[i][yCursor] + vImag[i][yCursor] * vImag[i][yCursor]);
+ }
}
PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
if (! pPlotDoc) {
rPlotFile.addEzsetCommand ("lxfrac 0");
rPlotFile.addEzsetCommand ("box");
rPlotFile.addEzsetCommand ("grid");
- rPlotFile.setCurveSize (2, nx);
+ rPlotFile.addEzsetCommand ("curve 1");
+ rPlotFile.addEzsetCommand ("color 1");
+ if (rIF.isComplex()) {
+ rPlotFile.addEzsetCommand ("dash 1");
+ rPlotFile.addEzsetCommand ("curve 2");
+ rPlotFile.addEzsetCommand ("color 4");
+ rPlotFile.addEzsetCommand ("dash 3");
+ rPlotFile.addEzsetCommand ("curve 3");
+ rPlotFile.addEzsetCommand ("color 0");
+ rPlotFile.addEzsetCommand ("solid");
+ rPlotFile.setCurveSize (4, nx);
+ } else
+ rPlotFile.setCurveSize (2, nx);
rPlotFile.addColumn (0, pX);
- rPlotFile.addColumn (1, pY);
+ 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";
+ rPlotFile.addDescription (os.str().c_str());
}
delete pX;
- delete pY;
+ delete pYReal;
+ if (rIF.isComplex()) {
+ delete pYImag;
+ delete pYMag;
+ }
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
pPlotDoc->UpdateAllViews();
const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(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* pY = new double [ny];
+ double* pYReal = new double [ny];
+ double* pYImag = NULL;
+ double* pYMag = NULL;
+ if (rIF.isComplex()) {
+ pYImag = new double [ny];
+ pYMag = new double [ny];
+ }
for (int i = 0; i < ny; i++) {
pX[i] = i;
- pY[i] = v[xCursor][i];
+ pYReal[i] = v[xCursor][i];
+ if (rIF.isComplex()) {
+ pYImag[i] = vImag[xCursor][i];
+ pYMag[i] = ::sqrt (v[xCursor][i] * v[xCursor][i] + vImag[xCursor][i] * vImag[xCursor][i]);
+ }
}
PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
if (! pPlotDoc) {
rPlotFile.addEzsetCommand ("lxfrac 0");
rPlotFile.addEzsetCommand ("box");
rPlotFile.addEzsetCommand ("grid");
- rPlotFile.setCurveSize (2, nx);
+ rPlotFile.addEzsetCommand ("curve 1");
+ rPlotFile.addEzsetCommand ("color 1");
+ if (rIF.isComplex()) {
+ rPlotFile.addEzsetCommand ("dash 1");
+ rPlotFile.addEzsetCommand ("curve 2");
+ rPlotFile.addEzsetCommand ("color 4");
+ rPlotFile.addEzsetCommand ("dash 3");
+ rPlotFile.addEzsetCommand ("curve 3");
+ rPlotFile.addEzsetCommand ("color 0");
+ rPlotFile.addEzsetCommand ("solid");
+ rPlotFile.setCurveSize (4, ny);
+ } else
+ rPlotFile.setCurveSize (2, ny);
rPlotFile.addColumn (0, pX);
- rPlotFile.addColumn (1, pY);
+ 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";
+ rPlotFile.addDescription (os.str().c_str());
}
delete pX;
- delete pY;
+ delete pYReal;
+ if (rIF.isComplex()) {
+ delete pYImag;
+ delete pYMag;
+ }
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
pPlotDoc->UpdateAllViews();
}
}
+#ifdef HAVE_FFT
+void
+ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
+{
+ int xCursor, yCursor;
+ if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {
+ wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error");
+ return;
+ }
+
+ const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(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];
+
+ int i;
+ for (i = 0; i < nx; i++) {
+ pcIn[i].re = v[i][yCursor];
+ if (rIF.isComplex())
+ pcIn[i].im = vImag[i][yCursor];
+ else
+ pcIn[i].im = 0;
+ }
+
+ fftw_plan plan = fftw_create_plan (nx, FFTW_FORWARD, FFTW_IN_PLACE);
+ fftw_one (plan, pcIn, NULL);
+ 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;
+ pYImag[i] = pcIn[i].im;
+ pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im);
+ }
+ Fourier::shuffleFourierToNaturalOrder (pYReal, nx);
+ Fourier::shuffleFourierToNaturalOrder (pYImag, nx);
+ Fourier::shuffleFourierToNaturalOrder (pYMag, nx);
+
+ PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+ if (! pPlotDoc) {
+ sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
+ } else {
+ PlotFile& rPlotFile = pPlotDoc->getPlotFile();
+ std::ostringstream os;
+ os << "Row " << yCursor;
+ std::string title("title ");
+ title += os.str();
+ rPlotFile.addEzsetCommand (title.c_str());
+ rPlotFile.addEzsetCommand ("xlabel Column");
+ rPlotFile.addEzsetCommand ("ylabel Pixel Value");
+ rPlotFile.addEzsetCommand ("lxfrac 0");
+ rPlotFile.addEzsetCommand ("curve 1");
+ rPlotFile.addEzsetCommand ("color 1");
+ rPlotFile.addEzsetCommand ("dash 1");
+ rPlotFile.addEzsetCommand ("curve 2");
+ rPlotFile.addEzsetCommand ("color 4");
+ rPlotFile.addEzsetCommand ("dash 3");
+ rPlotFile.addEzsetCommand ("curve 3");
+ rPlotFile.addEzsetCommand ("color 0");
+ rPlotFile.addEzsetCommand ("solid");
+ rPlotFile.addEzsetCommand ("box");
+ rPlotFile.addEzsetCommand ("grid");
+ rPlotFile.setCurveSize (4, nx);
+ rPlotFile.addColumn (0, pX);
+ rPlotFile.addColumn (1, pYReal);
+ rPlotFile.addColumn (2, pYImag);
+ rPlotFile.addColumn (3, pYMag);
+ for (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";
+ rPlotFile.addDescription (os.str().c_str());
+ }
+ delete pX;
+ delete pYReal;
+ delete pYImag;
+ delete pYMag;
+ delete [] pcIn;
+
+ if (theApp->getSetModifyNewDocs())
+ pPlotDoc->Modify(true);
+ pPlotDoc->UpdateAllViews();
+ }
+}
+
+void
+ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
+{
+ int xCursor, yCursor;
+ if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {
+ wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error");
+ return;
+ }
+
+ const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(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++) {
+ if (rIF.isComplex())
+ pdTemp[i] = vImag[xCursor][i];
+ else
+ pdTemp[i] = 0;
+ }
+ 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_one (plan, pcIn, NULL);
+ 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;
+ pYImag[i] = pcIn[i].im;
+ pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im);
+ }
+
+ PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+ if (! pPlotDoc) {
+ sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
+ } else {
+ PlotFile& rPlotFile = pPlotDoc->getPlotFile();
+ std::ostringstream os;
+ os << "Column " << xCursor;
+ std::string title("title ");
+ title += os.str();
+ rPlotFile.addEzsetCommand (title.c_str());
+ rPlotFile.addEzsetCommand ("xlabel Column");
+ rPlotFile.addEzsetCommand ("ylabel Pixel Value");
+ rPlotFile.addEzsetCommand ("lxfrac 0");
+ rPlotFile.addEzsetCommand ("curve 1");
+ rPlotFile.addEzsetCommand ("color 1");
+ rPlotFile.addEzsetCommand ("dash 1");
+ rPlotFile.addEzsetCommand ("curve 2");
+ rPlotFile.addEzsetCommand ("color 4");
+ rPlotFile.addEzsetCommand ("dash 3");
+ rPlotFile.addEzsetCommand ("curve 3");
+ rPlotFile.addEzsetCommand ("color 0");
+ rPlotFile.addEzsetCommand ("solid");
+ rPlotFile.addEzsetCommand ("box");
+ rPlotFile.addEzsetCommand ("grid");
+ rPlotFile.setCurveSize (4, ny);
+ rPlotFile.addColumn (0, pX);
+ rPlotFile.addColumn (1, pYReal);
+ rPlotFile.addColumn (2, pYImag);
+ rPlotFile.addColumn (3, pYMag);
+ for (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";
+ rPlotFile.addDescription (os.str().c_str());
+ }
+ delete pX;
+ delete pYReal;
+ delete pYImag;
+ delete pYMag;
+ delete pdTemp;
+ delete [] pcIn;
+
+ if (theApp->getSetModifyNewDocs())
+ pPlotDoc->Modify(true);
+ pPlotDoc->UpdateAllViews();
+ }
+}
+#endif
+
void
ImageFileView::OnCompareCol (wxCommandEvent& event)
{
wxMessageBox ("No compatible images for Column Comparison", "Error");
return;
}
- DialogGetComparisonImage dialogGetCompare (m_frame, "Get Comparison Image", vecIFDoc, false);
+ DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Comparison Image", vecIFDoc, false);
if (dialogGetCompare.ShowModal() == wxID_OK) {
ImageFileDocument* pCompareDoc = dialogGetCompare.getImageFileDocument();
rPlotFile.addEzsetCommand ("dash 5");
rPlotFile.addEzsetCommand ("box");
rPlotFile.addEzsetCommand ("grid");
- rPlotFile.setCurveSize (3, nx);
+ rPlotFile.setCurveSize (3, 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());
+ }
+ 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());
+ }
+ os << " Between " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and "
+ << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str();
+ *theApp->getLog() << os.str().c_str() << "\n";
+ rPlotFile.addDescription (os.str().c_str());
}
delete pX;
delete pY1;
return;
}
- DialogGetComparisonImage dialogGetCompare (m_frame, "Get Comparison Image", vecIFDoc, false);
+ DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Comparison Image", vecIFDoc, false);
if (dialogGetCompare.ShowModal() == wxID_OK) {
ImageFileDocument* pCompareDoc = dialogGetCompare.getImageFileDocument();
rPlotFile.addEzsetCommand ("dash 5");
rPlotFile.addEzsetCommand ("box");
rPlotFile.addEzsetCommand ("grid");
- rPlotFile.setCurveSize (3, ny);
+ rPlotFile.setCurveSize (3, nx);
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());
+ }
+ 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());
+ }
+ os << " Between " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and "
+ << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str();
+ *theApp->getLog() << os.str().c_str() << "\n";
+ rPlotFile.addDescription (os.str().c_str());
}
delete pX;
delete pY1;
rPlotFile.addEzsetCommand ("ylabel Count");
rPlotFile.addEzsetCommand ("box");
rPlotFile.addEzsetCommand ("grid");
- rPlotFile.setCurveSize (2, nx);
+ rPlotFile.setCurveSize (2, NUMBER_HISTOGRAM_BINS);
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());
+ }
+ os << " Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str();
+ *theApp->getLog() << os.str().c_str() << "\n";
+ rPlotFile.addDescription (os.str().c_str());
delete pX;
delete pY;
if (theApp->getSetModifyNewDocs())
m_iDefaultNDet = 367;
m_iDefaultNView = 320;
m_iDefaultNSample = 2;
- m_dDefaultRotation = 2;
+ m_dDefaultRotation = 1;
m_dDefaultFocalLength = 2;
m_dDefaultFieldOfView = 1;
m_iDefaultGeometry = Scanner::GEOMETRY_PARALLEL;
m_iDefaultTrace = Trace::TRACE_NONE;
+
+ m_iDefaultRasterNX = 256;
+ m_iDefaultRasterNY = 256;
+ m_iDefaultRasterNSamples = 2;
}
PhantomView::~PhantomView(void)
void
PhantomView::OnProjections (wxCommandEvent& event)
{
- DialogGetProjectionParameters dialogProjection (m_frame, m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView, m_iDefaultGeometry, m_iDefaultTrace);
+ DialogGetProjectionParameters dialogProjection (getFrameForChild(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView, m_iDefaultGeometry, m_iDefaultTrace);
int retVal = dialogProjection.ShowModal();
if (retVal == wxID_OK) {
m_iDefaultNDet = dialogProjection.getNDet();
Timer timer;
if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
- ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(m_frame));
+ ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(getFrameForChild()));
for (int iView = 0; iView < rProj.nView(); iView++) {
::wxYield();
::wxYield();
}
}
} else {
- wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT);
+ wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
for (int i = 0; i < rProj.nView(); i++) {
theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
if (! dlgProgress.Update (i+1)) {
void
PhantomView::OnRasterize (wxCommandEvent& event)
{
- DialogGetRasterParameters dialogRaster (m_frame, 256, 256, 1);
+ DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples);
int retVal = dialogRaster.ShowModal();
if (retVal == wxID_OK) {
- int xSize = dialogRaster.getXSize();
- int ySize = dialogRaster.getYSize();
- int nSamples = dialogRaster.getNSamples();
- if (nSamples < 1)
- nSamples = 1;
- if (xSize > 0 && ySize > 0) {
+ m_iDefaultRasterNX = dialogRaster.getXSize();
+ m_iDefaultRasterNY = dialogRaster.getYSize();
+ m_iDefaultRasterNSamples = dialogRaster.getNSamples();
+ if (m_iDefaultRasterNSamples < 1)
+ m_iDefaultRasterNSamples = 1;
+ if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) {
const Phantom& rPhantom = GetDocument()->getPhantom();
ImageFileDocument* pRasterDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
if (! pRasterDoc) {
}
ImageFile& imageFile = pRasterDoc->getImageFile();
- imageFile.setArraySize (xSize, ySize);
- wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT);
+ imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNX);
+ wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, getFrameForChild(), wxPD_CAN_ABORT);
Timer timer;
for (unsigned int i = 0; i < imageFile.nx(); i++) {
- rPhantom.convertToImagefile (imageFile, nSamples, Trace::TRACE_NONE, i, 1, true);
+ rPhantom.convertToImagefile (imageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
if (! dlgProgress.Update(i+1)) {
pRasterDoc->DeleteAllViews();
return;
pRasterDoc->Modify(true);
pRasterDoc->UpdateAllViews(this);
std::ostringstream os;
- os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples;
+ os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize="
+ << m_iDefaultRasterNY << ", nSamples=" << m_iDefaultRasterNSamples;
*theApp->getLog() << os.str().c_str() << "\n";
imageFile.labelAdd (os.str().c_str(), timer.timerEnd());
ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pRasterDoc->GetFirstView());
wxFrame*
PhantomView::CreateChildFrame(wxDocument *doc, wxView *view)
{
- wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE);
-
+#if CTSIM_MDI
+ wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE);
+#else
+ wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE);
+#endif
+ theApp->setIconForFrame (subframe);
+
wxMenu *file_menu = new wxMenu;
- file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
- file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...");
- file_menu->Append(wxID_OPEN, "&Open...");
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
+ file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
+ file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
file_menu->Append(wxID_SAVEAS, "Save &As...");
file_menu->Append(wxID_CLOSE, "&Close");
file_menu->Append(wxID_PREVIEW, "Print Pre&view");
wxMenu *process_menu = new wxMenu;
- process_menu->Append(PHMMENU_PROCESS_RASTERIZE, "&Rasterize...");
- process_menu->Append(PHMMENU_PROCESS_PROJECTIONS, "&Projections...");
+ process_menu->Append(PHMMENU_PROCESS_RASTERIZE, "&Rasterize...\tCtrl-R");
+ process_menu->Append(PHMMENU_PROCESS_PROJECTIONS, "&Projections...\tCtrl-J");
wxMenu *help_menu = new wxMenu;
- help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents");
+ help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
+ help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(help_menu, "&Help");
subframe->SetMenuBar(menu_bar);
-
subframe->Centre(wxBOTH);
-
+
+ wxAcceleratorEntry accelEntries[8];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
+ accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
+ accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
+ accelEntries[5].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
+ accelEntries[6].Set (wxACCEL_CTRL, static_cast<int>('J'), PHMMENU_PROCESS_PROJECTIONS);
+ accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('R'), PHMMENU_PROCESS_RASTERIZE);
+ wxAcceleratorTable accelTable (8, accelEntries);
+ subframe->SetAcceleratorTable (accelTable);
+
return subframe;
}
int width, height;
m_frame->GetClientSize(&width, &height);
m_frame->SetTitle("PhantomView");
- m_canvas = CreateCanvas(this, m_frame);
+ m_canvas = CreateCanvas (this, m_frame);
#ifdef __X__
int x, y; // X requires a forced resize
return true;
}
-
void
PhantomView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
return false;
m_canvas->Clear();
- m_canvas->m_pView = NULL;
+ //m_canvas->m_pView = NULL;
m_canvas = NULL;
wxString s(wxTheApp->GetAppName());
if (m_frame)
Activate(false);
- if (deleteWindow) {
+ if (deleteWindow)
delete m_frame;
- return true;
- }
+
return true;
}
m_pView->OnDraw(& dc);
}
+wxSize
+ProjectionFileCanvas::GetBestSize () const
+{
+ wxSize best (0, 0);
+ if (m_pView) {
+ Projections& rProj = m_pView->GetDocument()->getProjections();
+ best.Set (rProj.nDet(), rProj.nView());
+ }
+
+ return best;
+}
+
+
// ProjectionFileView
IMPLEMENT_DYNAMIC_CLASS(ProjectionFileView, wxView)
BEGIN_EVENT_TABLE(ProjectionFileView, wxView)
EVT_MENU(PJMENU_FILE_PROPERTIES, ProjectionFileView::OnProperties)
-EVT_MENU(PJMENU_PROCESS_RECONSTRUCT, ProjectionFileView::OnReconstruct)
+EVT_MENU(PJMENU_RECONSTRUCT_FBP, ProjectionFileView::OnReconstructFBP)
+EVT_MENU(PJMENU_CONVERT_POLAR, ProjectionFileView::OnConvertPolar)
+EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar)
END_EVENT_TABLE()
ProjectionFileView::ProjectionFileView(void)
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;
}
ProjectionFileView::~ProjectionFileView(void)
std::ostringstream os;
rProj.printScanInfo(os);
*theApp->getLog() << os.str().c_str();
- wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION);
+ wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION);
dialogMsg.ShowModal();
}
void
-ProjectionFileView::OnReconstruct (wxCommandEvent& event)
+ProjectionFileView::OnConvertPolar (wxCommandEvent& event)
+{
+ Projections& rProj = GetDocument()->getProjections();
+ DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert Polar", m_iDefaultPolarNX, m_iDefaultPolarNY,
+ m_iDefaultPolarInterpolation, -1);
+ if (dialogPolar.ShowModal() == wxID_OK) {
+ wxString strInterpolation (dialogPolar.getInterpolationName());
+ m_iDefaultPolarNX = dialogPolar.getXSize();
+ m_iDefaultPolarNY = dialogPolar.getYSize();
+ ImageFileDocument* pPolarDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+ ImageFile& rIF = pPolarDoc->getImageFile();
+ if (! pPolarDoc) {
+ sys_error (ERR_SEVERE, "Unable to create image file");
+ return;
+ }
+ rIF.setArraySize (m_iDefaultPolarNX, m_iDefaultPolarNY);
+ m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str());
+ rProj.convertPolar (rIF, m_iDefaultPolarInterpolation);
+ rIF.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="
+ << strInterpolation.c_str();
+ *theApp->getLog() << os.str().c_str() << "\n";
+ rIF.labelAdd (os.str().c_str());
+ if (theApp->getSetModifyNewDocs())
+ pPolarDoc->Modify(true);
+ pPolarDoc->UpdateAllViews();
+ pPolarDoc->GetFirstView()->OnUpdate (this, NULL);
+ }
+}
+
+void
+ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event)
+{
+ Projections& rProj = GetDocument()->getProjections();
+ DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert to FFT Polar", m_iDefaultPolarNX, m_iDefaultPolarNY,
+ m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad);
+ if (dialogPolar.ShowModal() == wxID_OK) {
+ wxString strInterpolation (dialogPolar.getInterpolationName());
+ m_iDefaultPolarNX = dialogPolar.getXSize();
+ m_iDefaultPolarNY = dialogPolar.getYSize();
+ m_iDefaultPolarZeropad = dialogPolar.getZeropad();
+ ImageFileDocument* pPolarDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+ ImageFile& rIF = pPolarDoc->getImageFile();
+ if (! pPolarDoc) {
+ sys_error (ERR_SEVERE, "Unable to create image file");
+ return;
+ }
+ rIF.setArraySize (m_iDefaultPolarNX, m_iDefaultPolarNY);
+ m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str());
+ rProj.convertFFTPolar (rIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad);
+ rIF.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="
+ << strInterpolation.c_str() << ", zeropad=" << m_iDefaultPolarZeropad;
+ *theApp->getLog() << os.str().c_str() << "\n";
+ rIF.labelAdd (os.str().c_str());
+ if (theApp->getSetModifyNewDocs())
+ pPolarDoc->Modify(true);
+ pPolarDoc->UpdateAllViews();
+ pPolarDoc->GetFirstView()->OnUpdate (this, NULL);
+ }}
+
+void
+ProjectionFileView::OnReconstructFourier (wxCommandEvent& event)
+{
+ wxMessageBox ("Fourier Reconstruction is not yet supported", "Unimplemented function");
+}
+
+void
+ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
{
- DialogGetReconstructionParameters dialogReconstruction (m_frame, m_iDefaultNX, m_iDefaultNY, m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, m_iDefaultTrace);
+ 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);
int retVal = dialogReconstruction.ShowModal();
if (retVal == wxID_OK) {
const Projections& rProj = GetDocument()->getProjections();
imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
- if (m_iDefaultFilterMethod != ProcessSignal::FILTER_METHOD_CONVOLUTION && m_iDefaultFilterGeneration == ProcessSignal::FILTER_GENERATION_DIRECT && rProj.geometry() != Scanner::GEOMETRY_PARALLEL) {
- wxMessageBox ("Sorry!\nCurrently, frequency-based filtering with direct filter generation is not support for geometries other than parallel.\nAborting command.", "Not Supported", wxOK | wxICON_WARNING, m_frame);
- return;
- }
-
Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
Timer timerRecon;
if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
- ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, m_frame);
+ ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, getFrameForChild());
for (int iView = 0; iView < rProj.nView(); iView++) {
::wxYield();
::wxYield();
}
delete pDlgReconstruct;
} else {
- wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT);
+ wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
for (int i = 0; i < rProj.nView(); i++) {
pReconstruct->reconstructView (i, 1);
if (! dlgProgress.Update(i + 1)) {
wxFrame*
ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
- wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
-
+#ifdef CTSIM_MDI
+ wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
+#else
+ wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
+#endif
+ theApp->setIconForFrame (subframe);
+
wxMenu *file_menu = new wxMenu;
- file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
- file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...");
- file_menu->Append(wxID_OPEN, "&Open...");
- file_menu->Append(wxID_SAVE, "&Save");
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
+ file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
+ file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
+ file_menu->Append(wxID_SAVE, "&Save\tCtrl-S");
file_menu->Append(wxID_SAVEAS, "Save &As...");
- file_menu->Append(wxID_CLOSE, "&Close");
+ file_menu->Append(wxID_CLOSE, "&Close\tCtrl-W");
file_menu->AppendSeparator();
file_menu->Append(PJMENU_FILE_PROPERTIES, "P&roperties");
file_menu->Append(wxID_PRINT_SETUP, "Print &Setup...");
file_menu->Append(wxID_PREVIEW, "Print Pre&view");
- wxMenu *process_menu = new wxMenu;
- process_menu->Append(PJMENU_PROCESS_RECONSTRUCT, "R&econstruct...");
+ wxMenu *convert_menu = new wxMenu;
+ convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L");
+ convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image...\tCtrl-I");
+ wxMenu *reconstruct_menu = new wxMenu;
+ reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R");
+ reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E");
+
wxMenu *help_menu = new wxMenu;
- help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents");
- help_menu->AppendSeparator();
+ help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
+ help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
- menu_bar->Append(file_menu, "&File");
- menu_bar->Append(process_menu, "&Process");
- menu_bar->Append(help_menu, "&Help");
-
- subframe->SetMenuBar(menu_bar);
+ menu_bar->Append (file_menu, "&File");
+ menu_bar->Append (convert_menu, "&Convert");
+ menu_bar->Append (reconstruct_menu, "&Reconstruct");
+ menu_bar->Append (help_menu, "&Help");
+ subframe->SetMenuBar(menu_bar);
subframe->Centre(wxBOTH);
+
+ wxAcceleratorEntry accelEntries[11];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
+ accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
+ accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
+ accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
+ accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
+ accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('L'), PJMENU_CONVERT_POLAR);
+ accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('I'), PJMENU_CONVERT_FFT_POLAR);
+ accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('R'), PJMENU_RECONSTRUCT_FBP);
+ accelEntries[10].Set (wxACCEL_CTRL, static_cast<int>('E'), PJMENU_RECONSTRUCT_FOURIER);
+ wxAcceleratorTable accelTable (11, accelEntries);
+ subframe->SetAcceleratorTable (accelTable);
return subframe;
}
void
ProjectionFileView::OnDraw (wxDC* dc)
{
+ wxSize clientSize = m_frame->GetClientSize();
+ wxSize bestSize = m_canvas->GetBestSize();
+
+ if (clientSize.x > bestSize.x || clientSize.y > bestSize.y)
+ m_frame->SetClientSize (bestSize);
+
if (m_bitmap.Ok())
dc->DrawBitmap (m_bitmap, 0, 0, false);
}
return false;
m_canvas->Clear();
- m_canvas->m_pView = NULL;
+ // m_canvas->m_pView = NULL;
m_canvas = NULL;
wxString s(wxTheApp->GetAppName());
if (m_frame)
EVT_MENU(PJMENU_FILE_PROPERTIES, PlotFileView::OnProperties)
EVT_MENU(PLOTMENU_VIEW_SCALE_MINMAX, PlotFileView::OnScaleMinMax)
EVT_MENU(PLOTMENU_VIEW_SCALE_AUTO, PlotFileView::OnScaleAuto)
+EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull)
END_EVENT_TABLE()
PlotFileView::PlotFileView(void)
: wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL)
{
+ m_bMinSpecified = false;
+ m_bMaxSpecified = false;
}
PlotFileView::~PlotFileView(void)
const PlotFile& rPlot = GetDocument()->getPlotFile();
std::ostringstream os;
os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n";
- rPlot.printHeaders (os);
+ rPlot.printHeadersBrief (os);
*theApp->getLog() << os.str().c_str();
- wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION);
+ wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION);
dialogMsg.ShowModal();
}
const PlotFile& rPlotFile = GetDocument()->getPlotFile();
double min, max, mean, mode, median, stddev;
rPlotFile.statistics (1, min, max, mean, mode, median, stddev);
- DialogAutoScaleParameters dialogAutoScale (m_frame, mean, mode, median, stddev, m_dAutoScaleFactor);
+ DialogAutoScaleParameters dialogAutoScale (getFrameForChild(), mean, mode, median, stddev, m_dAutoScaleFactor);
int iRetVal = dialogAutoScale.ShowModal();
if (iRetVal == wxID_OK) {
m_bMinSpecified = true;
if (m_bMaxSpecified)
max = m_dMaxPixel;
- DialogGetMinMax dialogMinMax (m_frame, "Set Y-axis Minimum & Maximum", min, max);
+ DialogGetMinMax dialogMinMax (getFrameForChild(), "Set Y-axis Minimum & Maximum", min, max);
int retVal = dialogMinMax.ShowModal();
if (retVal == wxID_OK) {
m_bMinSpecified = true;
}
}
+void
+PlotFileView::OnScaleFull (wxCommandEvent& event)
+{
+ if (m_bMinSpecified || m_bMaxSpecified) {
+ m_bMinSpecified = false;
+ m_bMaxSpecified = false;
+ OnUpdate (this, NULL);
+ }
+}
+
PlotFileCanvas*
PlotFileView::CreateCanvas (wxView *view, wxFrame *parent)
wxFrame*
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);
+#else
wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(10, 10), wxSize(500, 300), wxDEFAULT_FRAME_STYLE);
-
+#endif
+ theApp->setIconForFrame (subframe);
+
wxMenu *file_menu = new wxMenu;
- file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
- file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...");
- file_menu->Append(wxID_OPEN, "&Open...");
- file_menu->Append(wxID_SAVE, "&Save");
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
+ file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
+ file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O");
+ file_menu->Append(wxID_SAVE, "&Save\tCtrl-S");
file_menu->Append(wxID_SAVEAS, "Save &As...");
- file_menu->Append(wxID_CLOSE, "&Close");
+ file_menu->Append(wxID_CLOSE, "&Close\tCtrl-W");
file_menu->AppendSeparator();
file_menu->Append(PJMENU_FILE_PROPERTIES, "P&roperties");
file_menu->Append(wxID_PREVIEW, "Print Pre&view");
wxMenu *view_menu = new wxMenu;
- view_menu->Append(PLOTMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...");
- view_menu->Append(PLOTMENU_VIEW_SCALE_AUTO, "Display Scale &Auto...");
+ 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");
wxMenu *help_menu = new wxMenu;
- help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents");
- help_menu->AppendSeparator();
+ help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
+ help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(help_menu, "&Help");
subframe->SetMenuBar(menu_bar);
-
subframe->Centre(wxBOTH);
+
+ wxAcceleratorEntry accelEntries[10];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
+ accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
+ accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
+ accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
+ accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
+ accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('E'), PLOTMENU_VIEW_SCALE_MINMAX);
+ accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('A'), PLOTMENU_VIEW_SCALE_AUTO);
+ accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('U'), PLOTMENU_VIEW_SCALE_FULL);
+ wxAcceleratorTable accelTable (10, accelEntries);
+ subframe->SetAcceleratorTable (accelTable);
return subframe;
}
return false;
m_canvas->Clear();
- m_canvas->m_pView = NULL;
+ // m_canvas->m_pView = NULL;
m_canvas = NULL;
wxString s(wxTheApp->GetAppName());
if (m_frame)
projects / ctsim.git / blobdiff