** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.30 2000/12/18 09:31:26 kevin Exp $
+** $Id: views.cpp,v 1.34 2000/12/20 20:08:48 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
ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
: wxScrolledWindow(frame, -1, pos, size, style)
{
- m_pView = v;
+ m_pView = v;\r
+ m_xCursor = -1;\r
+ m_yCursor = -1;
}
void
{
if (m_pView)
m_pView->OnDraw(& dc);
+}\r
+\r
+void \r
+ImageFileCanvas::DrawRubberBandCursor (wxDC& dc, int x, int y)\r
+{\r
+ const ImageFile& rIF = m_pView->GetDocument()->getImageFile();\r
+ ImageFileArrayConst v = rIF.getArray();\r
+ int nx = rIF.nx();\r
+ int ny = rIF.ny();\r
+ \r
+ dc.SetLogicalFunction (wxINVERT);\r
+ dc.SetPen (*wxGREEN_PEN);\r
+ dc.DrawLine (0, y, nx, y);\r
+ dc.DrawLine (x, 0, x, ny);\r
+ dc.SetLogicalFunction (wxCOPY);\r
+}\r
+\r
+bool\r
+ImageFileCanvas::GetCurrentCursor (int& x, int& y)\r
+{\r
+ x = m_xCursor;\r
+ y = m_yCursor;\r
+ \r
+ if (m_xCursor >= 0 && m_yCursor >= 0)\r
+ return true;\r
+ else\r
+ return false;\r
}
-
+\r
void
ImageFileCanvas::OnMouseEvent(wxMouseEvent& event)
{
PrepareDC(dc);
wxPoint pt(event.GetLogicalPosition(dc));
-
- if (event.LeftIsDown()) {
- 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";
- *theApp->getLog() << os.str().c_str();
- } else
- *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n";
-
- }
+ \r
+ if (event.RightIsDown()) {\r
+ const ImageFile& rIF = m_pView->GetDocument()->getImageFile();\r
+ ImageFileArrayConst v = rIF.getArray();\r
+ int nx = rIF.nx();\r
+ int ny = rIF.ny();\r
+ \r
+ if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) {\r
+ std::ostringstream os;\r
+ os << "Image value (" << pt.x << "," << pt.y << ") = " << v[pt.x][ny - 1 - pt.y] << "\n";\r
+ *theApp->getLog() << os.str().c_str();\r
+ } else\r
+ *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n";\r
+ }\r
+ else if (event.LeftIsDown() || event.LeftUp()) {\r
+ const ImageFile& rIF = m_pView->GetDocument()->getImageFile();\r
+ ImageFileArrayConst v = rIF.getArray();\r
+ int nx = rIF.nx();\r
+ int ny = rIF.ny();\r
+ \r
+ if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) {\r
+ if (m_xCursor >= 0 && m_yCursor >= 0) {\r
+ DrawRubberBandCursor (dc, m_xCursor, m_yCursor);\r
+ }\r
+ DrawRubberBandCursor (dc, pt.x, pt.y);\r
+ m_xCursor = pt.x;\r
+ m_yCursor = pt.y;\r
+ } else\r
+ *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n";\r
+ }\r
+ if (event.LeftUp()) {\r
+ std::ostringstream os;\r
+ os << "Selected column" << pt.x << " and row" << pt.y << "\n";\r
+ *theApp->getLog() << os.str().c_str();\r
+ }\r
}
-
// ImageFileView
IMPLEMENT_DYNAMIC_CLASS(ImageFileView, wxView)
BEGIN_EVENT_TABLE(ImageFileView, wxView)
EVT_MENU(IFMENU_FILE_PROPERTIES, ImageFileView::OnProperties)
EVT_MENU(IFMENU_VIEW_SCALE_MINMAX, ImageFileView::OnScaleMinMax)
-EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto)
+EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto)\r
+EVT_MENU(IFMENU_PLOT_ROW, ImageFileView::OnPlotRow)
+EVT_MENU(IFMENU_PLOT_COL, ImageFileView::OnPlotCol)\r
END_EVENT_TABLE()
ImageFileView::ImageFileView(void)
ImageFileView::OnScaleAuto (wxCommandEvent& event)
{
const ImageFile& rIF = GetDocument()->getImageFile();
- DialogAutoScaleParameters dialogAutoScale (m_frame, rIF, m_dAutoScaleFactor);
+ double min, max, mean, mode, median, stddev;\r
+ rIF.statistics(min, max, mean, mode, median, stddev);\r
+ DialogAutoScaleParameters dialogAutoScale (m_frame, mean, mode, median, stddev, m_dAutoScaleFactor);
int iRetVal = dialogAutoScale.ShowModal();
if (iRetVal == wxID_OK) {
m_bMinSpecified = true;
m_bMaxSpecified = true;
- double dMin, dMax;
- dialogAutoScale.getMinMax (&dMin, &dMax);
- m_dMinPixel = dMin;
- m_dMaxPixel = dMax;
- m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor();
- OnUpdate (this, NULL);
+ double dMin, dMax;\r
+ if (dialogAutoScale.getMinMax (&dMin, &dMax)) {
+ m_dMinPixel = dMin;
+ m_dMaxPixel = dMax;
+ m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor();
+ OnUpdate (this, NULL);\r
+ }
}
}
if (m_bMaxSpecified)
max = m_dMaxPixel;
- DialogGetImageMinMax dialogMinMax (m_frame, rIF, min, max);
+ DialogGetMinMax dialogMinMax (m_frame, "Set Image Minimum & Maximum", min, max);
int retVal = dialogMinMax.ShowModal();
if (retVal == wxID_OK) {
m_bMinSpecified = true;
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...");
-
+ \r
+ wxMenu *plot_menu = new wxMenu;\r
+ plot_menu->Append (IFMENU_PLOT_ROW, "Plot &Row");\r
+ plot_menu->Append (IFMENU_PLOT_COL, "Plot &Column");\r
+
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
- menu_bar->Append(view_menu, "&View");
+ menu_bar->Append(view_menu, "&View");\r
+ menu_bar->Append(plot_menu, "&Plot");
menu_bar->Append(help_menu, "&Help");
subframe->SetMenuBar(menu_bar);
{
if (m_bitmap.Ok())
dc->DrawBitmap(m_bitmap, 0, 0, false);
+ \r
+ int xCursor, yCursor;\r
+ if (m_canvas->GetCurrentCursor (xCursor, yCursor))\r
+ m_canvas->DrawRubberBandCursor (*dc, xCursor, yCursor);\r
}
ySize = clamp (ySize, 0, 800);
m_frame->SetClientSize (xSize, ySize);
m_canvas->SetScrollbars(20, 20, nx/20, ny/20);
- m_canvas->SetBackgroundColour(*wxWHITE);
+ m_canvas->SetBackgroundColour(*wxWHITE);\r
}
if (m_canvas)
}
return true;
}
-
-
+\r
+#include "wx/plot.h"\r
+\r
+void\r
+ImageFileView::OnPlotRow (wxCommandEvent& event)\r
+{\r
+ int xCursor, yCursor;\r
+ if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {\r
+ *theApp->getLog() << "No row selected. Please use left mouse button on image to select row\n";\r
+ return;\r
+ }\r
+ \r
+ const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();\r
+ ImageFileArrayConst v = rIF.getArray();\r
+ int nx = rIF.nx();\r
+ int ny = rIF.ny();\r
+ \r
+ if (v != NULL && yCursor < ny) {\r
+ double* pX = new double [nx];\r
+ double* pY = new double [nx];\r
+ for (int i = 0; i < nx; i++) {\r
+ pX[i] = i;\r
+ pY[i] = v[i][yCursor];\r
+ }\r
+ PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));\r
+ if (! pPlotDoc) {\r
+ sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");\r
+ } else {\r
+ PlotFile& rPlotFile = pPlotDoc->getPlotFile();\r
+ std::ostringstream title;\r
+ title << "Row " << yCursor;\r
+ rPlotFile.setTitle(title.str());\r
+ rPlotFile.setXLabel("Column");\r
+ rPlotFile.setYLabel("Pixel Value");\r
+ rPlotFile.setCurveSize (2, nx);\r
+ rPlotFile.addColumn (0, pX);\r
+ rPlotFile.addColumn (1, pY);\r
+ }\r
+ delete pX;\r
+ delete pY;\r
+ pPlotDoc->Modify(true);\r
+ }\r
+ \r
+}\r
+
+void\r
+ImageFileView::OnPlotCol (wxCommandEvent& event)\r
+{\r
+ int xCursor, yCursor;\r
+ if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {\r
+ // os << "No column selected. Please use left mouse button on image to select column\n";\r
+ return;\r
+ }\r
+ \r
+ const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();\r
+ ImageFileArrayConst v = rIF.getArray();\r
+ int nx = rIF.nx();\r
+ int ny = rIF.ny();\r
+ \r
+ if (v != NULL && xCursor < nx) {\r
+ double* pX = new double [ny];\r
+ double* pY = new double [ny];\r
+ double minVal = v[xCursor][0];\r
+ double maxVal = minVal;\r
+ for (int i = 0; i < ny; i++) {\r
+ double y = v[xCursor][i];\r
+ if (minVal < y)\r
+ minVal = y;\r
+ else if (maxVal > y)\r
+ maxVal = y;\r
+ pX[i] = i;\r
+ pY[i] = y;\r
+ }\r
+ PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));\r
+ if (! pPlotDoc) {\r
+ sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");\r
+ } else {\r
+ PlotFile& rPlotFile = pPlotDoc->getPlotFile();\r
+ std::ostringstream title;\r
+ title << "Column " << xCursor;\r
+ rPlotFile.setTitle(title.str());\r
+ rPlotFile.setXLabel("Row");\r
+ rPlotFile.setYLabel("Pixel Value");\r
+ rPlotFile.setCurveSize (2, nx);\r
+ rPlotFile.addColumn (0, pX);\r
+ rPlotFile.addColumn (1, pY);\r
+ }\r
+ delete pX;\r
+ delete pY;\r
+ pPlotDoc->Modify(true);\r
+ }\r
+}\r
+\r
// PhantomCanvas
if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") {
const Phantom& rPhantom = GetDocument()->getPhantom();
- ProjectionFileDocument* pProjectionDoc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT));
+ ProjectionFileDocument* pProjectionDoc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT));\r
+ if (! pProjectionDoc) {\r
+ sys_error (ERR_SEVERE, "Unable to create projection document");\r
+ return;\r
+ }
Projections& rProj = pProjectionDoc->getProjections();
Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
if (theScanner.fail()) {
nSamples = 1;
if (xSize > 0 && ySize > 0) {
const Phantom& rPhantom = GetDocument()->getPhantom();
- ImageFileDocument* pRasterDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+ ImageFileDocument* pRasterDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));\r
+ if (! pRasterDoc) {\r
+ sys_error (ERR_SEVERE, "Unable to create image file");\r
+ return;\r
+ }
ImageFile& imageFile = pRasterDoc->getImageFile();
imageFile.setArraySize (xSize, ySize);
m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str());
m_iDefaultTrace = dialogReconstruction.getTrace();
if (m_iDefaultNX > 0 && m_iDefaultNY > 0) {
- ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+ ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));\r
+ if (pReconDoc) {\r
+ sys_error (ERR_SEVERE, "Unable to create image file");\r
+ return;\r
+ }
ImageFile& imageFile = pReconDoc->getImageFile();
const Projections& rProj = GetDocument()->getProjections();
imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
return true;
}
+
+
+// PlotFileCanvas
+PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
+: wxScrolledWindow(frame, -1, pos, size, style)
+{
+ m_pView = v;
+}
+
+void
+PlotFileCanvas::OnDraw(wxDC& dc)
+{
+ if (m_pView)
+ m_pView->OnDraw(& dc);
+}\r
+
+
+// PlotFileView
+
+IMPLEMENT_DYNAMIC_CLASS(PlotFileView, wxView)
+
+BEGIN_EVENT_TABLE(PlotFileView, wxView)
+EVT_MENU(PJMENU_FILE_PROPERTIES, PlotFileView::OnProperties)
+EVT_MENU(PLOTMENU_VIEW_SCALE_MINMAX, PlotFileView::OnScaleMinMax)\r
+EVT_MENU(PLOTMENU_VIEW_SCALE_AUTO, PlotFileView::OnScaleAuto)\r
+END_EVENT_TABLE()
+
+PlotFileView::PlotFileView(void)
+: wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false)
+{
+}
+
+PlotFileView::~PlotFileView(void)
+{
+}
+
+void
+PlotFileView::OnProperties (wxCommandEvent& event)
+{
+ const PlotFile& rProj = GetDocument()->getPlotFile();
+ std::ostringstream os;\r
+ os << "Columns: " << rProj.getNumColumns() << ", Records: " << rProj.getNumRecords() << "\n";
+ *theApp->getLog() << os.str().c_str();
+ wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION);
+ dialogMsg.ShowModal();
+}
+
+
+void \r
+PlotFileView::OnScaleAuto (wxCommandEvent& event)\r
+{\r
+ const PlotFile& rPlotFile = GetDocument()->getPlotFile();\r
+ double min, max, mean, mode, median, stddev;\r
+ rPlotFile.statistics (1, min, max, mean, mode, median, stddev);\r
+ DialogAutoScaleParameters dialogAutoScale (m_frame, mean, mode, median, stddev, m_dAutoScaleFactor);\r
+ int iRetVal = dialogAutoScale.ShowModal();\r
+ if (iRetVal == wxID_OK) {\r
+ m_bMinSpecified = true;\r
+ m_bMaxSpecified = true;\r
+ double dMin, dMax;\r
+ if (dialogAutoScale.getMinMax (&dMin, &dMax)) {\r
+ m_dMinPixel = dMin;\r
+ m_dMaxPixel = dMax;\r
+ m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor();\r
+ OnUpdate (this, NULL);\r
+ }\r
+ }\r
+}\r
+\r
+void \r
+PlotFileView::OnScaleMinMax (wxCommandEvent& event)\r
+{\r
+ const PlotFile& rPlotFile = GetDocument()->getPlotFile();\r
+ double min, max;\r
+\r
+ if (! m_bMinSpecified && ! m_bMaxSpecified) {\r
+ if (! rPlotFile.getMinMax (1, min, max)) {\r
+ *theApp->getLog() << "Error: unable to find Min/Max\n";\r
+ return;\r
+ }\r
+ }\r
+ \r
+ if (m_bMinSpecified)\r
+ min = m_dMinPixel;\r
+ if (m_bMaxSpecified)\r
+ max = m_dMaxPixel;\r
+ \r
+ DialogGetMinMax dialogMinMax (m_frame, "Set Y-axis Minimum & Maximum", min, max);\r
+ int retVal = dialogMinMax.ShowModal();\r
+ if (retVal == wxID_OK) {\r
+ m_bMinSpecified = true;\r
+ m_bMaxSpecified = true;\r
+ m_dMinPixel = dialogMinMax.getMinimum();\r
+ m_dMaxPixel = dialogMinMax.getMaximum();\r
+ OnUpdate (this, NULL);\r
+ }\r
+}\r
+\r
+\r
+PlotFileCanvas*
+PlotFileView::CreateCanvas (wxView *view, wxFrame *parent)
+{
+ PlotFileCanvas* pCanvas;
+ int width, height;
+ parent->GetClientSize(&width, &height);
+
+ pCanvas = new PlotFileCanvas (dynamic_cast<PlotFileView*>(view), parent, wxPoint(0, 0), wxSize(width, height), 0);
+
+ pCanvas->SetBackgroundColour(*wxWHITE);
+ pCanvas->Clear();
+
+ return pCanvas;
+}
+
+wxFrame*
+PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
+{
+ wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(10, 10), wxSize(500, 300), wxDEFAULT_FRAME_STYLE);
+
+ wxMenu *file_menu = new wxMenu;
+
+ file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
+ 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->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");
+
+ wxMenu *view_menu = new wxMenu;\r
+ view_menu->Append(PLOTMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...");\r
+ view_menu->Append(PLOTMENU_VIEW_SCALE_AUTO, "Display Scale &Auto...");\r
+ \r
+ wxMenu *help_menu = new wxMenu;
+ help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents");
+ help_menu->AppendSeparator();
+ help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
+
+ wxMenuBar *menu_bar = new wxMenuBar;
+
+ menu_bar->Append(file_menu, "&File");\r
+ menu_bar->Append(view_menu, "&View");
+ menu_bar->Append(help_menu, "&Help");
+
+ subframe->SetMenuBar(menu_bar);
+
+ subframe->Centre(wxBOTH);
+
+ return subframe;
+}
+
+
+bool
+PlotFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
+{
+ m_frame = CreateChildFrame(doc, this);
+ SetFrame(m_frame);
+
+ int width, height;
+ m_frame->GetClientSize(&width, &height);
+ m_frame->SetTitle ("Plot File");
+ m_canvas = CreateCanvas (this, m_frame);
+
+#ifdef __X__
+ int x, y; // X requires a forced resize
+ m_frame->GetSize(&x, &y);
+ m_frame->SetSize(-1, -1, x, y);
+#endif
+
+ m_frame->Show(true);
+ Activate(true);
+
+ return true;
+}
+
+void
+PlotFileView::OnDraw (wxDC* dc)
+{
+ const PlotFile& rPlotFile = GetDocument()->getPlotFile();\r
+ const int iNColumns = rPlotFile.getNumColumns();\r
+ const int iNRecords = rPlotFile.getNumRecords();\r
+ \r
+ if (iNColumns > 0 && iNRecords > 0) {\r
+ int xsize, ysize;\r
+ m_canvas->GetClientSize (&xsize, &ysize);\r
+ SGPDriver driver (dc, xsize, ysize);\r
+ SGP sgp (driver);\r
+ const PlotFile& rPhantom = GetDocument()->getPlotFile();\r
+ EZPlot plot (sgp);\r
+ \r
+ if (! rPlotFile.getTitle().empty()) {\r
+ std::string s("title ");\r
+ s += rPlotFile.getTitle();\r
+ plot.ezset (s);\r
+ }\r
+ if (! rPlotFile.getXLabel().empty()) {\r
+ std::string s("xlabel ");\r
+ s += rPlotFile.getXLabel();\r
+ plot.ezset (s);\r
+ }\r
+ if (! rPlotFile.getYLabel().empty()) {\r
+ std::string s("ylabel ");\r
+ s += rPlotFile.getYLabel();\r
+ plot.ezset (s);\r
+ }\r
+ \r
+ if (m_bMinSpecified) {\r
+ std::ostringstream os;\r
+ os << "ymin " << m_dMinPixel;\r
+ plot.ezset (os.str());\r
+ }\r
+\r
+ if (m_bMaxSpecified) {\r
+ std::ostringstream os;\r
+ os << "ymax " << m_dMaxPixel;\r
+ plot.ezset (os.str());\r
+ }\r
+\r
+ plot.ezset("box");\r
+ plot.ezset("grid");\r
+ \r
+ double* pdXaxis = new double [iNRecords];\r
+ rPlotFile.getColumn (0, pdXaxis);\r
+ \r
+ double* pdY = new double [iNRecords];\r
+ for (int iCol = 1; iCol < iNColumns; iCol++) {\r
+ rPlotFile.getColumn (iCol, pdY);\r
+ plot.addCurve (pdXaxis, pdY, iNRecords);\r
+ }\r
+ \r
+ delete pdXaxis;\r
+ delete pdY;\r
+ \r
+ plot.plot();\r
+ }\r
+}
+
+
+void
+PlotFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+{
+ if (m_canvas)
+ m_canvas->Refresh();
+}
+
+bool
+PlotFileView::OnClose (bool deleteWindow)
+{
+ if (!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);
+
+ Activate(false);
+
+ if (deleteWindow) {
+ delete m_frame;
+ return true;
+ }
+ return true;
+}
+