X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fsdf2img.c;h=f79b2cdffece117d3842f5dc5e8b0a32431608c5;hp=b19013b796cac96bc5344322a7811fb064149507;hb=6404682526633f7f2b9a2f94071d802b7b50dd07;hpb=331b5c344271387790f735540510e2a07e4e42a7

diff --git a/src/sdf2img.c b/src/sdf2img.c
index b19013b..f79b2cd 100644
--- a/src/sdf2img.c
+++ b/src/sdf2img.c
@@ -2,8 +2,17 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sdf2img.c,v 1.2 2000/05/08 20:02:32 kevin Exp $
+**  $Id: sdf2img.c,v 1.5 2000/06/03 06:29:57 kevin Exp $
 **  $Log: sdf2img.c,v $
+**  Revision 1.5  2000/06/03 06:29:57  kevin
+**  *** empty log message ***
+**
+**  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
+**
 **  Revision 1.2  2000/05/08 20:02:32  kevin
 **  ANSI C changes
 **
@@ -25,8 +34,9 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
+
 /* FILE
- *   sdf2img.c				Convert an SDF file to a viewable format image
+ *   sdf2img.c		Convert an SDF file to a viewable format image
  */
 
 #include "ct.h"
@@ -60,13 +70,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"
@@ -74,24 +78,21 @@ 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 
-usage (const char *program)
+sdf2img_usage (const char *program)
 {
-  fprintf(stdout, "usage: %s sdfname outfile [OPTIONS]\n", kbasename(program));
+  fprintf(stdout, "sdf2img_usage: %s sdfname outfile [OPTIONS]\n", kbasename(program));
   fprintf(stdout, "Convert SDF2D file to an image file\n");
   fprintf(stdout, "\n");
   fprintf(stdout, "     sdfname    Name of input SDF file\n");
@@ -105,6 +106,7 @@ 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");
@@ -124,11 +126,11 @@ usage (const char *program)
   fprintf(stdout, "     --verbose  Set verbose mode\n");
   fprintf(stdout, "     --version  Print version\n");
   fprintf(stdout, "     --help     Print this help message\n");
-  exit(1);
 }
 
+
 int 
-main (int argc, char *const argv[])
+sdf2img_main (int argc, char *const argv[])
 {
   IMAGE *im;
   double densmin = HUGE_VAL, densmax = -HUGE_VAL;
@@ -162,8 +164,8 @@ main (int argc, char *const argv[])
 	  if (endptr != endstr)
 	    {
 	      fprintf(stderr, "Error setting --min to %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 	  break;
 	case O_MAX:
@@ -173,8 +175,8 @@ main (int argc, char *const argv[])
 	  if (endptr != endstr)
 	    {
 	      fprintf(stderr, "Error setting --max to %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 	  break;
 	case O_SCALE:
@@ -183,8 +185,8 @@ main (int argc, char *const argv[])
 	  if (endptr != endstr)
 	    {
 	      fprintf(stderr,"Error setting --scale to %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 	  break;
 	case O_AUTO:
@@ -203,8 +205,8 @@ main (int argc, char *const argv[])
 	  else
 	    {
 	      fprintf(stderr, "Invalid auto mode %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 		break;
 	case O_CENTER:
@@ -215,8 +217,8 @@ main (int argc, char *const argv[])
 	  else
 	    {
 	      fprintf(stderr, "Invalid center mode %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 		break;
 	case O_FORMAT:
@@ -232,12 +234,14 @@ 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);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
-		break;
+	  break;
 	case O_LABELS:
 	  opt_labels = 1;
 	  break;
@@ -259,27 +263,31 @@ main (int argc, char *const argv[])
 	  exit(0);
 	case O_HELP:
 	case '?':
-	  usage(argv[0]);
-	  exit(0);
+	  sdf2img_usage(argv[0]);
+	  return (0);
 	default:
-	  usage(argv[0]);
-	  exit(1);
+	  sdf2img_usage(argv[0]);
+	  return (1);
 	}
     }
 
-  if (optind + 2 != argc)
+  if ((opt_format == O_FORMAT_DISP && optind + 1 != argc) 
+      || (opt_format != O_FORMAT_DISP && optind + 2 != argc))
     {
-      usage(argv[0]);
-      exit(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)
     {
       fprintf(stderr, "File %s does not exist\n", in_file);
-      exit(1);
+      return (1);
     }
 
   if (opt_labels) 
@@ -391,7 +399,7 @@ main (int argc, char *const argv[])
 	  else
 	    {
 	      fprintf(stderr, "Internal Error: Invalid auto mode %d\n", opt_auto);
-	      exit(1);
+	      return (1);
 	    }
 	}
       if (opt_stats)
@@ -415,7 +423,7 @@ main (int argc, char *const argv[])
 	  else
 	    {
 	      fprintf(stderr, "Internal Error: Invalid center mode %d\n", opt_center);
-	      exit(1);
+	      return (1);
 	    }
 	  if (! opt_set_max)
 	    densmax = center + window;
@@ -442,10 +450,17 @@ 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) {
+#if HAVE_SGP
+      image_display_scale (im, opt_scale, densmin, densmax);
+      cio_kb_getc();
+      sgp2_close(sgp2_get_active_win());
+#endif
+  }
   else
     {
       fprintf(stderr, "Internal Error: Invalid format mode %d\n", opt_format);
-      exit(1);
+      return (1);
     }
   return (0);
 }
@@ -692,3 +707,10 @@ sdf2d_to_gif (IMAGE *im, char *outfile, int nxcell, int nycell, double densmin,
 #endif
 }
 
+#ifndef NO_MAIN
+int 
+main (int argc, char *const argv[])
+{
+  return (sdf2img_main(argc, argv));
+}
+#endif