projects / ctsim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3b671fd)
r23: *** empty log message ***
authorKevin M. Rosenberg <kevin@rosenberg.net>
Sun, 30 Apr 2000 19:17:54 +0000 (19:17 +0000)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Sun, 30 Apr 2000 19:17:54 +0000 (19:17 +0000)
Makefile.am patch | blob | history
html/ctsim.html patch | blob | history
r patch | blob | history
src/phm2sdf.c patch | blob | history
src/sample-ctrec.sh patch | blob | history

diff --git a/Makefile.am b/Makefile.am
index b1b74c9008463879b48b87c6fbecf04067201912..c2d2f85d70cc7cd3d92c0ba1113ec160e2f5f7cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 if INCLUDED_GETOPT_LONG
-  EXTRA_DIRS1 = getopt
+EXTRA_DIRS1=getopt
 else
-  EXTRA_DIRS1 =
+EXTRA_DIRS1=
 endif
 
 if HAVE_INTERACTIVE_GRAPHICS
-  EXTRA_DIRS2 = libezplot libgraph
+EXTRA_DIRS2=libezplot libgraph
 else
-  EXTRA_DIRS2 =
+EXTRA_DIRS2=
 endif
 
 SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libcio libk libkmath libir src man html cgi-bin include 
diff --git a/html/ctsim.html b/html/ctsim.html
index 0f0534546d892a8b19f8caf8a6e11e7b5a9d988e..e0136148b1dc41b25bed1ede55a9bb0379162996 100644 (file)
--- a/html/ctsim.html
+++ b/html/ctsim.html
@@ -4,7 +4,7 @@
 </HEAD>
 <BODY BGCOLOR="#FFFFFF">
 <H1>Perform CT Simulation</H1>
-<FORM action="/ctsim.cgi" method="POST">
+<FORM action="/cgi-bin/ctsim.cgi" method="POST">
 <table border=1 cellpadding="5" bgcolor="#FFFFFF">
 <tr><td valign="top">
 <h3>Select Image and Size</h3>
diff --git a/r b/r
index 836daf5118bbbb334fd0bc90593aea86520cf3ff..157bb2f50c10ca051a5b37c5af6608c4a4374239 100755 (executable)
--- a/r
+++ b/r
@@ -1,6 +1,7 @@
 aclocal
 autoconf
 automake
-./configure --prefix=/opt/ctsim --with-cgibin-dir=/opt/apache/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/opt/apache/htdocs/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/opt/apache/htdocs/ctsim --with-lam-dir=/opt/lam
+./configure --prefix=/opt/ctsim --with-cgibin-dir=/opt/apache/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/opt/apache/htdocs/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/opt/apache/htdocs/ctsim --with-lam-dir=/opt/lam --without-x
+
 
 
diff --git a/src/phm2sdf.c b/src/phm2sdf.c
index ebc21b6b9494de87de3f4dfc1db6b4ef7cfbcbb2..814951af0543789f1b30a4566d6a647447d01d96 100644 (file)
--- a/src/phm2sdf.c
+++ b/src/phm2sdf.c
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2sdf.c,v 1.4 2000/04/30 04:06:13 kevin Exp $
+**  $Id: phm2sdf.c,v 1.5 2000/04/30 19:17:54 kevin Exp $
 **  $Log: phm2sdf.c,v $
+**  Revision 1.5  2000/04/30 19:17:54  kevin
+**  *** empty log message ***
+**
 **  Revision 1.4  2000/04/30 04:06:13  kevin
 **  Update Raysum i/o routines
 **  Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global
@@ -144,7 +147,7 @@ main (const int argc, char *const argv[])
   double opt_filter_bw = 1.;
   int opt_trace = TRACE_NONE;
   int opt_verbose = 0;
-  double time_start, time_end;
+  double time_start=0, time_end=0;
 #ifdef MPI_CT
   IMAGE *im_local = NULL;
   int mpi_argc = argc;
diff --git a/src/sample-ctrec.sh b/src/sample-ctrec.sh
index 2ef322034e104fbe720122bfb13632d3f242c2f2..5daa07eeae3024cd5ad6dfdeeabf1188ae3e9eb6 100644 (file)
--- a/src/sample-ctrec.sh
+++ b/src/sample-ctrec.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-bin="/usr/local/bin/"
+bin="/opt/ctsim/bin/"
 
 # Generate phantom image
 
Computed Tomography simulator and reconstructor