X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=2e0f78ab58480ada03cb6be7484eeff75a3d4c7c;hp=c649a6822a5895bb7f06e0db9953619a12e972f7;hb=cbcb02ba9b76a82c9a09ce1c7712431bb215575a;hpb=efc79bd4b7deba9df501fccd39bc342f1329e6e6 diff --git a/src/views.cpp b/src/views.cpp index c649a68..2e0f78a 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -7,9 +7,9 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.cpp,v 1.61 2001/01/13 02:55:14 kevin Exp $ +** $Id: views.cpp,v 1.90 2001/01/30 02:20:50 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 @@ -65,15 +65,18 @@ BEGIN_EVENT_TABLE(ImageFileCanvas, wxScrolledWindow) EVT_MOUSE_EVENTS(ImageFileCanvas::OnMouseEvent) +EVT_CHAR(ImageFileCanvas::OnChar) END_EVENT_TABLE() ImageFileCanvas::ImageFileCanvas (ImageFileView* 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_xCursor(-1), m_yCursor(-1) { - m_pView = v; - m_xCursor = -1; - m_yCursor = -1; +} + +ImageFileCanvas::~ImageFileCanvas() +{ + m_pView = NULL; } void @@ -121,7 +124,10 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) 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(); @@ -151,6 +157,15 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) DrawRubberBandCursor (dc, pt.x, yPt); m_xCursor = pt.x; m_yCursor = yPt; + wxMenu* pMenu = m_pView->getMenuAnalyze(); + if (pMenu && ! pMenu->IsEnabled(IFMENU_PLOT_ROW)) { + pMenu->Enable (IFMENU_PLOT_ROW, true); + pMenu->Enable (IFMENU_PLOT_COL, true); + pMenu->Enable (IFMENU_COMPARE_ROW, true); + pMenu->Enable (IFMENU_COMPARE_COL, true); + pMenu->Enable (IFMENU_PLOT_FFT_ROW, true); + pMenu->Enable (IFMENU_PLOT_FFT_COL, true); + } } else *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n"; } @@ -161,6 +176,29 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) } } +void +ImageFileCanvas::OnChar (wxKeyEvent& event) +{ + if (event.GetKeyCode() == WXK_ESCAPE) { + m_xCursor = -1; + m_yCursor = -1; + if (m_pView) + m_pView->OnUpdate (NULL); + } else + wxScrolledWindow::OnChar (event); +} + +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) @@ -207,14 +245,16 @@ EVT_MENU(IFMENU_PLOT_FFT_COL, ImageFileView::OnPlotFFTCol) EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram) END_EVENT_TABLE() -ImageFileView::ImageFileView(void) -: wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false) +ImageFileView::ImageFileView() +: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) { m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; } -ImageFileView::~ImageFileView(void) +ImageFileView::~ImageFileView() { + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } void @@ -245,7 +285,7 @@ ImageFileView::OnProperties (wxCommandEvent& event) 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(); } } @@ -256,7 +296,7 @@ ImageFileView::OnScaleAuto (wxCommandEvent& event) 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; @@ -284,7 +324,7 @@ ImageFileView::OnScaleMinMax (wxCommandEvent& event) 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; @@ -314,7 +354,7 @@ 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(); @@ -332,7 +372,7 @@ ImageFileView::OnCompare (wxCommandEvent& event) os << "Comparative Statistics: d=" << d << ", r=" << r << ", e=" << e << "\n"; *theApp->getLog() << os.str().c_str(); if (dialogGetCompare.getMakeDifferenceImage()) { - ImageFileDocument* pDifferenceDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pDifferenceDoc = theApp->newImageDoc(); if (! pDifferenceDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -341,7 +381,13 @@ ImageFileView::OnCompare (wxCommandEvent& event) differenceImage.setArraySize (rIF.nx(), rIF.ny()); if (! rIF.subtractImages (rCompareIF, differenceImage)) { - pDifferenceDoc->DeleteAllViews(); + pDifferenceDoc->getView()->getFrame()->Show(true); + GetDocumentManager()->ActivateView (pDifferenceDoc->getView(), true, false); + pDifferenceDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } @@ -354,10 +400,10 @@ ImageFileView::OnCompare (wxCommandEvent& event) << " and " << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": " << os.str().c_str(); differenceImage.labelAdd (os.str().c_str()); - if (theApp->getSetModifyNewDocs()) - pDifferenceDoc->Modify(true); - pDifferenceDoc->UpdateAllViews(this); - pDifferenceDoc->GetFirstView()->OnUpdate (this, NULL); + pDifferenceDoc->Modify (true); + pDifferenceDoc->UpdateAllViews (this); + pDifferenceDoc->getView()->OnUpdate (this, NULL); + pDifferenceDoc->getView()->getFrame()->Show(true); } wxMessageBox(os.str().c_str(), "Image Comparison"); } @@ -370,9 +416,8 @@ ImageFileView::OnInvertValues (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.invertPixelValues (rIF); rIF.labelAdd ("Invert Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -381,9 +426,8 @@ ImageFileView::OnSquare (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.square (rIF); rIF.labelAdd ("Square Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -392,9 +436,8 @@ ImageFileView::OnSquareRoot (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.sqrt (rIF); rIF.labelAdd ("Square-root Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -403,9 +446,8 @@ ImageFileView::OnLog (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.log (rIF); rIF.labelAdd ("Logrithm base-e Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -414,9 +456,8 @@ ImageFileView::OnExp (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.exp (rIF); rIF.labelAdd ("Exponent base-e Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -428,17 +469,17 @@ ImageFileView::OnAdd (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 Image to Add", vecIF, false); + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Add", vecIF, false); if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rRHSIF = pRHSDoc->getImageFile(); - ImageFileDocument* pNewDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (! pNewDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } + ImageFileDocument* pNewDoc = theApp->newImageDoc(); + if (! pNewDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.addImages (rRHSIF, newImage); @@ -451,10 +492,10 @@ ImageFileView::OnAdd (wxCommandEvent& event) newImage.labelsCopy (rRHSIF, s.c_str()); newImage.labelAdd (os.str().c_str()); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); - pNewDoc->GetFirstView()->OnUpdate (this, NULL); + pNewDoc->Modify (true); + pNewDoc->UpdateAllViews (this); + pNewDoc->getView()->OnUpdate (this, NULL); + pNewDoc->getView()->getFrame()->Show(true); } } } @@ -468,17 +509,17 @@ ImageFileView::OnSubtract (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 Image to Subtract", vecIF, false); + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Subtract", vecIF, false); if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rRHSIF = pRHSDoc->getImageFile(); - ImageFileDocument* pNewDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (! pNewDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } + ImageFileDocument* pNewDoc = theApp->newImageDoc(); + if (! pNewDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.subtractImages (rRHSIF, newImage); @@ -491,10 +532,10 @@ ImageFileView::OnSubtract (wxCommandEvent& event) newImage.labelsCopy (rRHSIF, s.c_str()); newImage.labelAdd (os.str().c_str()); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); - pNewDoc->GetFirstView()->OnUpdate (this, NULL); + pNewDoc->Modify (true); + pNewDoc->UpdateAllViews (this); + pNewDoc->getView()->OnUpdate (this, NULL); + pNewDoc->getView()->getFrame()->Show(true); } } } @@ -508,17 +549,17 @@ ImageFileView::OnMultiply (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 Image to Multiply", vecIF, false); + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Multiply", vecIF, false); if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rRHSIF = pRHSDoc->getImageFile(); - ImageFileDocument* pNewDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (! pNewDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } + ImageFileDocument* pNewDoc = theApp->newImageDoc(); + if (! pNewDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.multiplyImages (rRHSIF, newImage); @@ -531,10 +572,10 @@ ImageFileView::OnMultiply (wxCommandEvent& event) newImage.labelsCopy (rRHSIF, s.c_str()); newImage.labelAdd (os.str().c_str()); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); - pNewDoc->GetFirstView()->OnUpdate (this, NULL); + pNewDoc->Modify (true); + pNewDoc->UpdateAllViews (this); + pNewDoc->getView()->OnUpdate (this, NULL); + pNewDoc->getView()->getFrame()->Show(true); } } } @@ -548,17 +589,17 @@ ImageFileView::OnDivide (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 Image to Divide", vecIF, false); + DialogGetComparisonImage dialogGetCompare (getFrameForChild(), "Get Image to Divide", vecIF, false); if (dialogGetCompare.ShowModal() == wxID_OK) { ImageFile& rIF = GetDocument()->getImageFile(); ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rRHSIF = pRHSDoc->getImageFile(); - ImageFileDocument* pNewDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (! pNewDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } + ImageFileDocument* pNewDoc = theApp->newImageDoc(); + if (! pNewDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.divideImages (rRHSIF, newImage); @@ -571,10 +612,10 @@ ImageFileView::OnDivide (wxCommandEvent& event) newImage.labelsCopy (rRHSIF, s.c_str()); newImage.labelAdd (os.str().c_str()); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); - pNewDoc->GetFirstView()->OnUpdate (this, NULL); + pNewDoc->Modify (true); + pNewDoc->UpdateAllViews (this); + pNewDoc->getView()->OnUpdate (this, NULL); + pNewDoc->getView()->getFrame()->Show(true); } } } @@ -589,9 +630,8 @@ ImageFileView::OnFFT (wxCommandEvent& event) rIF.labelAdd ("FFT Image"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -602,9 +642,8 @@ ImageFileView::OnIFFT (wxCommandEvent& event) rIF.labelAdd ("IFFT Image"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -615,9 +654,8 @@ ImageFileView::OnFFTRows (wxCommandEvent& event) rIF.labelAdd ("FFT Rows"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -628,9 +666,8 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event) rIF.labelAdd ("IFFT Rows"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -641,9 +678,8 @@ ImageFileView::OnFFTCols (wxCommandEvent& event) rIF.labelAdd ("FFT Columns"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -654,9 +690,8 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event) rIF.labelAdd ("IFFT Columns"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } #endif @@ -664,28 +699,26 @@ 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; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + 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; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -696,9 +729,8 @@ ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event) rIF.labelAdd ("Shuffle Natural To Fourier Order"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -709,9 +741,8 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event) rIF.labelAdd ("Shuffle Fourier To Natural Order"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } void @@ -721,11 +752,10 @@ ImageFileView::OnMagnitude (wxCommandEvent& event) if (rIF.isComplex()) { rIF.magnitude (rIF); rIF.labelAdd ("Magnitude of complex-image"); - m_bMinSpecified = false; - m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + m_bMinSpecified = false; + m_bMaxSpecified = false; + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } } @@ -736,23 +766,22 @@ ImageFileView::OnPhase (wxCommandEvent& event) if (rIF.isComplex()) { rIF.phase (rIF); rIF.labelAdd ("Phase of complex-image"); - m_bMinSpecified = false; - m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + m_bMinSpecified = false; + m_bMaxSpecified = false; + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } } ImageFileCanvas* -ImageFileView::CreateCanvas (wxView *view, wxFrame *parent) +ImageFileView::CreateCanvas (wxFrame* parent) { ImageFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new ImageFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new ImageFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); @@ -761,37 +790,48 @@ ImageFileView::CreateCanvas (wxView *view, wxFrame *parent) return pCanvas; } -wxFrame* +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxMDIChildFrame *subframe = new wxMDIChildFrame(theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + 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); + 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; + wxMenu *m_pFileMenu = 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(wxID_SAVEAS, "Save &As..."); - file_menu->Append(wxID_CLOSE, "&Close"); + 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"); - file_menu->AppendSeparator(); - file_menu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); - file_menu->Append(IFMENU_FILE_EXPORT, "&Export..."); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(IFMENU_FILE_EXPORT, "&Export..."); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT, "&Print..."); - file_menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - file_menu->Append(wxID_PREVIEW, "Print Pre&view"); + 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"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); 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_FULL, "Display &Full Scale"); + 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"); @@ -825,35 +865,57 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) image_menu->Append (IFMENU_IMAGE_DIVIDE, "&Divide..."); image_menu->AppendSeparator(); image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size..."); - - wxMenu *analyze_menu = new wxMenu; - analyze_menu->Append (IFMENU_PLOT_ROW, "Plot &Row"); - 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"); + + 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->AppendSeparator(); + m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_ROW, "Plot FFT Row"); + m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_COL, "Plot FFT Column"); + m_pMenuAnalyze->AppendSeparator(); + m_pMenuAnalyze->Append (IFMENU_COMPARE_IMAGES, "Compare &Images..."); + m_pMenuAnalyze->Append (IFMENU_COMPARE_ROW, "Compare &Row"); + m_pMenuAnalyze->Append (IFMENU_COMPARE_COL, "Compare &Column"); + 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_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(m_pFileMenu, "&File"); menu_bar->Append(view_menu, "&View"); menu_bar->Append(image_menu, "&Image"); menu_bar->Append(filter_menu, "Fi<er"); - menu_bar->Append(analyze_menu, "&Analyze"); + menu_bar->Append(m_pMenuAnalyze, "&Analyze"); menu_bar->Append(help_menu, "&Help"); subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); + wxAcceleratorEntry accelEntries[10]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); + accelEntries[4].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); + accelEntries[5].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); + accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); + accelEntries[7].Set (wxACCEL_CTRL, static_cast('A'), IFMENU_VIEW_SCALE_AUTO); + accelEntries[8].Set (wxACCEL_CTRL, static_cast('U'), IFMENU_VIEW_SCALE_FULL); + accelEntries[9].Set (wxACCEL_CTRL, static_cast('E'), IFMENU_VIEW_SCALE_MINMAX); + wxAcceleratorTable accelTable (10, accelEntries); + subframe->SetAcceleratorTable (accelTable); + return subframe; } @@ -861,23 +923,23 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { - m_frame = CreateChildFrame(doc, this); - SetFrame (m_frame); + m_pFrame = CreateChildFrame(doc, this); + (m_pFrame); m_bMinSpecified = false; m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; int width, height; - m_frame->GetClientSize (&width, &height); - m_frame->SetTitle("ImageFileView"); - m_canvas = CreateCanvas (this, m_frame); + m_pFrame->GetClientSize (&width, &height); + m_pFrame->SetTitle("ImageFileView"); + m_pCanvas = CreateCanvas (m_pFrame); int x, y; // X requires a forced resize - m_frame->GetSize(&x, &y); - m_frame->SetSize(-1, -1, x, y); - m_frame->SetFocus(); - m_frame->Show(true); + m_pFrame->GetSize(&x, &y); + m_pFrame->SetSize(-1, -1, x, y); + m_pFrame->SetFocus(); + m_pFrame->Show(true); Activate(true); return true; @@ -886,19 +948,24 @@ ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) 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); int xCursor, yCursor; - if (m_canvas->GetCurrentCursor (xCursor, yCursor)) - m_canvas->DrawRubberBandCursor (*dc, xCursor, yCursor); + if (m_pCanvas->GetCurrentCursor (xCursor, yCursor)) + m_pCanvas->DrawRubberBandCursor (*dc, xCursor, yCursor); } void ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -928,44 +995,48 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) delete imageData; int xSize = nx; int ySize = ny; - xSize = clamp (xSize, 0, 800); ySize = clamp (ySize, 0, 800); - m_frame->SetClientSize (xSize, ySize); - m_canvas->SetScrollbars(20, 20, nx/20, ny/20); - m_canvas->SetBackgroundColour(*wxWHITE); + m_pFrame->SetClientSize (xSize, ySize); + m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20); + m_pCanvas->SetBackgroundColour(*wxWHITE); } - if (m_canvas) - m_canvas->Refresh(); + if (m_pCanvas) + m_pCanvas->Refresh(); } bool ImageFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + //GetDocumentManager()->ActivateView (this, false, true); + if (! GetDocument() || ! GetDocument()->Close()) return false; - // m_canvas->Clear(); - m_canvas->m_pView = NULL; - m_canvas = NULL; + if (m_pCanvas) { + m_pCanvas->setView(NULL); + m_pCanvas = NULL; + } wxString s(theApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); - SetFrame(NULL); + if (m_pFrame) + m_pFrame->SetTitle(s); + SetFrame(NULL); Activate(false); if (deleteWindow) { - delete m_frame; - return true; + m_pFrame->Destroy(); + m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } + return true; } void ImageFileView::OnExport (wxCommandEvent& event) { - ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -978,12 +1049,12 @@ ImageFileView::OnExport (wxCommandEvent& event) if (! m_bMaxSpecified) 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()); - + wxString strExt; wxString strWildcard; if (m_iDefaultExportFormatID == ImageFile::FORMAT_PGM || m_iDefaultExportFormatID == ImageFile::FORMAT_PGMASCII) { @@ -996,7 +1067,7 @@ ImageFileView::OnExport (wxCommandEvent& event) strWildcard = "PNG Files (*.png)|*.png"; } #endif - + const wxString& strFilename = wxFileSelector (wxString("Export Filename"), wxString(""), wxString(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE); if (strFilename) { @@ -1013,14 +1084,14 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); 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(); std::ostringstream os; os << "Scale Size from (" << iOldNX << "," << iOldNY << ") to (" << iNewNX << "," << iNewNY << ")"; - ImageFileDocument* pScaledDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pScaledDoc = theApp->newImageDoc(); if (! pScaledDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -1031,10 +1102,10 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) rScaledIF.labelAdd (os.str().c_str()); rIF.scaleImage (rScaledIF); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pScaledDoc->Modify(TRUE); + pScaledDoc->Modify (true); pScaledDoc->UpdateAllViews (this); - pScaledDoc->GetFirstView()->OnUpdate (this, NULL); + pScaledDoc->getView()->OnUpdate (this, NULL); + pScaledDoc->getView()->getFrame()->Show(true); } } @@ -1042,12 +1113,12 @@ void ImageFileView::OnPlotRow (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error"); return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1070,7 +1141,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) pYMag[i] = ::sqrt (v[i][yCursor] * v[i][yCursor] + vImag[i][yCursor] * vImag[i][yCursor]); } } - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1116,9 +1187,10 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) delete pYImag; delete pYMag; } - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->Modify (true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } @@ -1126,12 +1198,12 @@ void ImageFileView::OnPlotCol (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1154,7 +1226,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) pYMag[i] = ::sqrt (v[xCursor][i] * v[xCursor][i] + vImag[xCursor][i] * vImag[xCursor][i]); } } - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1200,9 +1272,10 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) delete pYImag; delete pYMag; } - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->Modify (true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } @@ -1211,12 +1284,12 @@ void ImageFileView::OnPlotFFTRow (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error"); return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1224,7 +1297,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) 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]; @@ -1233,11 +1306,11 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) 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]; @@ -1251,8 +1324,8 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) Fourier::shuffleFourierToNaturalOrder (pYReal, nx); Fourier::shuffleFourierToNaturalOrder (pYImag, nx); Fourier::shuffleFourierToNaturalOrder (pYMag, nx); - - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1267,14 +1340,14 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) 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 ("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); @@ -1292,10 +1365,11 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) delete pYImag; delete pYMag; delete [] pcIn; - - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + + pPlotDoc->Modify (true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } @@ -1303,12 +1377,12 @@ void ImageFileView::OnPlotFFTCol (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1317,28 +1391,28 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) 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; + 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]; @@ -1349,8 +1423,8 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) pYImag[i] = pcIn[i].im; pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im); } - - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1365,14 +1439,14 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) 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 ("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); @@ -1391,10 +1465,11 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) delete pYMag; delete pdTemp; delete [] pcIn; - - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + + pPlotDoc->Modify (true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } #endif @@ -1403,7 +1478,7 @@ void ImageFileView::OnCompareCol (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); return; } @@ -1414,7 +1489,7 @@ 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(); @@ -1435,7 +1510,7 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) pY1[i] = v1[xCursor][i]; pY2[i] = v2[xCursor][i]; } - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1459,7 +1534,7 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) rPlotFile.addColumn (0, pX); rPlotFile.addColumn (1, pY1); rPlotFile.addColumn (2, pY2); - + unsigned int iL; for (iL = 0; iL < rIF.nLabels(); iL++) { std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); @@ -1481,9 +1556,10 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) delete pX; delete pY1; delete pY2; - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->Modify (true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } } @@ -1492,7 +1568,7 @@ void ImageFileView::OnCompareRow (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); return; } @@ -1505,7 +1581,7 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) 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(); @@ -1526,7 +1602,7 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) pY1[i] = v1[i][yCursor]; pY2[i] = v2[i][yCursor]; } - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1571,9 +1647,10 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) delete pX; delete pY1; delete pY2; - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->Modify (true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } } @@ -1583,24 +1660,24 @@ static int NUMBER_HISTOGRAM_BINS = 256; void ImageFileView::OnPlotHistogram (wxCommandEvent& event) { - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + 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 = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + 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; @@ -1611,46 +1688,52 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) if (iBin >= 0 && iBin < NUMBER_HISTOGRAM_BINS) pY[iBin] += 1; } - - PlotFile& rPlotFile = pPlotDoc->getPlotFile(); - std::ostringstream os; - os << "Histogram"; - std::string title("title "); - title += os.str(); - rPlotFile.addEzsetCommand (title.c_str()); - rPlotFile.addEzsetCommand ("xlabel Pixel Value"); - rPlotFile.addEzsetCommand ("ylabel Count"); - rPlotFile.addEzsetCommand ("box"); - rPlotFile.addEzsetCommand ("grid"); - rPlotFile.setCurveSize (2, NUMBER_HISTOGRAM_BINS); - rPlotFile.addColumn (0, pX); - rPlotFile.addColumn (1, pY); - 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()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + + PlotFile& rPlotFile = pPlotDoc->getPlotFile(); + std::ostringstream os; + os << "Histogram"; + std::string title("title "); + title += os.str(); + rPlotFile.addEzsetCommand (title.c_str()); + rPlotFile.addEzsetCommand ("xlabel Pixel Value"); + rPlotFile.addEzsetCommand ("ylabel Count"); + rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("grid"); + rPlotFile.setCurveSize (2, NUMBER_HISTOGRAM_BINS); + rPlotFile.addColumn (0, pX); + rPlotFile.addColumn (1, pY); + 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; + pPlotDoc->Modify (true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } // PhantomCanvas -PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style) +PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style) : wxScrolledWindow(frame, -1, pos, size, style) { m_pView = v; } +PhantomCanvas::~PhantomCanvas () +{ + m_pView = NULL; +} + void PhantomCanvas::OnDraw (wxDC& dc) { @@ -1659,39 +1742,52 @@ PhantomCanvas::OnDraw (wxDC& dc) } -// PhantomView +// PhantomFileView -IMPLEMENT_DYNAMIC_CLASS(PhantomView, wxView) +IMPLEMENT_DYNAMIC_CLASS(PhantomFileView, wxView) -BEGIN_EVENT_TABLE(PhantomView, wxView) -EVT_MENU(PHMMENU_FILE_PROPERTIES, PhantomView::OnProperties) -EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomView::OnRasterize) -EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomView::OnProjections) +BEGIN_EVENT_TABLE(PhantomFileView, wxView) +EVT_MENU(PHMMENU_FILE_PROPERTIES, PhantomFileView::OnProperties) +EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomFileView::OnRasterize) +EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections) END_EVENT_TABLE() -PhantomView::PhantomView(void) -: wxView(), m_canvas(NULL), m_frame(NULL) +PhantomFileView::PhantomFileView() +: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0) { +#if defined(DEBUG) || defined(_DEBUG) + m_iDefaultNDet = 165; + m_iDefaultNView = 180; +#else m_iDefaultNDet = 367; m_iDefaultNView = 320; - m_iDefaultNSample = 2; +#endif + m_iDefaultNSample = 1; m_dDefaultRotation = 1; m_dDefaultFocalLength = 2; m_dDefaultFieldOfView = 1; m_iDefaultGeometry = Scanner::GEOMETRY_PARALLEL; m_iDefaultTrace = Trace::TRACE_NONE; - + +#ifdef DEBUG + m_iDefaultRasterNX = 115; + m_iDefaultRasterNY = 115; + m_iDefaultRasterNSamples = 1; +#else m_iDefaultRasterNX = 256; m_iDefaultRasterNY = 256; m_iDefaultRasterNSamples = 2; +#endif } -PhantomView::~PhantomView(void) +PhantomFileView::~PhantomFileView() { + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } void -PhantomView::OnProperties (wxCommandEvent& event) +PhantomFileView::OnProperties (wxCommandEvent& event) { const int idPhantom = GetDocument()->getPhantomID(); const wxString& namePhantom = GetDocument()->getPhantomName(); @@ -1708,9 +1804,9 @@ PhantomView::OnProperties (wxCommandEvent& event) void -PhantomView::OnProjections (wxCommandEvent& event) +PhantomFileView::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(); @@ -1725,7 +1821,7 @@ PhantomView::OnProjections (wxCommandEvent& event) if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") { const Phantom& rPhantom = GetDocument()->getPhantom(); - ProjectionFileDocument* pProjectionDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT)); + ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc(); if (! pProjectionDoc) { sys_error (ERR_SEVERE, "Unable to create projection document"); return; @@ -1741,27 +1837,37 @@ PhantomView::OnProjections (wxCommandEvent& event) Timer timer; if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { - ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast(m_frame)); + ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast(getFrameForChild())); for (int iView = 0; iView < rProj.nView(); iView++) { - ::wxYield(); ::wxYield(); if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { - pProjectionDoc->DeleteAllViews(); + pProjectionDoc->getView()->getFrame()->Show(true); + GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false); + pProjectionDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } ::wxYield(); - ::wxYield(); while (dialogProjections.isPaused()) { ::wxYield(); ::wxUsleep(50); } } } 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)) { - pProjectionDoc->DeleteAllViews(); + pProjectionDoc->getView()->getFrame()->Show(true); + GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false); + pProjectionDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } } @@ -1773,33 +1879,31 @@ PhantomView::OnProjections (wxCommandEvent& event) rProj.setRemark (os.str()); *theApp->getLog() << os.str().c_str() << "\n"; - m_frame->Lower(); ::wxYield(); - ProjectionFileView* projView = dynamic_cast(pProjectionDoc->GetFirstView()); + ProjectionFileView* projView = pProjectionDoc->getView(); if (projView) { - projView->getFrame()->SetFocus(); projView->OnUpdate (projView, NULL); - } - if (wxView* pView = pProjectionDoc->GetFirstView()) { - if (wxFrame* pFrame = pView->GetFrame()) { + if (projView->getCanvas()) + projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView); + if (wxFrame* pFrame = projView->getFrame()) { + pFrame->Show(true); pFrame->SetFocus(); pFrame->Raise(); } - theApp->getDocManager()->ActivateView (pView, true, false); + GetDocumentManager()->ActivateView (projView, true, false); } ::wxYield(); - if (theApp->getSetModifyNewDocs()) - pProjectionDoc->Modify(true); - pProjectionDoc->UpdateAllViews(this); + pProjectionDoc-> Modify(true); + pProjectionDoc->UpdateAllViews (this); } } } void -PhantomView::OnRasterize (wxCommandEvent& event) +PhantomFileView::OnRasterize (wxCommandEvent& event) { - DialogGetRasterParameters dialogRaster (m_frame, m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples); + DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples); int retVal = dialogRaster.ShowModal(); if (retVal == wxID_OK) { m_iDefaultRasterNX = dialogRaster.getXSize(); @@ -1809,32 +1913,37 @@ PhantomView::OnRasterize (wxCommandEvent& event) m_iDefaultRasterNSamples = 1; if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) { const Phantom& rPhantom = GetDocument()->getPhantom(); - ImageFileDocument* pRasterDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pRasterDoc = theApp->newImageDoc(); if (! pRasterDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; } ImageFile& imageFile = pRasterDoc->getImageFile(); - imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNX); - wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT); + imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY); + 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, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true); - if (! dlgProgress.Update(i+1)) { - pRasterDoc->DeleteAllViews(); + if (! dlgProgress.Update (i+1)) { + GetDocumentManager()->ActivateView (pRasterDoc->getView(), true, true); + pRasterDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } } - if (theApp->getSetModifyNewDocs()) - pRasterDoc->Modify(true); - pRasterDoc->UpdateAllViews(this); + pRasterDoc->Modify (true); + pRasterDoc->UpdateAllViews (this); + pRasterDoc->getView()->getFrame()->Show(true); std::ostringstream os; 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(pRasterDoc->GetFirstView()); + ImageFileView* rasterView = pRasterDoc->getView(); if (rasterView) { rasterView->getFrame()->SetFocus(); rasterView->OnUpdate (rasterView, NULL); @@ -1846,13 +1955,13 @@ PhantomView::OnRasterize (wxCommandEvent& event) PhantomCanvas* -PhantomView::CreateCanvas (wxView *view, wxFrame *parent) +PhantomFileView::CreateCanvas (wxFrame *parent) { PhantomCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new PhantomCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new PhantomCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -1860,113 +1969,139 @@ PhantomView::CreateCanvas (wxView *view, wxFrame *parent) return pCanvas; } -wxFrame* -PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif +PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxMDIChildFrame *subframe = new wxMDIChildFrame(theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE); + 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); + wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE); #endif - - wxMenu *file_menu = new wxMenu; + theApp->setIconForFrame (subframe); - 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_SAVEAS, "Save &As..."); - file_menu->Append(wxID_CLOSE, "&Close"); + wxMenu *m_pFileMenu = new wxMenu; - file_menu->AppendSeparator(); - file_menu->Append(PHMMENU_FILE_PROPERTIES, "P&roperties"); + 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"); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT, "&Print..."); - file_menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - file_menu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(PHMMENU_FILE_PROPERTIES, "P&roperties"); + + 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"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); 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(file_menu, "&File"); + menu_bar->Append(m_pFileMenu, "&File"); menu_bar->Append(process_menu, "&Process"); menu_bar->Append(help_menu, "&Help"); subframe->SetMenuBar(menu_bar); - subframe->Centre(wxBOTH); + wxAcceleratorEntry accelEntries[8]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); + accelEntries[4].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); + accelEntries[5].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); + accelEntries[6].Set (wxACCEL_CTRL, static_cast('J'), PHMMENU_PROCESS_PROJECTIONS); + accelEntries[7].Set (wxACCEL_CTRL, static_cast('R'), PHMMENU_PROCESS_RASTERIZE); + wxAcceleratorTable accelTable (8, accelEntries); + subframe->SetAcceleratorTable (accelTable); + return subframe; } bool -PhantomView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) +PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { - m_frame = CreateChildFrame(doc, this); - SetFrame(m_frame); + m_pFrame = CreateChildFrame(doc, this); + SetFrame(m_pFrame); int width, height; - m_frame->GetClientSize(&width, &height); - m_frame->SetTitle("PhantomView"); - m_canvas = CreateCanvas(this, m_frame); + m_pFrame->GetClientSize(&width, &height); + m_pFrame->SetTitle("PhantomFileView"); + m_pCanvas = CreateCanvas (m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize - m_frame->GetSize(&x, &y); - m_frame->SetSize(-1, -1, x, y); + m_pFrame->GetSize(&x, &y); + m_pFrame->SetSize(-1, -1, x, y); #endif - m_frame->Show(true); + m_pFrame->Show(true); Activate(true); return true; } - void -PhantomView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { - if (m_canvas) - m_canvas->Refresh(); + if (m_pCanvas) + m_pCanvas->Refresh(); } bool -PhantomView::OnClose (bool deleteWindow) +PhantomFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + //GetDocumentManager()->ActivateView (this, false, true); + if (! GetDocument() || ! GetDocument()->Close()) return false; -// m_canvas->Clear(); - m_canvas->m_pView = NULL; - m_canvas = NULL; -// wxString s(wxTheApp->GetAppName()); -// if (m_frame) -// m_frame->SetTitle(s); - SetFrame(NULL); + if (m_pCanvas) { + m_pCanvas->setView(NULL); + m_pCanvas = NULL; + } + wxString s(wxTheApp->GetAppName()); + if (m_pFrame) + m_pFrame->SetTitle(s); + SetFrame(NULL); Activate(false); if (deleteWindow) { - - delete m_frame; - return true; + m_pFrame->Destroy(); + m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } + return true; } void -PhantomView::OnDraw (wxDC* dc) +PhantomFileView::OnDraw (wxDC* dc) { int xsize, ysize; - m_canvas->GetClientSize (&xsize, &ysize); + m_pCanvas->GetClientSize (&xsize, &ysize); SGPDriver driver (dc, xsize, ysize); SGP sgp (driver); const Phantom& rPhantom = GetDocument()->getPhantom(); @@ -1982,6 +2117,11 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram m_pView = v; } +ProjectionFileCanvas::~ProjectionFileCanvas () +{ + m_pView = NULL; +} + void ProjectionFileCanvas::OnDraw(wxDC& dc) { @@ -1989,6 +2129,19 @@ ProjectionFileCanvas::OnDraw(wxDC& dc) 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) @@ -2000,11 +2153,17 @@ EVT_MENU(PJMENU_CONVERT_POLAR, ProjectionFileView::OnConvertPolar) EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar) END_EVENT_TABLE() -ProjectionFileView::ProjectionFileView(void) -: wxView(), m_canvas(NULL), m_frame(NULL) +ProjectionFileView::ProjectionFileView() +: wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_pFileMenu(0) { +#ifdef DEBUG + m_iDefaultNX = 115; + m_iDefaultNY = 115; +#else m_iDefaultNX = 256; m_iDefaultNY = 256; +#endif + m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT; m_dDefaultFilterParam = 1.; #if HAVE_FFTW @@ -2019,15 +2178,17 @@ 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) +ProjectionFileView::~ProjectionFileView() { + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE);; } void @@ -2037,7 +2198,7 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) 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(); } @@ -2046,13 +2207,13 @@ void ProjectionFileView::OnConvertPolar (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); - DialogGetConvertPolarParameters dialogPolar (m_frame, "Convert Polar", m_iDefaultPolarNX, m_iDefaultPolarNY, + 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(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pPolarDoc = theApp->newImageDoc(); ImageFile& rIF = pPolarDoc->getImageFile(); if (! pPolarDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -2068,10 +2229,10 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event) << 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); + pPolarDoc->Modify (true); + pPolarDoc->UpdateAllViews (); + pPolarDoc->getView()->OnUpdate (this, NULL); + pPolarDoc->getView()->getFrame()->Show(true); } } @@ -2079,14 +2240,14 @@ void ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); - DialogGetConvertPolarParameters dialogPolar (m_frame, "Convert to FFT Polar", m_iDefaultPolarNX, m_iDefaultPolarNY, + 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(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pPolarDoc = theApp->newImageDoc(); ImageFile& rIF = pPolarDoc->getImageFile(); if (! pPolarDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -2102,11 +2263,12 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) << 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); - }} + pPolarDoc->Modify (true); + pPolarDoc->UpdateAllViews (); + pPolarDoc->getView()->OnUpdate (this, NULL); + pPolarDoc->getView()->getFrame()->Show(true); + } +} void ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) @@ -2117,7 +2279,7 @@ ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) 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) { @@ -2138,7 +2300,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str()); m_iDefaultTrace = dialogReconstruction.getTrace(); if (m_iDefaultNX > 0 && m_iDefaultNY > 0) { - ImageFileDocument* pReconDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pReconDoc = theApp->newImageDoc(); if (! pReconDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -2148,17 +2310,17 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY); 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(); if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) { delete pDlgReconstruct; delete pReconstruct; - pReconDoc->DeleteAllViews(); + pReconDoc->getView()->getFrame()->Close(true); return; } ::wxYield(); @@ -2170,24 +2332,28 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) } 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)) { + if (! dlgProgress.Update (i + 1)) { delete pReconstruct; - pReconDoc->DeleteAllViews(); + GetDocumentManager()->ActivateView (pReconDoc->getView(), true, true); + pReconDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } } } delete pReconstruct; - if (theApp->getSetModifyNewDocs()) - pReconDoc->Modify(true); - pReconDoc->UpdateAllViews(this); - ImageFileView* rasterView = dynamic_cast(pReconDoc->GetFirstView()); - if (rasterView) { - rasterView->getFrame()->SetFocus(); + pReconDoc->Modify (true); + pReconDoc->UpdateAllViews (this); + if (ImageFileView* rasterView = pReconDoc->getView()) { rasterView->OnUpdate (rasterView, NULL); + rasterView->getFrame()->SetFocus(); + rasterView->getFrame()->Show(true); } 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(); @@ -2200,13 +2366,13 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) ProjectionFileCanvas* -ProjectionFileView::CreateCanvas (wxView *view, wxFrame *parent) +ProjectionFileView::CreateCanvas (wxFrame *parent) { ProjectionFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new ProjectionFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new ProjectionFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); @@ -2215,56 +2381,82 @@ ProjectionFileView::CreateCanvas (wxView *view, wxFrame *parent) return pCanvas; } -wxFrame* +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #ifdef CTSIM_MDI - wxMDIChildFrame *subframe = new wxMDIChildFrame (theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); + 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); + wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); #endif - - wxMenu *file_menu = new wxMenu; + theApp->setIconForFrame (subframe); + + wxMenu *m_pFileMenu = 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(wxID_SAVEAS, "Save &As..."); - file_menu->Append(wxID_CLOSE, "&Close"); + 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"); - file_menu->AppendSeparator(); - file_menu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT, "&Print..."); - file_menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - file_menu->Append(wxID_PREVIEW, "Print Pre&view"); + 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"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *convert_menu = new wxMenu; - convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image..."); - convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image..."); + 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..."); - reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier..."); - + reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R", "Reconstruct image using filtered backprojection"); + reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier"); + reconstruct_menu->Enable (PJMENU_RECONSTRUCT_FOURIER, false); + 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 (m_pFileMenu, "&File"); menu_bar->Append (convert_menu, "&Convert"); menu_bar->Append (reconstruct_menu, "&Reconstruct"); menu_bar->Append (help_menu, "&Help"); - subframe->SetMenuBar(menu_bar); - + subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); + wxAcceleratorEntry accelEntries[11]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); + accelEntries[4].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); + accelEntries[5].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); + accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); + accelEntries[7].Set (wxACCEL_CTRL, static_cast('L'), PJMENU_CONVERT_POLAR); + accelEntries[8].Set (wxACCEL_CTRL, static_cast('I'), PJMENU_CONVERT_FFT_POLAR); + accelEntries[9].Set (wxACCEL_CTRL, static_cast('R'), PJMENU_RECONSTRUCT_FBP); + accelEntries[10].Set (wxACCEL_CTRL, static_cast('E'), PJMENU_RECONSTRUCT_FOURIER); + wxAcceleratorTable accelTable (11, accelEntries); + subframe->SetAcceleratorTable (accelTable); + return subframe; } @@ -2272,21 +2464,21 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { - m_frame = CreateChildFrame(doc, this); - SetFrame(m_frame); + m_pFrame = CreateChildFrame(doc, this); + SetFrame(m_pFrame); int width, height; - m_frame->GetClientSize(&width, &height); - m_frame->SetTitle("ProjectionFileView"); - m_canvas = CreateCanvas(this, m_frame); + 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_frame->GetSize(&x, &y); - m_frame->SetSize(-1, -1, x, y); + m_pFrame->GetSize(&x, &y); + m_pFrame->SetSize(-1, -1, x, y); #endif - m_frame->Show(true); + m_pFrame->Show(true); Activate(true); return true; @@ -2295,13 +2487,19 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) void ProjectionFileView::OnDraw (wxDC* dc) { + wxSize clientSize = m_pFrame->GetClientSize(); + wxSize bestSize = m_pCanvas->GetBestSize(); + + if (clientSize.x > bestSize.x || clientSize.y > bestSize.y) + m_pFrame->SetClientSize (bestSize); + if (m_bitmap.Ok()) dc->DrawBitmap (m_bitmap, 0, 0, false); } void -ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { const Projections& rProj = GetDocument()->getProjections(); const int nDet = rProj.nDet(); @@ -2341,34 +2539,39 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) int ySize = nView; xSize = clamp (xSize, 0, 800); ySize = clamp (ySize, 0, 800); - m_frame->SetClientSize (xSize, ySize); - m_canvas->SetScrollbars (20, 20, nDet/20, nView/20); + m_pFrame->SetClientSize (xSize, ySize); + m_pCanvas->SetScrollbars (20, 20, nDet/20, nView/20); } - if (m_canvas) - m_canvas->Refresh(); + if (m_pCanvas) + m_pCanvas->Refresh(); } bool ProjectionFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + //GetDocumentManager()->ActivateView (this, false, true); + if (! GetDocument() || ! GetDocument()->Close()) return false; - // m_canvas->Clear(); - m_canvas->m_pView = NULL; - m_canvas = NULL; + if (m_pCanvas) { + m_pCanvas->setView(NULL); + m_pCanvas = NULL; + } wxString s(wxTheApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); - SetFrame(NULL); + if (m_pFrame) + m_pFrame->SetTitle(s); + SetFrame(NULL); Activate(false); if (deleteWindow) { - delete m_frame; - return true; + m_pFrame->Destroy(); + m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } + return true; } @@ -2381,6 +2584,11 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& m_pView = v; } +PlotFileCanvas::~PlotFileCanvas () +{ + m_pView = NULL; +} + void PlotFileCanvas::OnDraw(wxDC& dc) { @@ -2400,17 +2608,17 @@ 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) +PlotFileView::PlotFileView() +: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pEZPlot(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) { - m_bMinSpecified = false; - m_bMaxSpecified = false; } -PlotFileView::~PlotFileView(void) +PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; + + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2421,7 +2629,7 @@ PlotFileView::OnProperties (wxCommandEvent& event) os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n"; 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(); } @@ -2432,7 +2640,7 @@ PlotFileView::OnScaleAuto (wxCommandEvent& event) 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; @@ -2453,7 +2661,7 @@ 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"; @@ -2466,7 +2674,7 @@ PlotFileView::OnScaleMinMax (wxCommandEvent& event) 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; @@ -2489,13 +2697,13 @@ PlotFileView::OnScaleFull (wxCommandEvent& event) PlotFileCanvas* -PlotFileView::CreateCanvas (wxView *view, wxFrame *parent) +PlotFileView::CreateCanvas (wxFrame* parent) { PlotFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new PlotFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new PlotFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -2503,52 +2711,76 @@ PlotFileView::CreateCanvas (wxView *view, wxFrame *parent) return pCanvas; } -wxFrame* +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #ifdef CTSIM_MDI - wxMDIChildFrame *subframe = new wxMDIChildFrame (theApp->getMainFrame(), -1, "Plot Frame", wxPoint(10, 10), wxSize(500, 300), wxDEFAULT_FRAME_STYLE); + 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 - - wxMenu *file_menu = new wxMenu; + theApp->setIconForFrame (subframe); - 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(wxID_SAVEAS, "Save &As..."); - file_menu->Append(wxID_CLOSE, "&Close"); + wxMenu *m_pFileMenu = new wxMenu; - file_menu->AppendSeparator(); - file_menu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + 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"); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT, "&Print..."); - file_menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - file_menu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + + 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"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); 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_FULL, "Display &Full Scale"); + 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(file_menu, "&File"); + menu_bar->Append(m_pFileMenu, "&File"); menu_bar->Append(view_menu, "&View"); menu_bar->Append(help_menu, "&Help"); subframe->SetMenuBar(menu_bar); - subframe->Centre(wxBOTH); + wxAcceleratorEntry accelEntries[10]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); + accelEntries[4].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); + accelEntries[5].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); + accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); + accelEntries[7].Set (wxACCEL_CTRL, static_cast('E'), PLOTMENU_VIEW_SCALE_MINMAX); + accelEntries[8].Set (wxACCEL_CTRL, static_cast('A'), PLOTMENU_VIEW_SCALE_AUTO); + accelEntries[9].Set (wxACCEL_CTRL, static_cast('U'), PLOTMENU_VIEW_SCALE_FULL); + wxAcceleratorTable accelTable (10, accelEntries); + subframe->SetAcceleratorTable (accelTable); + return subframe; } @@ -2556,27 +2788,27 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { - m_frame = CreateChildFrame(doc, this); - SetFrame(m_frame); + m_pFrame = CreateChildFrame(doc, this); + SetFrame(m_pFrame); m_bMinSpecified = false; m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; int width, height; - m_frame->GetClientSize(&width, &height); - m_frame->SetTitle ("Plot File"); - m_canvas = CreateCanvas (this, m_frame); + m_pFrame->GetClientSize(&width, &height); + m_pFrame->SetTitle ("Plot File"); + m_pCanvas = CreateCanvas (m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize - m_frame->GetSize(&x, &y); - m_frame->SetSize(-1, -1, x, y); + m_pFrame->GetSize(&x, &y); + m_pFrame->SetSize(-1, -1, x, y); #endif - m_frame->Show(true); + m_pFrame->Show(true); Activate(true); - + return true; } @@ -2589,7 +2821,7 @@ PlotFileView::OnDraw (wxDC* dc) if (iNColumns > 0 && iNRecords > 0) { int xsize, ysize; - m_canvas->GetClientSize (&xsize, &ysize); + m_pCanvas->GetClientSize (&xsize, &ysize); SGPDriver driver (dc, xsize, ysize); SGP sgp (driver); if (m_pEZPlot) @@ -2601,70 +2833,213 @@ PlotFileView::OnDraw (wxDC* dc) 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 PlotFile& rPlotFile = GetDocument()->getPlotFile(); + const int iNColumns = rPlotFile.getNumColumns(); + const int iNRecords = rPlotFile.getNumRecords(); + + if (iNColumns > 0 && iNRecords > 0) { + if (m_pEZPlot) + delete m_pEZPlot; + m_pEZPlot = new EZPlot; - 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* pdXaxis = new double [iNRecords]; - rPlotFile.getColumn (0, pdXaxis); - - double* pdY = new double [iNRecords]; - for (int iCol = 1; iCol < iNColumns; iCol++) { - rPlotFile.getColumn (iCol, pdY); - m_pEZPlot->addCurve (pdXaxis, pdY, iNRecords); - } - - delete pdXaxis; - delete pdY; + 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_canvas) - m_canvas->Refresh(); + + if (m_bMaxSpecified) { + std::ostringstream os; + os << "ymax " << m_dMaxPixel; + m_pEZPlot->ezset (os.str()); + } + + m_pEZPlot->ezset("box"); + m_pEZPlot->ezset("grid"); + + double* pdXaxis = new double [iNRecords]; + rPlotFile.getColumn (0, pdXaxis); + + double* pdY = new double [iNRecords]; + for (int iCol = 1; iCol < iNColumns; iCol++) { + rPlotFile.getColumn (iCol, pdY); + m_pEZPlot->addCurve (pdXaxis, pdY, iNRecords); + } + + delete pdXaxis; + delete pdY; + } + + if (m_pCanvas) + m_pCanvas->Refresh(); } bool PlotFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + //GetDocumentManager()->ActivateView (this, false, true); + if (! GetDocument() || ! GetDocument()->Close()) return false; - // m_canvas->Clear(); - m_canvas->m_pView = NULL; - m_canvas = NULL; + if (m_pCanvas) { + m_pCanvas->setView (NULL); + m_pCanvas = NULL; + } wxString s(wxTheApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); + if (m_pFrame) + m_pFrame->SetTitle(s); + + Activate(false); + SetFrame(NULL); + if (deleteWindow) { + m_pFrame->Destroy(); + m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround + } + + return true; +} + + +//////////////////////////////////////////////////////////////// + + +IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) + +TextFileView::~TextFileView() +{ + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE);; +} + +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->Show (true); + Activate (true); + + return true; +} + +// Handled by wxTextWindow +void TextFileView::OnDraw(wxDC *WXUNUSED(dc) ) +{ +} + +void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +{ +} + +bool +TextFileView::OnClose (bool deleteWindow) +{ + // if (m_pFrame && m_pFrame->GetTitle() == "Log") + return false; + + //GetDocumentManager()->ActivateView (this, false, true); + if (! GetDocument() || ! GetDocument()->Close()) + return false; Activate(false); + SetFrame(NULL); if (deleteWindow) { - delete m_frame; - return true; + m_pFrame->Destroy(); + m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } - return true; + + return TRUE; } +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif +TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) +{ +#if CTSIM_MDI + wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); +#else + wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); +#endif + theApp->setIconForFrame (subframe); + + wxMenu *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->AppendSeparator(); + m_pFileMenu->Append(wxID_PRINT, "&Print..."); + m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); + m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + 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_TOPICS, "&Topics\tCtrl-H"); + help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); + + wxMenuBar *menu_bar = new wxMenuBar; + + menu_bar->Append(m_pFileMenu, "&File"); + menu_bar->Append(help_menu, "&Help"); + + subframe->SetMenuBar(menu_bar); + subframe->Centre(wxBOTH); + + wxAcceleratorEntry accelEntries[5]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); + accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); + wxAcceleratorTable accelTable (5, accelEntries); + subframe->SetAcceleratorTable (accelTable); + + 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) +{ +} + +TextFileCanvas::~TextFileCanvas () +{ + m_pView = NULL; +}