X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=0a8f4c8b7472f9c4c9850ea9c01bf130d39efcb4;hp=740c81c03615fca0236f43947be4c453041d817c;hb=e3776d3d7bf82adfea545c1f06c8b4ce660190b0;hpb=c551b53b39a7571cf52831f5e117be1cca95c420 diff --git a/src/views.cpp b/src/views.cpp index 740c81c..0a8f4c8 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.cpp,v 1.36 2000/12/22 04:18:00 kevin Exp $ +** $Id: views.cpp,v 1.45 2001/01/02 06:29:23 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 @@ -87,13 +87,13 @@ void ImageFileCanvas::DrawRubberBandCursor (wxDC& dc, int x, int y) { const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); - ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); + int yPt = ny - y - 1; dc.SetLogicalFunction (wxINVERT); dc.SetPen (*wxGREEN_PEN); - dc.DrawLine (0, y, nx, y); + dc.DrawLine (0, yPt, nx, yPt); dc.DrawLine (x, 0, x, ny); dc.SetLogicalFunction (wxCOPY); } @@ -121,38 +121,42 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) wxPoint pt(event.GetLogicalPosition(dc)); + const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); + ImageFileArrayConst v = rIF.getArray(); + int nx = rIF.nx(); + int ny = rIF.ny(); + const int yPt = ny - 1 - pt.y; if (event.RightIsDown()) { - const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); - ImageFileArrayConst v = rIF.getArray(); - int nx = rIF.nx(); - int ny = rIF.ny(); - if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) { std::ostringstream os; - os << "Image value (" << pt.x << "," << pt.y << ") = " << v[pt.x][ny - 1 - pt.y] << "\n"; + os << "Image value (" << pt.x << "," << yPt << ") = " << v[pt.x][yPt]; + if (rIF.isComplex()) { + double dImag = rIF.getImaginaryArray()[pt.x][yPt]; + if (dImag < 0) + os << " - " << -dImag; + else + os << " + " << dImag; + os << "i\n"; + } else + os << "\n"; *theApp->getLog() << os.str().c_str(); } else - *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n"; + *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n"; } - else if (event.LeftIsDown() || event.LeftUp()) { - const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); - ImageFileArrayConst v = rIF.getArray(); - int nx = rIF.nx(); - int ny = rIF.ny(); - + else if (event.LeftIsDown() || event.LeftUp() || event.RightUp()) { if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) { if (m_xCursor >= 0 && m_yCursor >= 0) { DrawRubberBandCursor (dc, m_xCursor, m_yCursor); } - DrawRubberBandCursor (dc, pt.x, pt.y); + DrawRubberBandCursor (dc, pt.x, yPt); m_xCursor = pt.x; - m_yCursor = pt.y; + m_yCursor = yPt; } else - *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n"; + *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n"; } if (event.LeftUp()) { std::ostringstream os; - os << "Selected column" << pt.x << " and row" << pt.y << "\n"; + os << "Selected column " << pt.x << " , row " << yPt << "\n"; *theApp->getLog() << os.str().c_str(); } } @@ -161,20 +165,42 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) IMPLEMENT_DYNAMIC_CLASS(ImageFileView, wxView) -BEGIN_EVENT_TABLE(ImageFileView, wxView) +BEGIN_EVENT_TABLE(ImageFileView, wxView) +EVT_MENU(IFMENU_FILE_EXPORT, ImageFileView::OnExport) EVT_MENU(IFMENU_FILE_PROPERTIES, ImageFileView::OnProperties) EVT_MENU(IFMENU_VIEW_SCALE_MINMAX, ImageFileView::OnScaleMinMax) EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto) EVT_MENU(IFMENU_COMPARE_IMAGES, ImageFileView::OnCompare) EVT_MENU(IFMENU_COMPARE_ROW, ImageFileView::OnCompareRow) EVT_MENU(IFMENU_COMPARE_COL, ImageFileView::OnCompareCol) +EVT_MENU(IFMENU_FILTER_INVERTVALUES, ImageFileView::OnInvertValues) +EVT_MENU(IFMENU_FILTER_SQUARE, ImageFileView::OnSquare) +EVT_MENU(IFMENU_FILTER_SQRT, ImageFileView::OnSquareRoot) +EVT_MENU(IFMENU_FILTER_LOG, ImageFileView::OnLog) +EVT_MENU(IFMENU_FILTER_EXP, ImageFileView::OnExp) +EVT_MENU(IFMENU_FILTER_FOURIER, ImageFileView::OnFourier) +EVT_MENU(IFMENU_FILTER_INVERSE_FOURIER, ImageFileView::OnInverseFourier) +EVT_MENU(IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, ImageFileView::OnShuffleFourierToNaturalOrder) +EVT_MENU(IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, ImageFileView::OnShuffleNaturalToFourierOrder) +EVT_MENU(IFMENU_IMAGE_ADD, ImageFileView::OnAdd) +EVT_MENU(IFMENU_IMAGE_SUBTRACT, ImageFileView::OnSubtract) +EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply) +EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide) +EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize) +#ifdef HAVE_FFTW +EVT_MENU(IFMENU_FILTER_FFT, ImageFileView::OnFFT) +EVT_MENU(IFMENU_FILTER_IFFT, ImageFileView::OnIFFT) +#endif +EVT_MENU(IFMENU_FILTER_MAGNITUDE, ImageFileView::OnMagnitude) +EVT_MENU(IFMENU_FILTER_PHASE, ImageFileView::OnPhase) EVT_MENU(IFMENU_PLOT_ROW, ImageFileView::OnPlotRow) EVT_MENU(IFMENU_PLOT_COL, ImageFileView::OnPlotCol) END_EVENT_TABLE() ImageFileView::ImageFileView(void) : wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false) -{ +{ + m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; } ImageFileView::~ImageFileView(void) @@ -184,15 +210,30 @@ ImageFileView::~ImageFileView(void) void ImageFileView::OnProperties (wxCommandEvent& event) { - double min, max, mean, mode, median, stddev; const ImageFile& rIF = GetDocument()->getImageFile(); if (rIF.nx() == 0 || rIF.ny() == 0) *theApp->getLog() << "Properties: empty imagefile\n"; else { const std::string& rFilename = rIF.getFilename(); - rIF.statistics (min, max, mean, mode, median, stddev); std::ostringstream os; - os << "file: " << rFilename << "\nmin: "< 0) { + os << "\n"; + rIF.printLabelsBrief (os); + } *theApp->getLog() << os.str().c_str(); wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); @@ -249,22 +290,22 @@ ImageFileView::OnCompare (wxCommandEvent& event) { std::vector vecIF; theApp->getCompatibleImages (GetDocument(), vecIF); - + if (vecIF.size() == 0) { wxMessageBox("There are no compatible image files open for comparision", "No comparison images"); } else { DialogGetComparisonImage dialogGetCompare(m_frame, "Get Comparison Image", vecIF, true); - + if (dialogGetCompare.ShowModal() == wxID_OK) { - ImageFileDocument* pCompareDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rIF = GetDocument()->getImageFile(); + ImageFileDocument* pCompareDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rCompareIF = pCompareDoc->getImageFile(); std::ostringstream os; double min, max, mean, mode, median, stddev; rIF.statistics (min, max, mean, mode, median, stddev); os << rIF.getFilename() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; rCompareIF.statistics (min, max, mean, mode, median, stddev); - os << rCompareIF.getFilename() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; + os << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; os << "\n"; double d, r, e; rIF.comparativeStatistics (rCompareIF, d, r, e); @@ -277,14 +318,24 @@ ImageFileView::OnCompare (wxCommandEvent& event) return; } ImageFile& differenceImage = pDifferenceDoc->getImageFile(); - + differenceImage.setArraySize (rIF.nx(), rIF.ny()); if (! rIF.subtractImages (rCompareIF, differenceImage)) { pDifferenceDoc->DeleteAllViews(); return; } - - pDifferenceDoc->Modify(true); + + wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; + differenceImage.labelsCopy (rIF, s.c_str()); + s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; + differenceImage.labelsCopy (rCompareIF, s.c_str()); + std::ostringstream osLabel; + osLabel << "Compare image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() + << " 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); } @@ -293,6 +344,336 @@ ImageFileView::OnCompare (wxCommandEvent& event) } } +void +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); +} + +void +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); +} + +void +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); +} + +void +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); +} + +void +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); +} + +void +ImageFileView::OnAdd (wxCommandEvent& event) +{ + std::vector vecIF; + theApp->getCompatibleImages (GetDocument(), vecIF); + + if (vecIF.size() == 0) { + wxMessageBox ("There are no compatible image files open for comparision", "No comparison images"); + } else { + DialogGetComparisonImage dialogGetCompare (m_frame, "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; + } + ImageFile& newImage = pNewDoc->getImageFile(); + newImage.setArraySize (rIF.nx(), rIF.ny()); + rIF.addImages (rRHSIF, newImage); + std::ostringstream os; + os << "Add image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " + << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); + wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; + newImage.labelsCopy (rIF, s.c_str()); + s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; + newImage.labelsCopy (rRHSIF, s.c_str()); + 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); + } + } +} + +void +ImageFileView::OnSubtract (wxCommandEvent& event) +{ + std::vector vecIF; + theApp->getCompatibleImages (GetDocument(), vecIF); + + if (vecIF.size() == 0) { + wxMessageBox ("There are no compatible image files open for comparision", "No comparison images"); + } else { + DialogGetComparisonImage dialogGetCompare (m_frame, "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; + } + ImageFile& newImage = pNewDoc->getImageFile(); + newImage.setArraySize (rIF.nx(), rIF.ny()); + rIF.subtractImages (rRHSIF, newImage); + std::ostringstream os; + os << "Subtract image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " + << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); + wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; + newImage.labelsCopy (rIF, s.c_str()); + s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; + newImage.labelsCopy (rRHSIF, s.c_str()); + 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); + } + } +} + +void +ImageFileView::OnMultiply (wxCommandEvent& event) +{ + std::vector vecIF; + theApp->getCompatibleImages (GetDocument(), vecIF); + + if (vecIF.size() == 0) { + wxMessageBox ("There are no compatible image files open for comparision", "No comparison images"); + } else { + DialogGetComparisonImage dialogGetCompare (m_frame, "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; + } + ImageFile& newImage = pNewDoc->getImageFile(); + newImage.setArraySize (rIF.nx(), rIF.ny()); + rIF.multiplyImages (rRHSIF, newImage); + std::ostringstream os; + os << "Multiply image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " + << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); + wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; + newImage.labelsCopy (rIF, s.c_str()); + s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; + newImage.labelsCopy (rRHSIF, s.c_str()); + 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); + } + } +} + +void +ImageFileView::OnDivide (wxCommandEvent& event) +{ + std::vector vecIF; + theApp->getCompatibleImages (GetDocument(), vecIF); + + if (vecIF.size() == 0) { + wxMessageBox ("There are no compatible image files open for comparision", "No comparison images"); + } else { + DialogGetComparisonImage dialogGetCompare (m_frame, "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; + } + ImageFile& newImage = pNewDoc->getImageFile(); + newImage.setArraySize (rIF.nx(), rIF.ny()); + rIF.divideImages (rRHSIF, newImage); + std::ostringstream os; + os << "Divide image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " by " + << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); + wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": "; + newImage.labelsCopy (rIF, s.c_str()); + s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; + newImage.labelsCopy (rRHSIF, s.c_str()); + 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); + } + } +} + + +#ifdef HAVE_FFTW +void +ImageFileView::OnFFT (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + wxProgressDialog dlgProgress (wxString("FFT"), wxString("FFT Progress"), 1, m_frame, wxPD_APP_MODAL); + rIF.fft (rIF); + rIF.labelAdd ("FFT Image"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} + +void +ImageFileView::OnIFFT (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + wxProgressDialog dlgProgress (wxString("IFFT"), wxString("IFFT Progress"), 1, m_frame, wxPD_APP_MODAL); + rIF.ifft (rIF); + rIF.labelAdd ("IFFT Image"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} +#endif + +void +ImageFileView::OnFourier (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + wxProgressDialog dlgProgress (wxString("Fourier"), wxString("Fourier Progress"), 1, m_frame, wxPD_APP_MODAL); + rIF.fourier (rIF); + rIF.labelAdd ("Fourier Image"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + 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); + rIF.inverseFourier (rIF); + rIF.labelAdd ("Inverse Fourier Image"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} + +void +ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + Fourier::shuffleNaturalToFourierOrder (rIF); + rIF.labelAdd ("Shuffle Natural To Fourier Order"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} + +void +ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + Fourier::shuffleFourierToNaturalOrder (rIF); + rIF.labelAdd ("Shuffle Fourier To Natural Order"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} + +void +ImageFileView::OnMagnitude (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + 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); + } +} + +void +ImageFileView::OnPhase (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + 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); + } +} + + ImageFileCanvas* ImageFileView::CreateCanvas (wxView *view, wxFrame *parent) { @@ -316,14 +697,16 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *file_menu = new wxMenu; - file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); + 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"); - file_menu->AppendSeparator(); + file_menu->AppendSeparator(); file_menu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); + file_menu->Append(IFMENU_FILE_EXPORT, "&Export..."); file_menu->AppendSeparator(); file_menu->Append(wxID_PRINT, "&Print..."); @@ -334,6 +717,36 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale &Set..."); view_menu->Append(IFMENU_VIEW_SCALE_AUTO, "Display Scale &Auto..."); + wxMenu* filter_menu = new wxMenu; + filter_menu->Append (IFMENU_FILTER_INVERTVALUES, "&Invert Values"); + filter_menu->Append (IFMENU_FILTER_SQUARE, "&Square"); + filter_menu->Append (IFMENU_FILTER_SQRT, "Square &Root"); + filter_menu->Append (IFMENU_FILTER_LOG, "&Log"); + filter_menu->Append (IFMENU_FILTER_EXP, "&Exp"); + filter_menu->AppendSeparator(); +#ifdef HAVE_FFTW + filter_menu->Append (IFMENU_FILTER_FFT, "&FFT"); + filter_menu->Append (IFMENU_FILTER_IFFT, "&IFFT"); + filter_menu->Append (IFMENU_FILTER_FOURIER, "F&ourier"); + filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "Inverse Fo&urier"); +#else + filter_menu->Append (IFMENU_FILTER_FOURIER, "&Fourier"); + filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "&Inverse Fourier"); +#endif + filter_menu->Append (IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, "S&huffle Fourier to Natural Order"); + filter_menu->Append (IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, "Shu&ffle Natural to Fourier Order"); + filter_menu->Append (IFMENU_FILTER_MAGNITUDE, "&Magnitude"); + filter_menu->Append (IFMENU_FILTER_PHASE, "&Phase"); + + wxMenu* image_menu = new wxMenu; + filter_menu->AppendSeparator(); + image_menu->Append (IFMENU_IMAGE_ADD, "&Add..."); + image_menu->Append (IFMENU_IMAGE_SUBTRACT, "&Subtract..."); + image_menu->Append (IFMENU_IMAGE_MULTIPLY, "&Multiply..."); + image_menu->Append (IFMENU_IMAGE_DIVIDE, "&Divide..."); + image_menu->AppendSeparator(); + image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size..."); + wxMenu *plot_menu = new wxMenu; plot_menu->Append (IFMENU_PLOT_ROW, "Plot &Row"); plot_menu->Append (IFMENU_PLOT_COL, "Plot &Column"); @@ -342,7 +755,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) compare_menu->Append (IFMENU_COMPARE_IMAGES, "Compare &Images..."); compare_menu->Append (IFMENU_COMPARE_ROW, "Compare &Row"); compare_menu->Append (IFMENU_COMPARE_COL, "Compare &Column"); - + wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); @@ -350,7 +763,9 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) menu_bar->Append(file_menu, "&File"); menu_bar->Append(view_menu, "&View"); - menu_bar->Append(plot_menu, "&Plot"); + menu_bar->Append(image_menu, "&Image"); + menu_bar->Append(filter_menu, "Fi<er"); + menu_bar->Append(plot_menu, "P&lot"); menu_bar->Append(compare_menu, "&Compare"); menu_bar->Append(help_menu, "&Help"); @@ -363,7 +778,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool -ImageFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) +ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { m_frame = CreateChildFrame(doc, this); SetFrame (m_frame); @@ -466,6 +881,80 @@ ImageFileView::OnClose (bool deleteWindow) return true; } +void +ImageFileView::OnExport (wxCommandEvent& event) +{ + ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + ImageFileArrayConst v = rIF.getArray(); + int nx = rIF.nx(); + int ny = rIF.ny(); + if (v != NULL && nx != 0 && ny != 0) { + if (! m_bMinSpecified || ! m_bMaxSpecified) { + double min, max; + rIF.getMinMax (min, max); + if (! m_bMinSpecified) + m_dMinPixel = min; + if (! m_bMaxSpecified) + m_dMaxPixel = max; + } + + DialogExportParameters dialogExport (m_frame, 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) { + strExt = ".pgm"; + strWildcard = "PGM Files (*.pgm)|*.pgm"; + } +#ifdef HAVE_PNG + else if (m_iDefaultExportFormatID == ImageFile::FORMAT_PNG || m_iDefaultExportFormatID == ImageFile::FORMAT_PNG16) { + strExt = ".png"; + strWildcard = "PNG Files (*.png)|*.png"; + } +#endif + + const wxString& strFilename = wxFileSelector (wxString("Export Filename"), wxString(""), + wxString(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE); + if (strFilename) { + rIF.exportImage (strFormatName.c_str(), strFilename.c_str(), 1, 1, m_dMinPixel, m_dMaxPixel); + *theApp->getLog() << "Exported file " << strFilename << "\n"; + } + } + } +} + +void +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); + 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)); + if (! pScaledDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + ImageFile& rScaledIF = pScaledDoc->getImageFile(); + rScaledIF.setArraySize (iNewNX, iNewNY); + rScaledIF.labelAdd (os.str().c_str()); + rIF.scaleImage (rScaledIF); + *theApp->getLog() << os.str().c_str() << "\n"; + if (theApp->getSetModifyNewDocs()) + pScaledDoc->Modify(TRUE); + pScaledDoc->UpdateAllViews (this); + pScaledDoc->GetFirstView()->OnUpdate (this, NULL); + } +} void ImageFileView::OnPlotRow (wxCommandEvent& event) @@ -493,20 +982,26 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { PlotFile& rPlotFile = pPlotDoc->getPlotFile(); - std::ostringstream title; - title << "Row " << yCursor; - rPlotFile.setTitle(title.str()); - rPlotFile.setXLabel("Column"); - rPlotFile.setYLabel("Pixel Value"); + std::ostringstream os; + os << "Row " << yCursor; + std::string title("title "); + title += os.str(); + rPlotFile.addEzsetCommand (title.c_str()); + rPlotFile.addEzsetCommand ("xlabel Column"); + rPlotFile.addEzsetCommand ("ylabel Pixel Value"); + rPlotFile.addEzsetCommand ("lxfrac 0"); + rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("grid"); rPlotFile.setCurveSize (2, nx); rPlotFile.addColumn (0, pX); rPlotFile.addColumn (1, pY); } delete pX; delete pY; - pPlotDoc->Modify(true); + if (theApp->getSetModifyNewDocs()) + pPlotDoc->Modify(true); + pPlotDoc->UpdateAllViews(); } - } void @@ -535,18 +1030,25 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { PlotFile& rPlotFile = pPlotDoc->getPlotFile(); - std::ostringstream title; - title << "Column " << xCursor; - rPlotFile.setTitle(title.str()); - rPlotFile.setXLabel("Row"); - rPlotFile.setYLabel("Pixel Value"); + std::ostringstream os; + os << "Column " << xCursor; + std::string title("title "); + title += os.str(); + rPlotFile.addEzsetCommand (title.c_str()); + rPlotFile.addEzsetCommand ("xlabel Row"); + rPlotFile.addEzsetCommand ("ylabel Pixel Value"); + rPlotFile.addEzsetCommand ("lxfrac 0"); + rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("grid"); rPlotFile.setCurveSize (2, nx); rPlotFile.addColumn (0, pX); rPlotFile.addColumn (1, pY); } delete pX; delete pY; - pPlotDoc->Modify(true); + if (theApp->getSetModifyNewDocs()) + pPlotDoc->Modify(true); + pPlotDoc->UpdateAllViews(); } } @@ -561,7 +1063,10 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) std::vector vecIFDoc; theApp->getCompatibleImages (GetDocument(), vecIFDoc); - + if (vecIFDoc.size() == 0) { + wxMessageBox ("No compatible images for Column Comparison", "Error"); + return; + } DialogGetComparisonImage dialogGetCompare (m_frame, "Get Comparison Image", vecIFDoc, false); if (dialogGetCompare.ShowModal() == wxID_OK) { @@ -588,11 +1093,21 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { PlotFile& rPlotFile = pPlotDoc->getPlotFile(); - std::ostringstream title; - title << "Comparison of Column " << xCursor; - rPlotFile.setTitle(title.str()); - rPlotFile.setXLabel("Row"); - rPlotFile.setYLabel("Pixel Value"); + std::ostringstream os; + os << "Column " << xCursor << " Comparison"; + std::string title("title "); + title += os.str(); + rPlotFile.addEzsetCommand (title.c_str()); + rPlotFile.addEzsetCommand ("xlabel Row"); + rPlotFile.addEzsetCommand ("ylabel Pixel Value"); + rPlotFile.addEzsetCommand ("lxfrac 0"); + rPlotFile.addEzsetCommand ("curve 1"); + rPlotFile.addEzsetCommand ("color 2"); + rPlotFile.addEzsetCommand ("curve 2"); + rPlotFile.addEzsetCommand ("color 4"); + rPlotFile.addEzsetCommand ("dash 5"); + rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("grid"); rPlotFile.setCurveSize (3, nx); rPlotFile.addColumn (0, pX); rPlotFile.addColumn (1, pY1); @@ -601,7 +1116,9 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) delete pX; delete pY1; delete pY2; - pPlotDoc->Modify(true); + if (theApp->getSetModifyNewDocs()) + pPlotDoc->Modify(true); + pPlotDoc->UpdateAllViews(); } } } @@ -618,6 +1135,11 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) std::vector vecIFDoc; theApp->getCompatibleImages (GetDocument(), vecIFDoc); + if (vecIFDoc.size() == 0) { + wxMessageBox ("No compatible images for Row Comparison", "Error"); + return; + } + DialogGetComparisonImage dialogGetCompare (m_frame, "Get Comparison Image", vecIFDoc, false); if (dialogGetCompare.ShowModal() == wxID_OK) { @@ -644,11 +1166,21 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { PlotFile& rPlotFile = pPlotDoc->getPlotFile(); - std::ostringstream title; - title << "Comparison of Row " << yCursor; - rPlotFile.setTitle(title.str()); - rPlotFile.setXLabel("Column"); - rPlotFile.setYLabel("Pixel Value"); + std::ostringstream os; + os << "Row " << yCursor << " Comparison"; + std::string title("title "); + title += os.str(); + rPlotFile.addEzsetCommand (title.c_str()); + rPlotFile.addEzsetCommand ("xlabel Column"); + rPlotFile.addEzsetCommand ("ylabel Pixel Value"); + rPlotFile.addEzsetCommand ("lxfrac 0"); + rPlotFile.addEzsetCommand ("curve 1"); + rPlotFile.addEzsetCommand ("color 2"); + rPlotFile.addEzsetCommand ("curve 2"); + rPlotFile.addEzsetCommand ("color 4"); + rPlotFile.addEzsetCommand ("dash 5"); + rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("grid"); rPlotFile.setCurveSize (3, ny); rPlotFile.addColumn (0, pX); rPlotFile.addColumn (1, pY1); @@ -657,7 +1189,9 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) delete pX; delete pY1; delete pY2; - pPlotDoc->Modify(true); + if (theApp->getSetModifyNewDocs()) + pPlotDoc->Modify(true); + pPlotDoc->UpdateAllViews(); } } } @@ -672,7 +1206,7 @@ PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos } void -PhantomCanvas::OnDraw(wxDC& dc) +PhantomCanvas::OnDraw (wxDC& dc) { if (m_pView) m_pView->OnDraw(& dc); @@ -712,12 +1246,14 @@ PhantomView::OnProperties (wxCommandEvent& event) const int idPhantom = GetDocument()->getPhantomID(); const wxString& namePhantom = GetDocument()->getPhantomName(); std::ostringstream os; - os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")\n"; - *theApp->getLog() << os.str().c_str(); + os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")" << "\n"; + const Phantom& rPhantom = GetDocument()->getPhantom(); + rPhantom.printDefinitions (os); #if DEBUG - const Phantom& rPhantom = GetDocument()->getPhantom(); - rPhantom.print(); + rPhantom.print (os); #endif + *theApp->getLog() << os.str().c_str() << "\n"; + wxMessageBox (os.str().c_str(), "Phantom Properties"); } @@ -800,7 +1336,8 @@ PhantomView::OnProjections (wxCommandEvent& event) theApp->getDocManager()->ActivateView (pView, true, false); } ::wxYield(); - pProjectionDoc->Modify(true); + if (theApp->getSetModifyNewDocs()) + pProjectionDoc->Modify(true); pProjectionDoc->UpdateAllViews(this); } } @@ -815,7 +1352,7 @@ PhantomView::OnRasterize (wxCommandEvent& event) if (retVal == wxID_OK) { int xSize = dialogRaster.getXSize(); int ySize = dialogRaster.getYSize(); - int nSamples = dialogRaster.getNSamples(); + int nSamples = dialogRaster.getNSamples(); if (nSamples < 1) nSamples = 1; if (xSize > 0 && ySize > 0) { @@ -828,7 +1365,8 @@ PhantomView::OnRasterize (wxCommandEvent& event) ImageFile& imageFile = pRasterDoc->getImageFile(); imageFile.setArraySize (xSize, ySize); - wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT); + wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT); + Timer timer; for (unsigned int i = 0; i < imageFile.nx(); i++) { rPhantom.convertToImagefile (imageFile, nSamples, Trace::TRACE_NONE, i, 1, true); if (! dlgProgress.Update(i+1)) { @@ -836,17 +1374,19 @@ PhantomView::OnRasterize (wxCommandEvent& event) return; } } - pRasterDoc->Modify(true); - pRasterDoc->UpdateAllViews(this); + if (theApp->getSetModifyNewDocs()) + pRasterDoc->Modify(true); + pRasterDoc->UpdateAllViews(this); + std::ostringstream os; + os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples; + *theApp->getLog() << os.str().c_str() << "\n"; + imageFile.labelAdd (os.str().c_str(), timer.timerEnd()); ImageFileView* rasterView = dynamic_cast(pRasterDoc->GetFirstView()); if (rasterView) { rasterView->getFrame()->SetFocus(); rasterView->OnUpdate (rasterView, NULL); } - std::ostringstream os; - os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples << "\n"; - *theApp->getLog() << os.str().c_str(); } } } @@ -875,7 +1415,9 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *file_menu = new wxMenu; file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); - file_menu->Append(wxID_OPEN, "&Open..."); + 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"); file_menu->AppendSeparator(); @@ -1060,7 +1602,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) m_iDefaultTrace = dialogReconstruction.getTrace(); if (m_iDefaultNX > 0 && m_iDefaultNY > 0) { ImageFileDocument* pReconDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (pReconDoc) { + if (! pReconDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; } @@ -1072,24 +1614,9 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) wxMessageBox ("Sorry!\nCurrently, frequency-based filtering with direct filter generation is not support for geometries other than parallel.\nAborting command.", "Not Supported", wxOK | wxICON_WARNING, m_frame); return; } -#if 0 - SGPDriver* pSGPDriver = NULL; - SGP* pSGP = NULL; - wxMemoryDC* pDCPlot = NULL; - wxBitmap bitmap; - if (m_iDefaultTrace >= Trace::TRACE_PLOT) { - bitmap.Create (500, 500); - pDCPlot = new wxMemoryDC; - pDCPlot->SelectObject (bitmap); - pSGPDriver = new SGPDriver (dynamic_castpDCPlot, 500, 500); - pSGP = new SGP (*pSGPDriver); - } - 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, pSGP); - delete pSGP; -#else + 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); -#endif - + Timer timerRecon; if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, m_frame); @@ -1122,7 +1649,8 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) } } delete pReconstruct; - pReconDoc->Modify(true); + if (theApp->getSetModifyNewDocs()) + pReconDoc->Modify(true); pReconDoc->UpdateAllViews(this); ImageFileView* rasterView = dynamic_cast(pReconDoc->GetFirstView()); if (rasterView) { @@ -1133,7 +1661,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) 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(); *theApp->getLog() << os.str().c_str() << "\n"; imageFile.labelAdd (rProj.getLabel()); - imageFile.labelAdd (Array2dFileLabel::L_HISTORY, os.str().c_str(), timerRecon.timerEnd()); + imageFile.labelAdd (os.str().c_str(), timerRecon.timerEnd()); } } } @@ -1163,6 +1691,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *file_menu = new wxMenu; file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); + file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter..."); file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_SAVE, "&Save"); file_menu->Append(wxID_SAVEAS, "Save &As..."); @@ -1329,20 +1858,23 @@ EVT_MENU(PLOTMENU_VIEW_SCALE_AUTO, PlotFileView::OnScaleAuto) END_EVENT_TABLE() PlotFileView::PlotFileView(void) -: wxView(), m_canvas(NULL), m_frame(NULL) +: wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL) { } PlotFileView::~PlotFileView(void) -{ +{ + if (m_pEZPlot) + delete m_pEZPlot; } void PlotFileView::OnProperties (wxCommandEvent& event) { - const PlotFile& rProj = GetDocument()->getPlotFile(); + const PlotFile& rPlot = GetDocument()->getPlotFile(); std::ostringstream os; - os << "Columns: " << rProj.getNumColumns() << ", Records: " << rProj.getNumRecords() << "\n"; + os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n"; + rPlot.printHeaders (os); *theApp->getLog() << os.str().c_str(); wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); @@ -1374,9 +1906,10 @@ void PlotFileView::OnScaleMinMax (wxCommandEvent& event) { const PlotFile& rPlotFile = GetDocument()->getPlotFile(); - double min, max; - - if (! m_bMinSpecified && ! m_bMaxSpecified) { + double min; + double max; + + if (! m_bMinSpecified || ! m_bMaxSpecified) { if (! rPlotFile.getMinMax (1, min, max)) { *theApp->getLog() << "Error: unable to find Min/Max\n"; return; @@ -1423,6 +1956,7 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *file_menu = new wxMenu; file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); + file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter..."); file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_SAVE, "&Save"); file_menu->Append(wxID_SAVEAS, "Save &As..."); @@ -1460,7 +1994,7 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool -PlotFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) +PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { m_frame = CreateChildFrame(doc, this); SetFrame(m_frame); @@ -1482,7 +2016,7 @@ PlotFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) m_frame->Show(true); Activate(true); - + return true; } @@ -1498,62 +2032,57 @@ PlotFileView::OnDraw (wxDC* dc) m_canvas->GetClientSize (&xsize, &ysize); SGPDriver driver (dc, xsize, ysize); SGP sgp (driver); - const PlotFile& rPhantom = GetDocument()->getPlotFile(); - EZPlot plot (sgp); - - if (! rPlotFile.getTitle().empty()) { - std::string s("title "); - s += rPlotFile.getTitle(); - plot.ezset (s); - } - if (! rPlotFile.getXLabel().empty()) { - std::string s("xlabel "); - s += rPlotFile.getXLabel(); - plot.ezset (s); - } - if (! rPlotFile.getYLabel().empty()) { - std::string s("ylabel "); - s += rPlotFile.getYLabel(); - plot.ezset (s); - } - - if (m_bMinSpecified) { - std::ostringstream os; - os << "ymin " << m_dMinPixel; - plot.ezset (os.str()); - } - - if (m_bMaxSpecified) { - std::ostringstream os; - os << "ymax " << m_dMaxPixel; - plot.ezset (os.str()); - } - - plot.ezset("box"); - plot.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); - plot.addCurve (pdXaxis, pdY, iNRecords); - } - - delete pdXaxis; - delete pdY; - - plot.plot(); + if (m_pEZPlot) + m_pEZPlot->plot (&sgp); } } void -PlotFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { - if (m_canvas) - m_canvas->Refresh(); + 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; + + 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; + } + + if (m_canvas) + m_canvas->Refresh(); } bool