From 881c50c413b78ff7eb8444c41692cc8f747d3db6 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 31 Mar 2001 16:43:20 +0000 Subject: [PATCH] r657: *** empty log message *** --- cgi-bin/ctsim.cgi.in | 10 +++++----- html/simulate.html.in | 10 ++++++---- tools/ctsimtext.cpp | 6 +++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in index 5571e54..2025006 100755 --- a/cgi-bin/ctsim.cgi.in +++ b/cgi-bin/ctsim.cgi.in @@ -46,7 +46,7 @@ my $Phantom_NSample = FilterToNumber($in{'Phantom_NSample'}); $error .= "Phantom name must not be blank
" if ($Phantom_Name eq ""); $error .= "Phantom Size must be between 5 and 512
" if ($Phantom_Nx < 5 || $Phantom_Nx > 512 || $Phantom_Ny < 5 || $Phantom_Ny > 512); $error .= "Phantom NSample must be between 1 and 5
" if ($Phantom_NSample < 1 || $Phantom_NSample > 5); -$error .= "View Ratio must be between 1 and 100
" if ($Phantom_ViewRatio < 1 || $Phantom_ViewRatio > 100); +$error .= "View Ratio must be between 0 and 100
" if ($Phantom_ViewRatio <= 0 || $Phantom_ViewRatio > 100); my $PJ_Geometry = FilterMetaChars($in{'PJ_Geometry'}); my $PJ_NDet = FilterToNumber($in{'PJ_NDet'}); @@ -223,17 +223,17 @@ if ($error ne "") { $out .= "\n"; $out .= "\n"; $out .= "\n"; - $out .= "\n"; + $out .= "\n"; $out .= "\n"; $out .= "\n"; $out .= "

Phantom Image	Reconstructed Image
$png_gp_out	$png_pjrec_out
Projection Sinusoid	Reconstruction Error
Projection Sinogram	Reconstruction Error
$png_pj_out	$sub_out $png_sub_out

"; - $out .= "

Execution time: $execution_time seconds\n"; - $out .= "

\nError Measurements
"; + $out .= "

Error Measurements
"; $out .= "$diff_out"; + $out .= "

Execution time: $execution_time seconds\n"; } $out .= "

\n"; -$out .= "Specify another simulation.
"; +$out .= "Specify another simulation.
"; $out .= "Return to CTSim's home.
\n"; $out .= " "; $out .= "\n"; diff --git a/html/simulate.html.in b/html/simulate.html.in index 5be1c6e..3be3272 100644 --- a/html/simulate.html.in +++ b/html/simulate.html.in @@ -5,10 +5,12 @@ -CTSim Online Simulation +CTSim's Online Computed Tomography Simulator -

CTSim Online Simulation

+CTSim's +Online Computed Tomography Simulator

Reasonable defaults have been filled into this form. For detailed explanations of the parameters on this form, please visit CTSim's online manual.
@@ -48,7 +50,7 @@ Geometry:
Number of Detectors:

Number of Rotations:

Focal Length:

-Scan Ratio:

+Scan Ratio:

Number of Rays
(samples) per detector:

Rotation Angle
as a fraction of a cricle:
@@ -83,7 +85,7 @@ Backprojection Method:
Difference (integer math)

- + diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp index c7b4d53..0414cc9 100644 --- a/tools/ctsimtext.cpp +++ b/tools/ctsimtext.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsimtext.cpp,v 1.17 2001/01/17 04:03:42 kevin Exp $ +** $Id: ctsimtext.cpp,v 1.18 2001/03/31 16:43: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 @@ -45,7 +45,7 @@ extern "C" { // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that // linked name as name of function. -static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.17 2001/01/17 04:03:42 kevin Exp $"; +static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.18 2001/03/31 16:43:20 kevin Exp $"; static const char* const s_szProgramName = "ctsimtext"; static const char* const s_szProgramName2 = "ctsimtext.exe"; static const char* const s_szProgramName3 = "ctsimtext-lam"; @@ -109,7 +109,7 @@ ctsimtext_main (int argc, char * argv[]) argv++; argc--; iReturn = processCommand (argc, argv); - } else if (argc > 1){ + } else if (argc >= 1) { iReturn = processCommand (argc, argv); } else { s_bInteractive = true; -- 2.34.1