** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.71 2001/01/26 05:37:24 kevin Exp $
+** $Id: views.cpp,v 1.83 2001/01/28 04:24:03 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)
+: 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()
{
- if (m_pView) {
- wxMenu* pMenu = m_pView->getFileMenu();
- theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
- m_pView->canvasClosed();
- m_pView = NULL;
- }
+ m_pView = NULL;
}
void
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), m_pFileMenu(0)
+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
differenceImage.setArraySize (rIF.nx(), rIF.ny());
if (! rIF.subtractImages (rCompareIF, differenceImage)) {
- pDifferenceDoc->DeleteAllViews();
+ pDifferenceDoc->getView()->getFrame()->Close(true);
return;
}
if (theApp->getSetModifyNewDocs())
pDifferenceDoc->Modify(true);
pDifferenceDoc->UpdateAllViews(this);
- pDifferenceDoc->GetFirstView()->OnUpdate (this, NULL);
+ pDifferenceDoc->getView()->OnUpdate (this, NULL);
+ pDifferenceDoc->getView()->getFrame()->Show(true);
}
wxMessageBox(os.str().c_str(), "Image Comparison");
}
if (theApp->getSetModifyNewDocs())
pNewDoc->Modify(TRUE);
pNewDoc->UpdateAllViews(this);
- pNewDoc->GetFirstView()->OnUpdate (this, NULL);
+ pNewDoc->getView()->OnUpdate (this, NULL);
+ pNewDoc->getView()->getFrame()->Show(true);
}
}
}
if (theApp->getSetModifyNewDocs())
pNewDoc->Modify(TRUE);
pNewDoc->UpdateAllViews(this);
- pNewDoc->GetFirstView()->OnUpdate (this, NULL);
+ pNewDoc->getView()->OnUpdate (this, NULL);
+ pNewDoc->getView()->getFrame()->Show(true);
}
}
}
if (theApp->getSetModifyNewDocs())
pNewDoc->Modify(TRUE);
pNewDoc->UpdateAllViews(this);
- pNewDoc->GetFirstView()->OnUpdate (this, NULL);
+ pNewDoc->getView()->OnUpdate (this, NULL);
+ pNewDoc->getView()->getFrame()->Show(true);
}
}
}
if (theApp->getSetModifyNewDocs())
pNewDoc->Modify(TRUE);
pNewDoc->UpdateAllViews(this);
- pNewDoc->GetFirstView()->OnUpdate (this, NULL);
+ pNewDoc->getView()->OnUpdate (this, NULL);
+ pNewDoc->getView()->getFrame()->Show(true);
}
}
}
return pCanvas;
}
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
#if CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
- theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
- theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
wxMenu *view_menu = new wxMenu;
view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale S&et...\tCtrl-E");
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 (this, 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;
void
ImageFileView::OnDraw (wxDC* dc)
{
- wxSize sizeWindow = m_frame->GetClientSize();
- wxSize sizeBest = m_canvas->GetBestSize();
+ wxSize sizeWindow = m_pFrame->GetClientSize();
+ wxSize sizeBest = m_pCanvas->GetBestSize();
if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y)
- m_frame->SetClientSize (sizeBest);
+ 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);
}
int xSize = nx;
int ySize = ny;
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())
+ if (! GetDocument() || ! GetDocument()->Close())
return false;
-// m_canvas->Clear();
-// m_canvas->setView(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->Show(false);
+ m_pFrame->Destroy();
+ m_pFrame = NULL;
}
return true;
}
if (theApp->getSetModifyNewDocs())
pScaledDoc->Modify(TRUE);
pScaledDoc->UpdateAllViews (this);
- pScaledDoc->GetFirstView()->OnUpdate (this, NULL);
+ pScaledDoc->getView()->OnUpdate (this, NULL);
+ pScaledDoc->getView()->getFrame()->Show(true);
}
}
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;
}
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;
}
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;
}
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;
}
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;
}
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;
}
PhantomCanvas::~PhantomCanvas ()
{
- if (m_pView) {
- wxMenu* pMenu = m_pView->getFileMenu();
- theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
- m_pView->canvasClosed();
- m_pView = NULL;
- }
+ m_pView = NULL;
}
void
EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections)
END_EVENT_TABLE()
-PhantomFileView::PhantomFileView(void)
-: wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0)
+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
}
PhantomFileView::~PhantomFileView()
{
+ GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ GetDocumentManager()->ActivateView(this, FALSE, TRUE);
}
void
if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(getFrameForChild()));
for (int iView = 0; iView < rProj.nView(); iView++) {
- ::wxYield();
::wxYield();
if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) {
- pProjectionDoc->DeleteAllViews();
+ pProjectionDoc->getView()->getFrame()->Close(true);
return;
}
::wxYield();
- ::wxYield();
while (dialogProjections.isPaused()) {
::wxYield();
::wxUsleep(50);
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()->Close(true);
return;
}
}
rProj.setRemark (os.str());
*theApp->getLog() << os.str().c_str() << "\n";
- m_frame->Lower();
+ m_pFrame->Lower();
::wxYield();
ProjectionFileView* projView = dynamic_cast<ProjectionFileView*>(pProjectionDoc->GetFirstView());
if (projView) {
pFrame->SetFocus();
pFrame->Raise();
}
- theApp->getDocManager()->ActivateView (pView, true, false);
+ GetDocumentManager()->ActivateView (pView, true, false);
}
::wxYield();
if (theApp->getSetModifyNewDocs())
pProjectionDoc->Modify(true);
+ pProjectionDoc->getView()->getFrame()->Show(true);
pProjectionDoc->UpdateAllViews(this);
}
}
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();
+ pRasterDoc->Close();
+ pRasterDoc->getView()->getFrame()->Close(true);
return;
}
}
if (theApp->getSetModifyNewDocs())
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;
return pCanvas;
}
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
#if CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
- theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
- theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
wxMenu *process_menu = new wxMenu;
process_menu->Append(PHMMENU_PROCESS_RASTERIZE, "&Rasterize...\tCtrl-R");
bool
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("PhantomFileView");
- m_canvas = CreateCanvas (this, m_frame);
+ m_pFrame->GetClientSize(&width, &height);
+ m_pFrame->SetTitle("PhantomFileView");
+ m_pCanvas = CreateCanvas (this, 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
PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
- if (m_canvas)
- m_canvas->Refresh();
+ if (m_pCanvas)
+ m_pCanvas->Refresh();
}
bool
PhantomFileView::OnClose (bool deleteWindow)
{
- if (!GetDocument()->Close())
+ if (! GetDocument() || ! GetDocument()->Close())
return false;
-// m_canvas->Clear();
-// m_canvas->setView(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;
- m_frame = NULL;
+ m_pFrame->Show(false);
+ m_pFrame->Destroy();
+ m_pFrame = NULL;
}
return true;
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();
ProjectionFileCanvas::~ProjectionFileCanvas ()
{
- if (m_pView) {
- wxMenu* pMenu = m_pView->getFileMenu();
- theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
- m_pView->canvasClosed();
- m_pView = NULL;
- }
+ m_pView = NULL;
}
void
EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar)
END_EVENT_TABLE()
-ProjectionFileView::ProjectionFileView(void)
-: wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0)
+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
m_iDefaultPolarZeropad = 1;
}
-ProjectionFileView::~ProjectionFileView(void)
+ProjectionFileView::~ProjectionFileView()
{
+ GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
}
void
if (theApp->getSetModifyNewDocs())
pPolarDoc->Modify(true);
pPolarDoc->UpdateAllViews();
- pPolarDoc->GetFirstView()->OnUpdate (this, NULL);
+ pPolarDoc->getView()->OnUpdate (this, NULL);
+ pPolarDoc->getView()->getFrame()->Show(true);
}
}
if (theApp->getSetModifyNewDocs())
pPolarDoc->Modify(true);
pPolarDoc->UpdateAllViews();
- pPolarDoc->GetFirstView()->OnUpdate (this, NULL);
-}}
+ pPolarDoc->getView()->OnUpdate (this, NULL);
+ pPolarDoc->getView()->getFrame()->Show(true);
+ }
+}
void
ProjectionFileView::OnReconstructFourier (wxCommandEvent& event)
if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
delete pDlgReconstruct;
delete pReconstruct;
- pReconDoc->DeleteAllViews();
+ pReconDoc->getView()->getFrame()->Close(true);
return;
}
::wxYield();
pReconstruct->reconstructView (i, 1);
if (! dlgProgress.Update(i + 1)) {
delete pReconstruct;
- pReconDoc->DeleteAllViews();
+ pReconDoc->getView()->getFrame()->Close(true);
return;
}
}
if (theApp->getSetModifyNewDocs())
pReconDoc->Modify(true);
pReconDoc->UpdateAllViews(this);
+ pReconDoc->getView()->getFrame()->Show(true);
ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pReconDoc->GetFirstView());
if (rasterView) {
rasterView->getFrame()->SetFocus();
return pCanvas;
}
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
- theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
- theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
wxMenu *convert_menu = new wxMenu;
convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L");
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(this, 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
ProjectionFileView::OnDraw (wxDC* dc)
{
- wxSize clientSize = m_frame->GetClientSize();
- wxSize bestSize = m_canvas->GetBestSize();
+ wxSize clientSize = m_pFrame->GetClientSize();
+ wxSize bestSize = m_pCanvas->GetBestSize();
if (clientSize.x > bestSize.x || clientSize.y > bestSize.y)
- m_frame->SetClientSize (bestSize);
+ m_pFrame->SetClientSize (bestSize);
if (m_bitmap.Ok())
dc->DrawBitmap (m_bitmap, 0, 0, false);
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())
+ if (! GetDocument() || ! GetDocument()->Close())
return false;
- //m_canvas->Clear();
- //m_canvas->setView(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->Show(false);
+ m_pFrame->Destroy();
+ m_pFrame = NULL;
}
return true;
}
PlotFileCanvas::~PlotFileCanvas ()
{
- if (m_pView) {
- wxMenu* pMenu = m_pView->getFileMenu();
- theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
- m_pView->canvasClosed();
- m_pView = NULL;
- }
+ m_pView = NULL;
}
void
EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull)
END_EVENT_TABLE()
-PlotFileView::PlotFileView(void)
-: wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL), m_pFileMenu(0)
+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
return pCanvas;
}
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
{
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
- theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
- theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
wxMenu *view_menu = new wxMenu;
view_menu->Append(PLOTMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...\tCtrl-E");
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 (this, 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;
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)
delete pdY;
}
- if (m_canvas)
- m_canvas->Refresh();
+ if (m_pCanvas)
+ m_pCanvas->Refresh();
}
bool
PlotFileView::OnClose (bool deleteWindow)
{
- if (!GetDocument()->Close())
+ if (! GetDocument() || ! GetDocument()->Close())
return false;
- //m_canvas->Clear();
- //m_canvas->setView (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);
Activate(false);
+ m_pFrame->SetView(NULL);
+ SetFrame(NULL);
if (deleteWindow) {
- delete m_frame;
- return true;
+ m_pFrame->Show(false);
+ m_pFrame->Destroy();
+ m_pFrame = NULL;
}
return true;
}
TextFileView::~TextFileView()
{
+ GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
}
bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
bool
TextFileView::OnClose (bool deleteWindow)
{
- return false;
+ // if (m_pFrame && m_pFrame->GetTitle() == "Log")
+ return false;
- if (!GetDocument()->Close())
+ if (! GetDocument() || ! GetDocument()->Close())
return false;
+ m_pCanvas->Show(false);
Activate(false);
-
- if (deleteWindow)
- {
- delete m_pFrame;
- return TRUE;
+
+ SetFrame(NULL);
+ m_pFrame->SetView(NULL);
+ if (deleteWindow) {
+ m_pFrame->Show(false);
+ m_pFrame->Destroy();
+ m_pFrame = NULL;
+
}
return TRUE;
}
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
TextFileView::CreateChildFrame (wxDocument *doc, wxView *view)
{
#if CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
- theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
- theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+ GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
// Define a constructor for my text subwindow
TextFileCanvas::TextFileCanvas (TextFileView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style)
- : wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v)
+: wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v)
{
}
TextFileCanvas::~TextFileCanvas ()
{
- if (m_pView) {
- wxMenu* pMenu = m_pView->getFileMenu();
- theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
- m_pView->canvasClosed();
- m_pView = NULL;
- }
+ m_pView = NULL;
}