r1018: *** empty log message ***

[ctsim.git] / src / dlgprojections.cpp

diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp
index fb2f8cdf9835d221e3eb5d8369b8c198c62c520c..7624beb76f0227ec8b2acf8dc7abae4526e66862 100644 (file)
--- a/src/dlgprojections.cpp
+++ b/src/dlgprojections.cpp
@@ -7,9 +7,9 @@
 **   Date Started:  August 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgprojections.cpp,v 1.15 2001/01/02 16:02:13 kevin Exp $
+**  $Id: dlgprojections.cpp,v 1.24 2001/09/24 09:40:42 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
@@ -29,13 +29,8 @@
 #pragma implementation "dlgprojections.h"
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/frame.h"
@@ -68,7 +63,8 @@ IMPLEMENT_CLASS(ProjectionsDialog, wxDialog)
 
 
 ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, const Phantom& rPhantom, const int iTrace, wxWindow *parent)
-: wxDialog(parent, -1, "Collect Projections", wxDefaultPosition), m_rScanner(rScanner), m_rProjections(rProj), m_rPhantom(rPhantom), m_pSGPDriver(NULL), m_pSGP(NULL), m_iTrace(iTrace), m_pDC(NULL), m_btnAbort(0), m_btnPause(0), m_btnStep(0)
+: wxDialog(parent, -1, "Collect Projections", wxDefaultPosition), m_rScanner(rScanner), m_rProjections(rProj), m_rPhantom(rPhantom), 
+  m_pSGPDriver(NULL), m_pSGP(NULL), m_iTrace(iTrace), m_pDC(NULL), m_btnAbort(0), m_btnPause(0), m_btnStep(0)
 {
     m_state = Continue;
     m_iLastView = -1;
@@ -135,7 +131,7 @@ ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, con
        
     wxYield();     // Update the display
        
-    m_pSGPDriver->idWX()->SetFont(*wxSWISS_FONT);
+    m_pSGP->setTextPointSize(10);
 #ifdef __WXMAC__
     MacUpdateImmediately();
 #endif
@@ -155,7 +151,7 @@ ProjectionsDialog::showView (int iViewNumber)
                if (m_iTrace >= Trace::TRACE_PLOT)
                        m_pSGP->setViewport (0, 0, 0.66, 1);
                ::wxYield();        // update the display
-               m_rScanner.collectProjections (m_rProjections, m_rPhantom, iViewNumber, 1, true, m_iTrace, m_pSGP);
+               m_rScanner.collectProjections (m_rProjections, m_rPhantom, iViewNumber, 1, m_rScanner.offsetView(), true, m_iTrace, m_pSGP);
                ::wxYield();        // update the display
                if (m_iTrace >= Trace::TRACE_PLOT) {
                        const DetectorArray& detArray = m_rProjections.getDetectorArray (iViewNumber);
@@ -167,8 +163,18 @@ ProjectionsDialog::showView (int iViewNumber)
                        ezplot.ezset ("grid");
                        ezplot.ezset ("box");
                        ezplot.ezset ("yticks left");
+                       ezplot.ezset ("xticks major 5");
+                       ezplot.ezset ("yticks major 10");
                        ezplot.addCurve (detValues, detPos, detArray.nDet());
+#if 1
+      ezplot.ezset ("xporigin 0.67");
+      ezplot.ezset ("yporigin 0.10");
+      ezplot.ezset ("xlength  0.33");
+      ezplot.ezset ("ylength  0.90");
+                       m_pSGP->setViewport (0., 0., 1., 1.);
+#else
                        m_pSGP->setViewport (0.67, 0.1, 1., 1.);
+#endif
                        ezplot.plot (m_pSGP);
                        delete detPos;
                }
@@ -228,7 +234,6 @@ ProjectionsDialog::OnPause (wxCommandEvent& event)
        } else if (m_state == Continue) {
                m_memoryDC.SelectObject (m_bitmap);       // in memoryDC
                m_pSGP->setDC (&m_memoryDC);
-               m_memoryDC.SetFont (*wxSWISS_FONT);
                showView (m_iLastView);
                m_state = Paused;
                m_btnPause->SetLabel (wxString("Resume"));
@@ -248,7 +253,6 @@ ProjectionsDialog::OnStep (wxCommandEvent& event)
        } else if (m_state == Continue) {
                m_memoryDC.SelectObject (m_bitmap);       // in memoryDC
                m_pSGP->setDC (&m_memoryDC);
-               m_memoryDC.SetFont (*wxSWISS_FONT);
                showView (m_iLastView);
                // m_rScanner.collectProjections (m_rProjections, m_rPhantom, m_iLastView, 1, true, m_iTrace, m_pSGP);
                m_state = Paused;
@@ -259,7 +263,6 @@ ProjectionsDialog::OnStep (wxCommandEvent& event)
        } else if (m_state == Paused) {
                m_memoryDC.SelectObject (m_bitmap);       // in memoryDC
                m_pSGP->setDC (&m_memoryDC);
-               m_memoryDC.SetFont (*wxSWISS_FONT);
                projectView (m_iLastView + 1);
                m_pSGP->setDC (m_pDC);
                m_memoryDC.SelectObject(wxNullBitmap);