r334: *** empty log message ***

[ctsim.git] / src / views.cpp

diff --git a/src/views.cpp b/src/views.cpp
index 0a8f4c8b7472f9c4c9850ea9c01bf130d39efcb4..454b7d27e9fcac5ccd54ec00f6dd851fcd2bc862 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.45 2001/01/02 06:29:23 kevin Exp $
+**  $Id: views.cpp,v 1.46 2001/01/02 08:18:33 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
@@ -1289,6 +1289,7 @@ PhantomView::OnProjections (wxCommandEvent& event)
       rProj.initFromScanner (theScanner);
       m_dDefaultRotation /= PI;  // convert back to PI units
       
+      Timer timer;\r
       if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
         ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(m_frame));
         for (int iView = 0; iView < rProj.nView(); iView++) {
@@ -1306,7 +1307,7 @@ PhantomView::OnProjections (wxCommandEvent& event)
           }
         }
       } else {
-        wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT);
+        wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT);\r
         for (int i = 0; i < rProj.nView(); i++) {
           theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
           if (! dlgProgress.Update (i+1)) {
@@ -1317,7 +1318,8 @@ PhantomView::OnProjections (wxCommandEvent& event)
       }
       
       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();
+      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();\r
+      rProj.setCalcTime (timer.timerEnd());
       rProj.setRemark (os.str());
       *theApp->getLog() << os.str().c_str() << "\n";