** Date Started: July 2000
**
** This is part of the CTSim program
-** Copyright (c) 1983-2001 Kevin Rosenberg
-**
-** $Id$
+** Copyright (c) 1983-2009 Kevin Rosenberg
**
** 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
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
- os << "Row " << yCursor;
+ os << "Row " << yCursor << ": ";
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
}
for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
- os << " Plot of " << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str();
+ os << " Plot of " << wxConvUTF8.cWX2MB(dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str());
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
- os << "Column " << xCursor;
+ os << "Column " << xCursor << ": ";
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
}
for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
- os << " Plot of " << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str();
+ os << " Plot of " << wxConvUTF8.cWX2MB(dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str());
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
- os << "Histogram";
+ os << "Histogram ";
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
os << ": " << rIF.labelGet(iL).getLabelString();
rPlotFile.addDescription (os.str().c_str());
}
- os << " plot of " << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str();
+ os << " Plot of " << wxConvUTF8.cWX2MB(dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str());
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
delete pX;
}
std::ostringstream os;
- os << "Projections for " << rPhantom.name()
- << ": nDet=" << m_iDefaultNDet
- << ", nView=" << m_iDefaultNView
- << ", gantry offset=" << m_iDefaultOffsetView
- << ", nSamples=" << m_iDefaultNSample
- << ", RotAngle=" << m_dDefaultRotation
- << ", FocalLengthRatio=" << m_dDefaultFocalLength
- << ", CenterDetectorLengthRatio=" << m_dDefaultCenterDetectorLength
- << ", ViewRatio=" << m_dDefaultViewRatio
- << ", ScanRatio=" << m_dDefaultScanRatio
- << ", Geometry=" << sGeometry.c_str()
- << ", FanBeamAngle=" << convertRadiansToDegrees (theScanner.fanBeamAngle());
+ os << "Projections for " << rPhantom.name().c_str()
+ << ": nDet=" << m_iDefaultNDet
+ << ", nView=" << m_iDefaultNView
+ << ", gantry offset=" << m_iDefaultOffsetView
+ << ", nSamples=" << m_iDefaultNSample
+ << ", RotAngle=" << m_dDefaultRotation
+ << ", FocalLengthRatio=" << m_dDefaultFocalLength
+ << ", CenterDetectorLengthRatio=" << m_dDefaultCenterDetectorLength
+ << ", ViewRatio=" << m_dDefaultViewRatio
+ << ", ScanRatio=" << m_dDefaultScanRatio
+ << ", Geometry=" << sGeometry.mb_str(wxConvUTF8)
+ << ", FanBeamAngle=" << convertRadiansToDegrees (theScanner.fanBeamAngle());
Timer timer;
Projections* pProj = NULL;
PhantomCanvas*
PhantomFileView::CreateCanvas (wxFrame *parent)
{
- PhantomCanvas* pCanvas = new PhantomCanvas (this, parent, wxPoint(-1,-1),
- wxSize(-1,-1), 0);
+ PhantomCanvas* pCanvas =
+ new PhantomCanvas (this, parent, wxPoint(-1,-1),
+ wxSize(-1,-1), wxFULL_REPAINT_ON_RESIZE);
pCanvas->SetBackgroundColour(*wxWHITE);
pCanvas->ClearBackground();
{
PlotFileCanvas* pCanvas;
- pCanvas = new PlotFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), 0);
+ pCanvas = new PlotFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1),
+ wxFULL_REPAINT_ON_RESIZE);
pCanvas->SetBackgroundColour(*wxWHITE);
pCanvas->ClearBackground();