* ctsim: Added most-recently-used files to File menu with
registry storage between executions.
-
- * ctsim: Added MDI interface for Windows version
+
+ * ctsim: Added MDI interface for Windows version and made it default
* ctsim: Added graphical About box
- * ctsim: Added accelerator (hotkeys) to windows
+ * ctsim: Added accelerator (hotkeys) to frames
* ctsim: Online help added as well as HTML help
- * ctsim: Added icons to Frames on Windows versions
+ * ctsim: Added icons to Frames on X-Window and MS Windows versions
+ * ctsim: Fixed tick-label placement for plots on projection and
+ reconstruction dialogs.
+
* pjinfo: Fixed bug when doing --dump and not specifing --endview
* ctsimtext-lam: Changes for first version to compile under lam
** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: dlgezplot.h,v 1.1 2001/01/13 04:47:50 kevin Exp $
+** $Id: dlgezplot.h,v 1.2 2001/01/27 21:02:20 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
EZPlotControl* m_pEZPlotCtrl;
public:
- EZPlotDialog (wxWindow *parent = NULL);
+ EZPlotDialog (wxWindow *parent = NULL, bool bCancelButton = false);
~EZPlotDialog();
** Date Started: Jan 2001
**
** This is part of the CTSim program
-** Copyright (C) 1983-2001 Kevin Rosenberg
+** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: dlgezplot.cpp,v 1.3 2001/01/19 22:53:56 kevin Exp $
+** $Id: dlgezplot.cpp,v 1.4 2001/01/27 21:02:20 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
m_pSGPDriver = new SGPDriver (&dc, m_iClientX, m_iClientY);
m_pSGP = new SGP (*m_pSGPDriver);
m_pSGP->setTextPointSize(10);
+// m_pSGP->setViewport (0, 0, 1., 0.5); // for debugging testing only
if (m_pEZPlot && m_pSGP) {
m_pSGP->eraseWindow();
m_pEZPlot->plot (m_pSGP);
}
-EZPlotDialog::EZPlotDialog (wxWindow *parent)
+EZPlotDialog::EZPlotDialog (wxWindow *parent, bool bCancelButton)
: wxDialog((parent ? parent : theApp->getMainFrame()), -1, wxString("EZPlot"), wxDefaultPosition, wxDefaultSize, wxDIALOG_MODAL),
m_parentTop(0)
{
wxBoxSizer* pButtonSizer = new wxBoxSizer (wxHORIZONTAL);
wxButton* pButtonOk = new wxButton (this, wxID_OK, "Ok");
- wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL, "Cancel");
pButtonSizer->Add (pButtonOk, 0, wxEXPAND | wxALL, 10);
- pButtonSizer->Add (pButtonCancel, 0, wxEXPAND | wxALL, 10);
-
+ if (bCancelButton) {
+ wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL, "Cancel");
+ pButtonSizer->Add (pButtonCancel, 0, wxEXPAND | wxALL, 10);
+ }
pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER);
SetAutoLayout (true);
** Programmer: Kevin Rosenberg
**
** This is part of the CTSim program
-** Copyright (C) 1983-2000 Kevin Rosenberg
+** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: sgp.cpp,v 1.27 2001/01/12 21:53:27 kevin Exp $
+** $Id: sgp.cpp,v 1.28 2001/01/27 21:02:20 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
if (m_driver.isWX()) {
dHeight = m_driver.idWX()->GetCharHeight();
dHeight /= static_cast<double>(m_iPhysicalYSize);
- dHeight /= (yv_max - yv_min); // scale to viewport;
+ dHeight /= (yv_max - yv_min); // scale to viewport;
}
#endif
dHeight *= (yw_max - yw_min); // scale to world coordinates
if (m_driver.isWX()) {
dWidth = m_driver.idWX()->GetCharWidth();
dWidth /= static_cast<double>(m_iPhysicalXSize);
- dWidth /= (xv_max - xv_min); // scale to viewport
+ dWidth /= (xv_max - xv_min); // scale to viewport
}
#endif
dWidth *= (xw_max - xw_min); //scale to world coordinates
** Date Started: June 2000
**
** This is part of the CTSim program
-** Copyright (C) 1983-2000 Kevin Rosenberg
+** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: array2dfile.cpp,v 1.27 2001/01/02 16:02:13 kevin Exp $
+** $Id: array2dfile.cpp,v 1.28 2001/01/27 21:02:20 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
** Date Started: June 2000
**
** This is part of the CTSim program
-** Copyright (C) 1983-2000 Kevin Rosenberg
+** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: backprojectors.cpp,v 1.23 2001/01/04 21:28:41 kevin Exp $
+** $Id: backprojectors.cpp,v 1.24 2001/01/27 21:02:20 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
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: reconstruct.cpp,v 1.7 2001/01/02 16:02:13 kevin Exp $
+** $Id: reconstruct.cpp,v 1.8 2001/01/27 21:02:20 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
ezplotProj.ezset ("xticks major 5");
ezplotProj.ezset ("xlabel ");
ezplotProj.ezset ("ylabel ");
- ezplotProj.ezset ("yporigin .5");
- ezplotProj.ezset ("ylength .5");
+ ezplotProj.ezset ("yporigin 0.1");
+ ezplotProj.ezset ("ylength 0.45");
+ ezplotProj.ezset ("xlength 0.66");
ezplotProj.ezset ("box.");
ezplotProj.ezset ("grid.");
ezplotProj.addCurve (m_adPlotXAxis, detval, m_rProj.nDet());
+ pSGP->setTextPointSize(12);
ezplotProj.plot (pSGP);
ezplotProj.ezset ("clear");
ezplotProj.ezset ("title Filtered Projection");
ezplotProj.ezset ("xticks major 5");
ezplotProj.ezset ("xlabel ");
ezplotProj.ezset ("ylabel ");
- ezplotProj.ezset ("ylength .5");
+ ezplotProj.ezset ("yporigin 0.55");
+ ezplotProj.ezset ("ylength 0.45");
+ ezplotProj.ezset ("xlength 0.66");
ezplotProj.ezset ("box");
ezplotProj.ezset ("grid");
ezplotProj.addCurve (m_adPlotXAxis, adFilteredProj, m_nFilteredProjections);
+ pSGP->setTextPointSize(12);
ezplotProj.plot (pSGP);
}
#endif //HAVE_SGP
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: scanner.cpp,v 1.25 2001/01/17 11:00:18 kevin Exp $
+** $Id: scanner.cpp,v 1.26 2001/01/27 21:02:20 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
m_pSGP->moveAbs (0., 0.);
m_pSGP->drawCircle (m_dFocalLength);
m_pSGP->setColor (C_BLUE);
+ m_pSGP->setTextPointSize (9);
phm.draw (*m_pSGP);
m_dTextHeight = m_pSGP->getCharHeight ();
#ifdef HAVE_SGP
if (m_pSGP) {
m_pSGP->setRasterOp (iRasterOp);
- double dYPos = m_dYMaxWin - (row * m_dTextHeight);
- m_pSGP->moveAbs (m_dXMinWin, dYPos);
m_pSGP->setTextColor (color, -1);
- m_pSGP->drawText (szLabel);
double dValueOffset = (m_dXMaxWin - m_dXMinWin) / 4;
- m_pSGP->moveAbs (m_dXMinWin + dValueOffset, dYPos);
- m_pSGP->drawText (szValue);
+ if (row < 4) {
+ double dYPos = m_dYMaxWin - (row * m_dTextHeight);
+ double dXPos = m_dXMinWin;
+ m_pSGP->moveAbs (dXPos, dYPos);
+ m_pSGP->drawText (szLabel);
+ m_pSGP->moveAbs (dXPos + dValueOffset, dYPos);
+ m_pSGP->drawText (szValue);
+ } else {
+ row -= 4;
+ double dYPos = m_dYMaxWin - (row * m_dTextHeight);
+ double dXPos = m_dXMinWin + (m_dXMaxWin - m_dXMinWin) * 0.5;
+ m_pSGP->moveAbs (dXPos, dYPos);
+ m_pSGP->drawText (szLabel);
+ m_pSGP->moveAbs (dXPos + dValueOffset, dYPos);
+ m_pSGP->drawText (szValue);
+ }
} else
#endif
{
** the SNARK size of the object (u,v)
**
** This is part of the CTSim program
-** Copyright (C) 1983-2000 Kevin Rosenberg
+** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: clip.cpp,v 1.7 2001/01/02 16:02:13 kevin Exp $
+** $Id: clip.cpp,v 1.8 2001/01/27 21:02:20 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
/*****************************************************************************
** This is part of the CTSim program
-** Copyright (C) 1983-2000 Kevin Rosenberg
+** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: consoleio.cpp,v 1.3 2000/06/22 10:17:28 kevin Exp $
+** $Id: consoleio.cpp,v 1.4 2001/01/27 21:02:20 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
<pre>
<h1>Build Log</h1>
<h3>
---------------------Configuration: ctsim - Win32 Debug--------------------
+--------------------Configuration: libctsim - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1C3.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP243.tmp" with contents
+[
+/nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
+"C:\ctsim\libctsim\scanner.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP243.tmp"
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP244.tmp" with contents
[
-/nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.5.0\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
-"C:\ctsim\src\views.cpp"
+/nologo /out:"Debug\libctsim.lib"
+.\Debug\array2dfile.obj
+.\Debug\backprojectors.obj
+.\Debug\clip.obj
+.\Debug\consoleio.obj
+.\Debug\dlgezplot.obj
+.\Debug\ezplot.obj
+.\Debug\ezset.obj
+.\Debug\ezsupport.obj
+.\Debug\filter.obj
+.\Debug\fnetorderstream.obj
+.\Debug\fourier.obj
+.\Debug\getopt.obj
+.\Debug\getopt1.obj
+.\Debug\globalvars.obj
+.\Debug\hashtable.obj
+.\Debug\imagefile.obj
+.\Debug\mathfuncs.obj
+.\Debug\phantom.obj
+.\Debug\plotfile.obj
+.\Debug\pol.obj
+.\Debug\procsignal.obj
+.\Debug\projections.obj
+.\Debug\reconstruct.obj
+.\Debug\scanner.obj
+.\Debug\sgp.obj
+.\Debug\strfuncs.obj
+.\Debug\syserror.obj
+.\Debug\trace.obj
+.\Debug\transformmatrix.obj
+.\Debug\xform.obj
]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1C3.tmp"
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1C4.tmp" with contents
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP244.tmp"
+<h3>Output Window</h3>
+Compiling...
+scanner.cpp
+Creating library...
+<h3>
+--------------------Configuration: ctsim - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP245.tmp" with contents
[
comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib xpmd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib"
.\Debug\ctsim.obj
\wx2\lib\wxd.lib
\wx2\lib\xpmd.lib
]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1C4.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP245.tmp"
<h3>Output Window</h3>
-Compiling...
-views.cpp
Linking...
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: dlgprojections.cpp,v 1.18 2001/01/17 11:00:18 kevin Exp $
+** $Id: dlgprojections.cpp,v 1.19 2001/01/27 21:02:20 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
ezplot.ezset ("box");
ezplot.ezset ("yticks left");
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;
}
** 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.h,v 1.5 2000/12/17 22:30:34 kevin Exp $
+** $Id: dlgprojections.h,v 1.6 2001/01/27 21:02:20 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
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: dlgreconstruct.cpp,v 1.13 2001/01/02 16:02:13 kevin Exp $
+** $Id: dlgreconstruct.cpp,v 1.14 2001/01/27 21:02:20 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
m_pSGP->drawText (szProgress);
m_pSGP->setTextSize (dCharHeight);
- m_pSGP->setViewport (0.0, 0.1, 0.66, 1.);
+ // m_pSGP->setViewport (0.0, 0.1, 0.66, 1.); // viewport equiv now done in subroutine
m_rReconstructor.reconstructView (iViewNumber, 1, m_pSGP, bBackprojectView);
ImageFileArrayConst v = m_rImageFile.getArray();