X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fsdf2img.c;h=e51d7889bc73e4fe8a8b255b6657407bcc2d3a6c;hp=600d8d77582a43369545876a2d09a941956e882f;hb=8f6d22c1d18c183cfcb95ca97cea85cbae0ab6c3;hpb=881aa76b85473224ec84fbc6858a3b0f84c1fcf4

diff --git a/src/sdf2img.c b/src/sdf2img.c
index 600d8d7..e51d788 100644
--- a/src/sdf2img.c
+++ b/src/sdf2img.c
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sdf2img.c,v 1.3 2000/05/16 04:33:59 kevin Exp $
+**  $Id: sdf2img.c,v 1.4 2000/05/24 22:50:04 kevin Exp $
 **  $Log: sdf2img.c,v $
+**  Revision 1.4  2000/05/24 22:50:04  kevin
+**  Added support for new SGP library
+**
 **  Revision 1.3  2000/05/16 04:33:59  kevin
 **  Improved option processing
 **
@@ -64,13 +67,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-#define O_AUTO_FULL   1
-#define O_AUTO_STD0_1 2
-#define O_AUTO_STD0_5 3
-#define O_AUTO_STD1   4
-#define O_AUTO_STD2   5
-#define O_AUTO_STD3   6
-
+enum { O_AUTO_FULL, O_AUTO_STD0_1, O_AUTO_STD0_5, O_AUTO_STD1, O_AUTO_STD2, O_AUTO_STD3 };
 #define O_AUTO_FULL_STR  "full"
 #define O_AUTO_STD0_1_STR  "std0.1"
 #define O_AUTO_STD0_5_STR  "std0.5"
@@ -78,19 +75,16 @@ static struct option my_options[] =
 #define O_AUTO_STD2_STR  "std2"
 #define O_AUTO_STD3_STR  "std3"
 
-#define O_CENTER_MEAN      1
-#define O_CENTER_MODE      2
+enum { O_CENTER_MEAN, O_CENTER_MODE };
 #define O_CENTER_MEAN_STR  "mean"
 #define O_CENTER_MODE_STR  "mode"
 
-#define O_FORMAT_GIF       1
-#define O_FORMAT_PNG       2
-#define O_FORMAT_PGM       3
-#define O_FORMAT_PGMASC    4
+enum { O_FORMAT_GIF, O_FORMAT_PNG, O_FORMAT_PGM, O_FORMAT_PGMASC, O_FORMAT_DISP };
 #define O_FORMAT_GIF_STR   "gif"
 #define O_FORMAT_PNG_STR   "png" 
 #define O_FORMAT_PGM_STR   "pgm"
 #define O_FORMAT_PGMASC_STR "pgmasc"
+#define O_FORMAT_DISP_STR    "disp"
 
 void 
 sdf2img_usage (const char *program)
@@ -109,6 +103,7 @@ sdf2img_usage (const char *program)
 #ifdef HAVE_GIF
   fprintf(stdout, "         gif    GIF format\n");
 #endif
+  fprintf(stdout, "         disp   Display on screen\n");
   fprintf(stdout, "     --center   Center of window\n");
   fprintf(stdout, "         mode   Mode is center of window (default)\n");
   fprintf(stdout, "         mean   Mean is center of window\n");
@@ -236,6 +231,8 @@ sdf2img_main (int argc, char *const argv[])
 	  else if (strcmp(optarg, O_FORMAT_GIF_STR) == 0)
 	    opt_format = O_FORMAT_GIF;
 #endif
+	  else if (strcmp(optarg, O_FORMAT_DISP_STR) == 0)
+	    opt_format = O_FORMAT_DISP;
 	  else {
 	      fprintf(stderr, "Invalid format mode %s\n", optarg);
 	      sdf2img_usage(argv[0]);
@@ -271,14 +268,18 @@ sdf2img_main (int argc, char *const argv[])
 	}
     }
 
-  if (optind + 2 != argc)
+  if ((opt_format == O_FORMAT_DISP && optind + 1 != argc) 
+      || (opt_format != O_FORMAT_DISP && optind + 2 != argc))
     {
-      sdf2img_usage(argv[0]);
-      return (1);
+	sdf2img_usage(argv[0]);
+	return (1);
     }
   
   in_file = argv[optind];
-  out_file = argv[optind+1];
+
+  if (opt_format != O_FORMAT_DISP)
+      out_file = argv[optind+1];
+  else out_file = NULL;
 
   if ((im = image_load (in_file)) == NULL)
     {
@@ -446,6 +447,11 @@ sdf2img_main (int argc, char *const argv[])
   else if (opt_format == O_FORMAT_GIF) 
     sdf2d_to_gif (im, out_file, opt_scale, opt_scale, densmin, densmax);
 #endif
+  else if (opt_format == O_FORMAT_DISP) {
+      int gid = image_display_scale (im, opt_scale, densmin, densmax);
+      cio_kb_getc();
+      g2_close(gid);
+  }
   else
     {
       fprintf(stderr, "Internal Error: Invalid format mode %d\n", opt_format);