** 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.75 2001/01/26 23:23:00 kevin Exp $
+** $Id: views.cpp,v 1.84 2001/01/28 19:10:18 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()
{
- m_pView = NULL;
+ m_pView = NULL;
}
void
END_EVENT_TABLE()
ImageFileView::ImageFileView()
-: wxView(), m_canvas(NULL), m_pFrame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0)
+: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false)
{
m_iDefaultExportFormatID = ImageFile::FORMAT_PNG;
}
ImageFileView::~ImageFileView()
{
- theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ 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);
}
}
}
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<ImageFileView*>(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);
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");
ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
{
m_pFrame = CreateChildFrame(doc, this);
- SetFrame (m_pFrame);
+ (m_pFrame);
m_bMinSpecified = false;
m_bMaxSpecified = false;
int width, height;
m_pFrame->GetClientSize (&width, &height);
m_pFrame->SetTitle("ImageFileView");
- m_canvas = CreateCanvas (this, m_pFrame);
+ m_pCanvas = CreateCanvas (m_pFrame);
int x, y; // X requires a forced resize
m_pFrame->GetSize(&x, &y);
ImageFileView::OnDraw (wxDC* dc)
{
wxSize sizeWindow = m_pFrame->GetClientSize();
- wxSize sizeBest = m_canvas->GetBestSize();
+ wxSize sizeBest = m_pCanvas->GetBestSize();
if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y)
m_pFrame->SetClientSize (sizeBest);
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<ImageFileDocument*>(GetDocument())->getImageFile();
+ const ImageFile& rIF = GetDocument()->getImageFile();
ImageFileArrayConst v = rIF.getArray();
int nx = rIF.nx();
int ny = rIF.ny();
int ySize = ny;
ySize = clamp (ySize, 0, 800);
m_pFrame->SetClientSize (xSize, ySize);
- m_canvas->SetScrollbars(20, 20, nx/20, ny/20);
- m_canvas->SetBackgroundColour(*wxWHITE);
+ 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
if (! GetDocument() || ! GetDocument()->Close())
return false;
- if (m_canvas) {
- m_canvas->Clear();
- m_canvas->Show(false);
- m_canvas->setView(NULL);
- m_canvas = NULL;
+ if (m_pCanvas) {
+ m_pCanvas->Show(false);
+ m_pCanvas->setView(NULL);
+ m_pCanvas = NULL;
}
wxString s(theApp->GetAppName());
if (m_pFrame)
m_pFrame->SetTitle(s);
- SetFrame(NULL);
+ SetFrame(NULL);
Activate(false);
-
+
if (deleteWindow) {
- m_pFrame->Show(false);
- m_pFrame->Destroy();
-// delete m_pFrame;
+ m_pFrame->Show(false);
+ ::wxYield();
+ m_pFrame->Destroy();
m_pFrame = NULL;
}
return true;
void
ImageFileView::OnExport (wxCommandEvent& event)
{
- ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+ ImageFile& rIF = GetDocument()->getImageFile();
ImageFileArrayConst v = rIF.getArray();
int nx = rIF.nx();
int ny = rIF.ny();
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;
}
- const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+ const ImageFile& rIF = GetDocument()->getImageFile();
ImageFileArrayConst v = rIF.getArray();
ImageFileArrayConst vImag = rIF.getImaginaryArray();
int nx = rIF.nx();
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<ImageFileDocument*>(GetDocument())->getImageFile();
+ const ImageFile& rIF = GetDocument()->getImageFile();
ImageFileArrayConst v = rIF.getArray();
ImageFileArrayConst vImag = rIF.getImaginaryArray();
int nx = rIF.nx();
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<ImageFileDocument*>(GetDocument())->getImageFile();
+ const ImageFile& rIF = GetDocument()->getImageFile();
ImageFileArrayConst v = rIF.getArray();
ImageFileArrayConst vImag = rIF.getImaginaryArray();
int nx = rIF.nx();
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<ImageFileDocument*>(GetDocument())->getImageFile();
+ const ImageFile& rIF = GetDocument()->getImageFile();
ImageFileArrayConst v = rIF.getArray();
ImageFileArrayConst vImag = rIF.getImaginaryArray();
int nx = rIF.nx();
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;
}
void
ImageFileView::OnPlotHistogram (wxCommandEvent& event)
{
- const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+ const ImageFile& rIF = GetDocument()->getImageFile();
ImageFileArrayConst v = rIF.getArray();
int nx = rIF.nx();
int ny = rIF.ny();
PhantomCanvas::~PhantomCanvas ()
{
- m_pView = NULL;
+ m_pView = NULL;
}
void
END_EVENT_TABLE()
PhantomFileView::PhantomFileView()
-: wxView(), m_canvas(NULL), m_pFrame(NULL), m_pFileMenu(0)
+: 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;
+#endif
m_iDefaultNSample = 1;
m_dDefaultRotation = 1;
m_dDefaultFocalLength = 2;
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()
{
- theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ 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;
}
}
m_pFrame->Lower();
::wxYield();
- ProjectionFileView* projView = dynamic_cast<ProjectionFileView*>(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())
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;
*theApp->getLog() << os.str().c_str() << "\n";
imageFile.labelAdd (os.str().c_str(), timer.timerEnd());
- ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pRasterDoc->GetFirstView());
+ ImageFileView* rasterView = pRasterDoc->getView();
if (rasterView) {
rasterView->getFrame()->SetFocus();
rasterView->OnUpdate (rasterView, NULL);
PhantomCanvas*
-PhantomFileView::CreateCanvas (wxView *view, wxFrame *parent)
+PhantomFileView::CreateCanvas (wxFrame *parent)
{
PhantomCanvas* pCanvas;
int width, height;
parent->GetClientSize(&width, &height);
- pCanvas = new PhantomCanvas (dynamic_cast<PhantomFileView*>(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();
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");
int width, height;
m_pFrame->GetClientSize(&width, &height);
m_pFrame->SetTitle("PhantomFileView");
- m_canvas = CreateCanvas (this, m_pFrame);
+ m_pCanvas = CreateCanvas (m_pFrame);
#ifdef __X__
int x, y; // X requires a forced resize
void
PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
- if (m_canvas)
- m_canvas->Refresh();
+ if (m_pCanvas)
+ m_pCanvas->Refresh();
}
bool
if (! GetDocument() || ! GetDocument()->Close())
return false;
- if (m_canvas) {
- m_canvas->Clear();
- m_canvas->setView(NULL);
- m_canvas->Show(false);
- m_canvas = NULL;
+ if (m_pCanvas) {
+ m_pCanvas->Show(false);
+ m_pCanvas->setView(NULL);
+ m_pCanvas = NULL;
}
wxString s(wxTheApp->GetAppName());
if (m_pFrame)
m_pFrame->SetTitle(s);
- SetFrame(NULL);
+ SetFrame(NULL);
Activate(false);
if (deleteWindow) {
- m_pFrame->Show(false);
- m_pFrame->Destroy();
-// delete m_pFrame;
+ m_pFrame->Show(false);
+ ::wxYield();
+ m_pFrame->Destroy();
m_pFrame = NULL;
}
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 ()
{
- m_pView = NULL;
+ m_pView = NULL;
}
void
END_EVENT_TABLE()
ProjectionFileView::ProjectionFileView()
-: wxView(), m_canvas(NULL), m_pFrame(NULL), m_pFileMenu(0)
+: 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
ProjectionFileView::~ProjectionFileView()
{
- theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ 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);
- ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pReconDoc->GetFirstView());
- if (rasterView) {
- rasterView->getFrame()->SetFocus();
+ 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();
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<ProjectionFileView*>(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);
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");
SetFrame(m_pFrame);
int width, height;
- m_pFrame->GetClientSize(&width, &height);
- m_pFrame->SetTitle("ProjectionFileView");
- m_canvas = CreateCanvas(this, m_pFrame);
+ m_pFrame->GetClientSize (&width, &height);
+ m_pFrame->SetTitle ("ProjectionFileView");
+ m_pCanvas = CreateCanvas (m_pFrame);
#ifdef __X__
int x, y; // X requires a forced resize
ProjectionFileView::OnDraw (wxDC* dc)
{
wxSize clientSize = m_pFrame->GetClientSize();
- wxSize bestSize = m_canvas->GetBestSize();
+ wxSize bestSize = m_pCanvas->GetBestSize();
if (clientSize.x > bestSize.x || clientSize.y > bestSize.y)
m_pFrame->SetClientSize (bestSize);
xSize = clamp (xSize, 0, 800);
ySize = clamp (ySize, 0, 800);
m_pFrame->SetClientSize (xSize, ySize);
- m_canvas->SetScrollbars (20, 20, nDet/20, nView/20);
+ m_pCanvas->SetScrollbars (20, 20, nDet/20, nView/20);
}
- if (m_canvas)
- m_canvas->Refresh();
+ if (m_pCanvas)
+ m_pCanvas->Refresh();
}
bool
if (! GetDocument() || ! GetDocument()->Close())
return false;
- if (m_canvas) {
- m_canvas->Clear();
- m_canvas->setView(NULL);
- m_canvas->Show(false);
- m_canvas = NULL;
+ if (m_pCanvas) {
+ m_pCanvas->Show(false);
+ m_pCanvas->setView(NULL);
+ m_pCanvas = NULL;
}
wxString s(wxTheApp->GetAppName());
if (m_pFrame)
m_pFrame->SetTitle(s);
-// SetFrame(NULL);
+ SetFrame(NULL);
Activate(false);
if (deleteWindow) {
- m_pFrame->Show(false);
- m_pFrame->Destroy();
-// delete m_pFrame;
+ m_pFrame->Show(false);
+ ::wxYield();
+ m_pFrame->Destroy();
m_pFrame = NULL;
}
return true;
PlotFileCanvas::~PlotFileCanvas ()
{
- m_pView = NULL;
+ m_pView = NULL;
}
void
END_EVENT_TABLE()
PlotFileView::PlotFileView()
-: wxView(), m_canvas(NULL), m_pFrame(NULL), m_pEZPlot(NULL), m_pFileMenu(0)
+: 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()
{
if (m_pEZPlot)
delete m_pEZPlot;
-
- theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+
+ GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
}
void
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<PlotFileView*>(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();
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");
int width, height;
m_pFrame->GetClientSize(&width, &height);
m_pFrame->SetTitle ("Plot File");
- m_canvas = CreateCanvas (this, m_pFrame);
+ m_pCanvas = CreateCanvas (m_pFrame);
#ifdef __X__
int x, y; // X requires a forced resize
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
if (! GetDocument() || ! GetDocument()->Close())
return false;
- if (m_canvas) {
- m_canvas->Clear();
- m_canvas->setView (NULL);
- m_canvas->Show(false);
- m_canvas = NULL;
+ if (m_pCanvas) {
+ m_pCanvas->Show(false);
+ m_pCanvas->setView (NULL);
+ m_pCanvas = NULL;
}
wxString s(wxTheApp->GetAppName());
if (m_pFrame)
m_pFrame->SetTitle(s);
- SetFrame(NULL);
Activate(false);
+ m_pFrame->SetView(NULL);
+ SetFrame(NULL);
if (deleteWindow) {
- m_pFrame->Show(false);
- m_pFrame->Destroy();
-// delete m_pFrame;
+ m_pFrame->Show(false);
+ ::wxYield();
+ m_pFrame->Destroy();
m_pFrame = NULL;
}
return true;
TextFileView::~TextFileView()
{
- theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+ GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
}
bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
bool
TextFileView::OnClose (bool deleteWindow)
{
- if (m_pFrame && m_pFrame->GetTitle() == "Log")
- return false;
+ // if (m_pFrame && m_pFrame->GetTitle() == "Log")
+ return false;
if (! GetDocument() || ! GetDocument()->Close())
return false;
-
+
m_pCanvas->Show(false);
Activate(false);
-
+
+ SetFrame(NULL);
+ m_pFrame->SetView(NULL);
if (deleteWindow) {
- m_pFrame->Show(false);
- m_pFrame->Destroy();
-// delete m_pFrame;
- m_pFrame = NULL;
-
+ m_pFrame->Show(false);
+ ::wxYield();
+ m_pFrame->Destroy();
+ m_pFrame = NULL;
+
}
return TRUE;
}
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 ()
{
- m_pView = NULL;
+ m_pView = NULL;
}
projects / ctsim.git / blobdiff