r61: Added support for new SGP library

[ctsim.git] / src / phm2sdf.c

diff --git a/src/phm2sdf.c b/src/phm2sdf.c
index 4f063896ebf776aac8134184fb0d54160b011d40..fb72ab3288cc0a0eae1dd81eedd6bfe1d494a841 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.9 2000/05/16 04:33:59 kevin Exp $
+**  $Id: phm2sdf.c,v 1.10 2000/05/24 22:50:04 kevin Exp $
 **  $Log: phm2sdf.c,v $
+**  Revision 1.10  2000/05/24 22:50:04  kevin
+**  Added support for new SGP library
+**
 **  Revision 1.9  2000/05/16 04:33:59  kevin
 **  Improved option processing
 **
@@ -278,11 +281,6 @@ phm2sdf_main (const int argc, char *const argv[])
       return (1);
     }
 
-#if HAVE_INTERACTIVE_GRAPHICS
-    if (opt_trace >= TRACE_PHM)
-      phm_show(phm);
-#endif
-
     if (optind + 3 != argc) {
       phm2sdf_usage(argv[0]);
       return (1);
@@ -406,7 +404,11 @@ phm2sdf_main (const int argc, char *const argv[])
     image_filter_response (im_global, opt_filter_domain, opt_filter_bw, opt_filter, opt_filter_param, opt_trace);
     im_global->calctime = 0;
   } else {
-    phm_to_image (phm, im_global, 0, opt_nx, opt_nsample, opt_trace);
+#if HAVE_SGP
+      if (opt_trace >= TRACE_PHM)
+       phm_show(phm);
+#endif
+      phm_to_image (phm, im_global, 0, opt_nx, opt_nsample, opt_trace);
   }
 #endif
 
@@ -430,14 +432,13 @@ phm2sdf_main (const int argc, char *const argv[])
   if (opt_trace >= TRACE_PHM)
     {
       double dmin, dmax;
-      int nx, ny;
+      int nscale;
 
-      printf ("Enter size of cell (nx, ny): ");
-      scanf ("%d %d", &nx, &ny);
+      printf ("Enter display size scale (nominal = 1): ");
+      scanf ("%d", &nscale);
       printf ("Enter minimum and maximum densities (min, max): ");
       scanf ("%lf %lf", &dmin, &dmax);
-      //      image_paint (CRTDEV, im_global, 0, 0, nx, ny, dmin, dmax, 0);
-
+      image_display_scale (im_global, nscale, dmin, dmax);
     }
 
   phm_free (phm);