X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=cgi-bin%2Fctsim.cgi.in;h=49d94357fc7bac7642dfb38a574dd28baac46ca0;hb=b7519560db07975f7a16cd24d12fe61ba0b4d84c;hp=e978881e0ae0d3b3b16e3f49f888b17ffe4f57da;hpb=4d4ceac098a9ca4b78064d1368d0c8538417710a;p=ctsim.git

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
old mode 100755
new mode 100644
index e978881..49d9435
--- 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<br>" if ($Phantom_Name eq "");
 $error .= "Phantom Size must be between 5 and 512<br>" if ($Phantom_Nx < 5 || $Phantom_Nx > 512 || $Phantom_Ny < 5 || $Phantom_Ny > 512);
 $error .= "Phantom NSample must be between 1 and 5<br>" if ($Phantom_NSample < 1 || $Phantom_NSample > 5);
-$error .= "View Ratio must be between 1 and 100<br>" if ($Phantom_ViewRatio < 1 || $Phantom_ViewRatio > 100);
+$error .= "View Ratio must be between 0 and 100<br>" if ($Phantom_ViewRatio <= 0 || $Phantom_ViewRatio > 100);
 
 my $PJ_Geometry = FilterMetaChars($in{'PJ_Geometry'});
 my $PJ_NDet = FilterToNumber($in{'PJ_NDet'});
@@ -139,10 +139,10 @@ if ($Disp_Max ne 'auto') {
     $window_options .= " --max $Disp_Max";
 }
 
-my $png1_cmd = "$::bindir/ifexport $phantom_fname $phantom_png $window_options --stats --format png";
-my $png2_cmd = "$::bindir/ifexport $ir_fname $ir_png $window_options --stats --format png";
-my $png3_cmd = "$::bindir/ifexport $pj_if_fname $pj_png --auto $auto_window_pj --stats --format png";
-my $png4_cmd = "$::bindir/ifexport $sub_fname $sub_png --auto $auto_window_diff --stats --format png";
+my $png1_cmd = "$::bindir/ifexport $phantom_fname $phantom_png $window_options --stats --format png --center mode";
+my $png2_cmd = "$::bindir/ifexport $ir_fname $ir_png $window_options --stats --format png --center mode";
+my $png3_cmd = "$::bindir/ifexport $pj_if_fname $pj_png --auto $auto_window_pj --stats --format png --center mode";
+my $png4_cmd = "$::bindir/ifexport $sub_fname $sub_png --auto $auto_window_diff --stats --format png --center mode";
 
 my $title = "CTSim Results";
 
@@ -201,6 +201,7 @@ if ($error ne "") {
   if (open(LOGFILE,">> $logfile")) {
     flock(LOGFILE,LOCK_EX);
     seek(LOGFILE, 0, 2);
+    print LOGFILE "Client Address: $ENV{'REMOTE_ADDR'}\n";
     print LOGFILE "Job $tmpid\n";
     print LOGFILE $cmdout;
     print LOGFILE "----------------------------------------------------\n";
@@ -220,20 +221,20 @@ if ($error ne "") {
   $png_pjrec_out_html =~ s/\n/<br>/gms;
   $png_pj_out_html =~ s/\n/<br>/gms;
   $png_sub_out_html =~ s/\n/<br>/gms;
-  $out .= "<TABLE><TR><TD>Phantom Image</TD><TD>Reconstructed Image</TD></TR>\n";
+  $out .= "<TABLE><TR><TD><b>Phantom Image</b></TD><TD><b>Reconstructed Image</b></TD></TR>\n";
   $out .= "<TR><TD><IMG SRC=\"$phantom_png_url\"><br><FONT SIZE=1>$png_gp_out</FONT></TD>\n";
   $out .= "<TD><IMG SRC=\"$ir_png_url\"><br><FONT SIZE=1>$png_pjrec_out</FONT></TD></TR>\n";
-  $out .= "<TR><TD>Projection Sinusoid</TD><TD>Reconstruction Error</TD></TR>\n";
+  $out .= "<TR><TD><b>Projection Sinogram</b></TD><TD><b>Reconstruction Error</b></TD></TR>\n";
   $out .= "<TR><TD><IMG SRC=\"$pj_png_url\"><br><FONT SIZE=1>$png_pj_out</FONT></TD>\n";
   $out .= "<TD><IMG SRC=\"$sub_png_url\"><br><FONT SIZE=2>$sub_out</FONT><br><FONT SIZE=1>$png_sub_out</FONT></TD></TR>\n";
   $out .= "</TABLE>";
-  $out .= "Execution time: $execution_time seconds\n";
-  $out .= "<p>\nError Measurements<br>";
+  $out .= "<p><b>Error Measurements</b><br>";
   $out .= "$diff_out";
+  $out .= "<p>Execution time: $execution_time seconds\n";
 }
 
 $out .= "<HR>\n";
-$out .= "Specify another <a href=\"http://www.ctsim.org/online-sim/simulate.html\">simulation</a>.<br>";
+$out .= "Specify another <a href=\"http://www.ctsim.org/simulate.shtml\">simulation</a>.<br>";
 $out .= "Return to CTSim's <A HREF=\"http://www.ctsim.org\">home</a>.<br>\n";
 $out .= "</BODY> </HTML>";
 $out .= "\n";
@@ -254,8 +255,6 @@ else
 if (open(JOBFILES,"> $::jobdir/$tmpid"))
 {
     flock(JOBFILES,LOCK_EX);
-    print JOBFILES "gmt_start=$gmt_start\n";
-    print JOBFILES "gmt_end=$gmt_end\n";
     print JOBFILES "execution_time=$execution_time\n";
     print JOBFILES "Phantom_Name=$Phantom_Name\n";
     print JOBFILES "Phantom_Nx=$Phantom_Nx\n";
@@ -303,7 +302,7 @@ sub head
 sub FilterMetaChars
 {
    my $var = pop(@_);
-   $var =~ /^(\w+)$/;  
+   $var =~ /^([-\w]+)$/;  
    $1;
 }