From: Kevin Rosenberg Date: Mon, 3 Aug 2009 04:12:09 +0000 (-0600) Subject: Automated commit for upstream build of version 5.0.5 X-Git-Tag: v5.0.5^0 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=c2aaf11a652d43cf38959a33fe4a1275351351d2;hp=f0f1edcc896c4019af018cba6bf22e7092b3fd9e Automated commit for upstream build of version 5.0.5 --- diff --git a/ChangeLog b/ChangeLog index 2e4574d..4b8c226 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Aug 3, 2009 Version 5.0.5 + * More wx2.8 compatibility fixes. + * Fix initial size of Log TextCtrl at start-up. + * Fix display of values in Log window by cleaning up string + transformtions. + Aug 2, 2009 Version 5.0.4 * More wx2.8 compatibility fixes. Ensure that a resize of a window causes a full repaint for phantom, plot, and graph3d canvases. diff --git a/debian/changelog b/debian/changelog index 2a6ece0..0dd92fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,15 @@ -ctsim (5.0.4-1) unstable; urgency=low +ctsim (5.0.5-1) unstable; urgency=low * New upstream - -- Kevin M. Rosenberg Sun, 02 Aug 2009 16:08:13 -0600 - + -- Kevin M. Rosenberg Sun, 02 Aug 2009 22:11:51 -0600 + ctsim (5.0.3-1) unstable; urgency=low * Add autoconf generated files back to upstream * Remove use of autoreconf from rules - -- Kevin M. Rosenberg Sun, 02 Aug 2009 16:08:04 -0600 + -- Kevin M. Rosenberg Sun, 02 Aug 2009 22:11:47 -0600 ctsim (5.0.2-1) unstable; urgency=low diff --git a/include/phantom.h b/include/phantom.h index 9fb9104..0b66b49 100644 --- a/include/phantom.h +++ b/include/phantom.h @@ -7,9 +7,7 @@ ** Date Started: July 1, 1984 ** ** 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 diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp index f9bb1db..ba4b0e4 100644 --- a/libctsim/phantom.cpp +++ b/libctsim/phantom.cpp @@ -7,9 +7,7 @@ ** Date Started: Aug 1984 ** ** 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 diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 48dd536..d58e7da 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -7,9 +7,7 @@ ** 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 @@ -179,13 +177,13 @@ CTSimApp::OnInit() int xDisplay, yDisplay; ::wxDisplaySize (&xDisplay, &yDisplay); - m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, _T("CTSim"), wxPoint(0, 0), #ifdef CTSIM_MDI - wxSize(nearest(xDisplay * .75), nearest(yDisplay * .75)), + wxSize frameSize(nearest(xDisplay * .75), nearest(yDisplay * .75)); #else - wxSize(nearest(xDisplay * .6), nearest(yDisplay * .4)), + wxSize frameSize(nearest(xDisplay * .6), nearest(yDisplay * .4)); #endif - wxDEFAULT_FRAME_STYLE); + + m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, _T("CTSim"), wxPoint(0, 0), frameSize, wxDEFAULT_FRAME_STYLE); setIconForFrame (m_pFrame); m_pFrame->Centre(wxBOTH); @@ -209,7 +207,7 @@ CTSimApp::OnInit() m_pLogDoc->getView()->getFrame()->Show (true); } else #else - m_pLog = new wxTextCtrl (m_pFrame, -1, _T("Log Window\n"), wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY); + m_pLog = new wxTextCtrl (m_pFrame, -1, _T("Log Window\n"), wxPoint(0, 0), frameSize, wxTE_MULTILINE | wxTE_READONLY); #endif wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog)); diff --git a/src/ctsim.h b/src/ctsim.h index 8e3b357..f3f8083 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -7,9 +7,7 @@ ** 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 diff --git a/src/views.cpp b/src/views.cpp index b238a81..690ac22 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -1413,7 +1413,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) } 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()); @@ -1443,7 +1443,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) } for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str()); - os << " Plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + os << " Plot of " << wxConvUTF8.cWX2MB(dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str()); *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); } @@ -1499,7 +1499,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) } 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()); @@ -1529,7 +1529,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) } for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str()); - os << " Plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + os << " Plot of " << wxConvUTF8.cWX2MB(dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str()); *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); } @@ -1965,7 +1965,7 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) PlotFile& rPlotFile = pPlotDoc->getPlotFile(); std::ostringstream os; - os << "Histogram"; + os << "Histogram "; std::string title("title "); title += os.str(); rPlotFile.addEzsetCommand (title.c_str()); @@ -1982,7 +1982,7 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) os << ": " << rIF.labelGet(iL).getLabelString(); rPlotFile.addDescription (os.str().c_str()); } - os << " plot of " << dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(); + os << " Plot of " << wxConvUTF8.cWX2MB(dynamic_cast(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str()); *theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n"); rPlotFile.addDescription (os.str().c_str()); delete pX; @@ -2143,18 +2143,18 @@ PhantomFileView::OnProjections (wxCommandEvent& event) } 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;