X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdlgprojections.cpp;h=7624beb76f0227ec8b2acf8dc7abae4526e66862;hp=d340914efbb07424ac7bab15a599c0f02cbf6758;hb=bd1d464294e037da19ccc80d8cc60475768eb2ca;hpb=c8ec665dde5df59539daf63e0a6a44f27550258b diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp index d340914..7624beb 100644 --- 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.17 2001/01/17 06:38:06 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" @@ -107,7 +102,7 @@ ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, con SetAutoLayout(TRUE); Layout(); - wxSize sizeDlg (250,250); + wxSize sizeDlg (500,500); if (sizeDlg.x != sizeDlg.y) { sizeDlg.x = max(sizeDlg.x,sizeDlg.y); sizeDlg.y = max(sizeDlg.x,sizeDlg.y); @@ -156,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); @@ -168,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; }