** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.59 2001/01/30 01:21:37 kevin Exp $
+** $Id: ctsim.cpp,v 1.60 2001/01/30 05:05:41 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
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.59 2001/01/30 01:21:37 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.60 2001/01/30 05:05:41 kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
m_docManager->FileHistoryLoad(*m_pConfig);
#ifdef CTSIM_MDI
+#if 1
m_pLogDoc = newTextDoc();
if (m_pLogDoc) {
m_pLog = m_pLogDoc->getTextCtrl();
m_pLogDoc->getView()->getFrame()->SetTitle("Log");
int xSize, ySize;
m_pFrame->GetClientSize(&xSize, &ySize);
- int yLogSize = ySize / 3;
+ int yLogSize = ySize / 4;
m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
m_pLogDoc->getView()->getFrame()->Show (true);
} else
+#else
+// wxMDIChildFrame *pLogFrame = new wxMDIChildFrame (m_pFrame, -1, "Log", wxDefaultPosition, wxSize(0,0), wxTHICK_FRAME, "Log");
+ m_pLog = new wxTextCtrl(m_pFrame->GetClientWindow(), -1, "", wxPoint(0,0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
+ int xSize, ySize;
+ m_pFrame->GetClientSize(&xSize, &ySize);
+ int yLogSize = ySize / 5;
+ m_pLog->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+ m_pLog->Show (true);
+ m_pLog->Enable (true);
+#endif
#else
m_pLog = new wxTextCtrl (m_pFrame, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
#endif
: wxDocParentFrame(manager, frame, id, title, pos, size, type, "MainFrame")
#endif
{
+ m_bShuttingDown = false;
+
//// Make a menubar
wxMenu *file_menu = new wxMenu;
MainFrame::~MainFrame()
{
+ m_bShuttingDown = true; // Currently used so that Log Window will close
if (theApp->getConfig())
theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
delete theApp->getDocManager();
MainFrame::OnSize (wxSizeEvent& event)
{
#ifdef CTSIM_MDI
- int xSize, ySize;
- wxMDIParentFrame::GetClientSize(&xSize, &ySize);
-
- if (theApp->getLogDoc()) {
+ if (theApp->getLogDoc()) {
+ int xSize, ySize;
GetClientSize(&xSize, &ySize);
- int yLogSize = ySize / 3;
- theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
- theApp->getLogDoc()->getView()->getFrame()->Show (true);
- }
- //GetClientWindow()->SetSize (0, 0, sizeClient.x, sizeClient.y);
- //GetClientWindow()->Refresh();
+ int yLogSize = ySize / 4;
+ theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+ theApp->getLogDoc()->getView()->getFrame()->Show (true);
+ }
#endif
#if CTSIM_MDI
pFrame->Show (false);
}
}
+ newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
+ newDoc->SetDocumentTemplate (m_pDocTemplProjection);
+ newDoc->OnNewDocument();
}
return newDoc;
pFrame->Show (false);
}
}
+ newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
+ newDoc->SetDocumentTemplate (m_pDocTemplImage);
+ newDoc->OnNewDocument();
}
return newDoc;
pFrame->Show (false);
}
}
+ newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
+ newDoc->SetDocumentTemplate (m_pDocTemplPlot);
+ newDoc->OnNewDocument();
}
return newDoc;
pFrame->Show (false);
}
}
+ newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
+ newDoc->SetDocumentTemplate (m_pDocTemplText);
+ newDoc->OnNewDocument();
}
return newDoc;
if (pFrame)
pFrame->SetSize (0,0);
}
+ newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
+ newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
+ newDoc->OnNewDocument();
}
return newDoc;
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.90 2001/01/30 02:20:50 kevin Exp $
+** $Id: views.cpp,v 1.91 2001/01/30 05:05:41 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
GetDocumentManager()->ActivateView(this, FALSE, TRUE);
}
+
void
ImageFileView::OnProperties (wxCommandEvent& event)
{
os << "Complex\n";
else
os << "Real\n";
- os << "\nMinimum: "<<min<<"\nMaximum: "<<max<<"\nMean: "<<mean<<"\nMedian: "<<median<<"\nMode: "<<mode<<"\nStandard Deviation: "<<stddev << "\n";
+ os << "Minimum: "<<min<<"\nMaximum: "<<max<<"\nMean: "<<mean<<"\nMedian: "<<median<<"\nMode: "<<mode<<"\nStandard Deviation: "<<stddev << "\n";
if (rIF.isComplex()) {
rIF.statistics (rIF.getImaginaryArray(), min, max, mean, mode, median, stddev);
- os << "\nImaginary: min: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
+ os << "Imaginary: min: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
}
if (rIF.nLabels() > 0) {
- os << "\n";
rIF.printLabelsBrief (os);
}
- *theApp->getLog() << os.str().c_str();
+ *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
dialogMsg.ShowModal();
}
os << GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n";
rCompareIF.statistics (min, max, mean, mode, median, stddev);
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);
os << "Comparative Statistics: d=" << d << ", r=" << r << ", e=" << e << "\n";
- *theApp->getLog() << os.str().c_str();
+ *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
if (dialogGetCompare.getMakeDifferenceImage()) {
+ ImageFile* pDifferenceImage = new ImageFile;
+
+ pDifferenceImage->setArraySize (rIF.nx(), rIF.ny());
+ if (! rIF.subtractImages (rCompareIF, *pDifferenceImage)) {
+ *theApp->getLog() << "Unable to subtract images\n";
+ delete pDifferenceImage;
+ return;
+ }
ImageFileDocument* pDifferenceDoc = theApp->newImageDoc();
if (! pDifferenceDoc) {
sys_error (ERR_SEVERE, "Unable to create image file");
return;
}
- ImageFile& differenceImage = pDifferenceDoc->getImageFile();
-
- differenceImage.setArraySize (rIF.nx(), rIF.ny());
- if (! rIF.subtractImages (rCompareIF, differenceImage)) {
- pDifferenceDoc->getView()->getFrame()->Show(true);
- GetDocumentManager()->ActivateView (pDifferenceDoc->getView(), true, false);
- pDifferenceDoc->getView()->getFrame()->SetFocus();
- wxCommandEvent event;
- GetDocumentManager()->OnFileClose (event);
- GetDocumentManager()->ActivateView (this, true, false);
- getFrame()->SetFocus();
- return;
- }
-
+ pDifferenceDoc->setImageFile (pDifferenceImage);
+
wxString s = GetFrame()->GetTitle() + ": ";
- differenceImage.labelsCopy (rIF, s.c_str());
+ pDifferenceImage->labelsCopy (rIF, s.c_str());
s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle() + ": ";
- differenceImage.labelsCopy (rCompareIF, s.c_str());
+ pDifferenceImage->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());
+ pDifferenceImage->labelAdd (os.str().c_str());
pDifferenceDoc->Modify (true);
pDifferenceDoc->UpdateAllViews (this);
pDifferenceDoc->getView()->OnUpdate (this, NULL);
m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S");
m_pFileMenu->Append(wxID_SAVEAS, "Save &As...");
m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W");
+ m_pFileMenu->Append(wxID_REVERT, "Re&vert");
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties");
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append(wxID_PRINT, "&Print...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
- m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
+ m_pFileMenu->Append(wxID_PREVIEW, "Print Preview");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
//GetDocumentManager()->ActivateView (this, false, true);
if (! GetDocument() || ! GetDocument()->Close())
return false;
-
+
+ Activate (false);
if (m_pCanvas) {
m_pCanvas->setView(NULL);
m_pCanvas = NULL;
m_pFrame->SetTitle(s);
SetFrame(NULL);
- Activate(false);
if (deleteWindow) {
m_pFrame->Destroy();
#if DEBUG
rPhantom.print (os);
#endif
- *theApp->getLog() << os.str().c_str() << "\n";
+ *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
wxMessageBox (os.str().c_str(), "Phantom Properties");
}
if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") {
const Phantom& rPhantom = GetDocument()->getPhantom();
- ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc();
- if (! pProjectionDoc) {
- sys_error (ERR_SEVERE, "Unable to create projection document");
- return;
- }
- Projections& rProj = pProjectionDoc->getProjections();
- Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
+ Projections* pProj = new Projections;
+ Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample,
+ m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
if (theScanner.fail()) {
*theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n";
return;
}
- rProj.initFromScanner (theScanner);
+ pProj->initFromScanner (theScanner);
m_dDefaultRotation /= PI; // convert back to PI units
Timer timer;
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++) {
+ ProjectionsDialog dialogProjections (theScanner, *pProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(getFrameForChild()));
+ for (int iView = 0; iView < pProj->nView(); iView++) {
::wxYield();
if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) {
- pProjectionDoc->getView()->getFrame()->Show(true);
- GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false);
- pProjectionDoc->getView()->getFrame()->SetFocus();
- wxCommandEvent event;
- GetDocumentManager()->OnFileClose (event);
- GetDocumentManager()->ActivateView (this, true, false);
- getFrame()->SetFocus();
+ delete pProj;
return;
}
::wxYield();
}
}
} else {
- wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
- for (int i = 0; i < rProj.nView(); i++) {
- theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
+ wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
+ for (int i = 0; i < pProj->nView(); i++) {
+ theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace);
if (! dlgProgress.Update (i+1)) {
- pProjectionDoc->getView()->getFrame()->Show(true);
- GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false);
- pProjectionDoc->getView()->getFrame()->SetFocus();
- wxCommandEvent event;
- GetDocumentManager()->OnFileClose (event);
- GetDocumentManager()->ActivateView (this, true, false);
- getFrame()->SetFocus();
+ delete pProj;
return;
}
}
std::ostringstream os;
os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength << ", FieldOfViewRatio=" << m_dDefaultFieldOfView << ", Geometry=" << sGeometry.c_str();
- rProj.setCalcTime (timer.timerEnd());
- rProj.setRemark (os.str());
+ pProj->setCalcTime (timer.timerEnd());
+ pProj->setRemark (os.str());
*theApp->getLog() << os.str().c_str() << "\n";
::wxYield();
+ ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc();
+ if (! pProjectionDoc) {
+ sys_error (ERR_SEVERE, "Unable to create projection document");
+ return;
+ }
+ pProjectionDoc->setProjections (pProj);
ProjectionFileView* projView = pProjectionDoc->getView();
if (projView) {
projView->OnUpdate (projView, NULL);
m_iDefaultRasterNSamples = 1;
if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) {
const Phantom& rPhantom = GetDocument()->getPhantom();
- ImageFileDocument* pRasterDoc = theApp->newImageDoc();
- if (! pRasterDoc) {
- sys_error (ERR_SEVERE, "Unable to create image file");
- return;
- }
- ImageFile& imageFile = pRasterDoc->getImageFile();
+
+ ImageFile* pImageFile = new ImageFile;
- imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY);
- wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, getFrameForChild(), wxPD_CAN_ABORT);
+ pImageFile->setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY);
+ wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"),
+ pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT);
Timer timer;
- for (unsigned int i = 0; i < imageFile.nx(); i++) {
- rPhantom.convertToImagefile (imageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
+ for (unsigned int i = 0; i < pImageFile->nx(); i++) {
+ rPhantom.convertToImagefile (*pImageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
if (! dlgProgress.Update (i+1)) {
- GetDocumentManager()->ActivateView (pRasterDoc->getView(), true, true);
- pRasterDoc->getView()->getFrame()->SetFocus();
- wxCommandEvent event;
- GetDocumentManager()->OnFileClose (event);
- GetDocumentManager()->ActivateView (this, true, false);
- getFrame()->SetFocus();
+ delete pImageFile;
return;
}
}
+
+ ImageFileDocument* pRasterDoc = theApp->newImageDoc();
+ if (! pRasterDoc) {
+ sys_error (ERR_SEVERE, "Unable to create image file");
+ return;
+ }
+ pRasterDoc->setImageFile (pImageFile);
+
pRasterDoc->Modify (true);
pRasterDoc->UpdateAllViews (this);
pRasterDoc->getView()->getFrame()->Show(true);
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());
+ pImageFile->labelAdd (os.str().c_str(), timer.timerEnd());
ImageFileView* rasterView = pRasterDoc->getView();
if (rasterView) {
rasterView->getFrame()->SetFocus();
if (! GetDocument() || ! GetDocument()->Close())
return false;
+ Activate(false);
if (m_pCanvas) {
m_pCanvas->setView(NULL);
m_pCanvas = NULL;
m_pFrame->SetTitle(s);
SetFrame(NULL);
- Activate(false);
if (deleteWindow) {
- m_pFrame->Destroy();
+ delete m_pFrame;
m_pFrame = NULL;
if (GetDocument() && GetDocument()->getBadFileOpen())
::wxYield(); // wxWindows bug workaround
const Projections& rProj = GetDocument()->getProjections();
std::ostringstream os;
rProj.printScanInfo(os);
- *theApp->getLog() << os.str().c_str();
+ *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION);
dialogMsg.ShowModal();
}
m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str());
m_iDefaultTrace = dialogReconstruction.getTrace();
if (m_iDefaultNX > 0 && m_iDefaultNY > 0) {
- ImageFileDocument* pReconDoc = theApp->newImageDoc();
- if (! pReconDoc) {
- sys_error (ERR_SEVERE, "Unable to create image file");
- return;
- }
- ImageFile& imageFile = pReconDoc->getImageFile();
const Projections& rProj = GetDocument()->getProjections();
- imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
+
+ ImageFile* pImageFile = new ImageFile;
+ pImageFile->setArraySize (m_iDefaultNX, m_iDefaultNY);
- Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
+ Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
Timer timerRecon;
if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
- ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, getFrameForChild());
+ ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, *pImageFile, m_iDefaultTrace, getFrameForChild());
for (int iView = 0; iView < rProj.nView(); iView++) {
- ::wxYield();
::wxYield();
if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
delete pDlgReconstruct;
- delete pReconstruct;
- pReconDoc->getView()->getFrame()->Close(true);
+ delete pReconstructor;
+ delete pImageFile;
return;
}
::wxYield();
- ::wxYield();
while (pDlgReconstruct->isPaused()) {
::wxYield();
::wxUsleep(50);
} else {
wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
for (int i = 0; i < rProj.nView(); i++) {
- pReconstruct->reconstructView (i, 1);
+ pReconstructor->reconstructView (i, 1);
if (! dlgProgress.Update (i + 1)) {
- delete pReconstruct;
- GetDocumentManager()->ActivateView (pReconDoc->getView(), true, true);
- pReconDoc->getView()->getFrame()->SetFocus();
- wxCommandEvent event;
- GetDocumentManager()->OnFileClose (event);
- GetDocumentManager()->ActivateView (this, true, false);
- getFrame()->SetFocus();
+ delete pReconstructor;
+ delete pImageFile;
return;
}
}
}
- delete pReconstruct;
+ delete pReconstructor;
+ ImageFileDocument* pReconDoc = theApp->newImageDoc();
+ if (! pReconDoc) {
+ sys_error (ERR_SEVERE, "Unable to create image file");
+ return;
+ }
+ pReconDoc->setImageFile (pImageFile);
pReconDoc->Modify (true);
pReconDoc->UpdateAllViews (this);
if (ImageFileView* rasterView = pReconDoc->getView()) {
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();
*theApp->getLog() << os.str().c_str() << "\n";
- imageFile.labelAdd (rProj.getLabel());
- imageFile.labelAdd (os.str().c_str(), timerRecon.timerEnd());
+ pImageFile->labelAdd (rProj.getLabel());
+ pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());
}
}
}
if (! GetDocument() || ! GetDocument()->Close())
return false;
+ Activate(false);
if (m_pCanvas) {
m_pCanvas->setView(NULL);
m_pCanvas = NULL;
m_pFrame->SetTitle(s);
SetFrame(NULL);
- Activate(false);
if (deleteWindow) {
- m_pFrame->Destroy();
+ delete m_pFrame;
m_pFrame = NULL;
if (GetDocument() && GetDocument()->getBadFileOpen())
::wxYield(); // wxWindows bug workaround
std::ostringstream os;
os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n";
rPlot.printHeadersBrief (os);
- *theApp->getLog() << os.str().c_str();
+ *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<<\n";
wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION);
dialogMsg.ShowModal();
}
if (! GetDocument() || ! GetDocument()->Close())
return false;
+ Activate(false);
if (m_pCanvas) {
m_pCanvas->setView (NULL);
m_pCanvas = NULL;
if (m_pFrame)
m_pFrame->SetTitle(s);
- Activate(false);
-
SetFrame(NULL);
if (deleteWindow) {
- m_pFrame->Destroy();
+ delete m_pFrame;
m_pFrame = NULL;
if (GetDocument() && GetDocument()->getBadFileOpen())
::wxYield(); // wxWindows bug workaround
bool
TextFileView::OnClose (bool deleteWindow)
{
- // if (m_pFrame && m_pFrame->GetTitle() == "Log")
- return false;
+ if (! theApp->getMainFrame()->getShuttingDown())
+ return false;
+ Activate(false);
//GetDocumentManager()->ActivateView (this, false, true);
if (! GetDocument() || ! GetDocument()->Close())
return false;
- Activate(false);
-
SetFrame(NULL);
if (deleteWindow) {
- m_pFrame->Destroy();
+ delete m_pFrame;
m_pFrame = NULL;
if (GetDocument() && GetDocument()->getBadFileOpen())
::wxYield(); // wxWindows bug workaround
TextFileView::CreateChildFrame (wxDocument *doc, wxView *view)
{
#if CTSIM_MDI
- wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE);
+ wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(0,0), wxDEFAULT_FRAME_STYLE, "Log");
#else
- wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE);
+ wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE, "Log");
#endif
theApp->setIconForFrame (subframe);
projects / ctsim.git / commitdiff