Changeset 332

Timestamp:

03/26/08 17:12:43 (8 months ago)

Author:

powell

Message:

New geomview parameters: name, label, appearance.

Location:

trunk/matml/src/ternary

Files:

• geomview.c (modified) (2 diffs)
• ternary.c (modified) (1 diff)
• ternary.h (modified) (1 diff)

trunk/matml/src/ternary/geomview.c

@@ -70 +70 @@
   FILE *geompipe FILE pointer hooked to Geomview stdin.
 
+  char *name Full name of this Geomview object.
+
+  char *label Short label of this Geomview object.
+
+  char *appearance Appearance tag for this Geomview object.
+
   int npoints Number of points.
 
@@ -80 +86 @@
 
 int GeomviewDisplayTriangleCOFF
-(FILE *geompipe, int npoints, ternary_point *points, int ntriangles, int *vertices)
+(FILE *geompipe, char *name, char *label, char *appearance,
+ int npoints, ternary_point *points, int ntriangles, int *vertices)
 {
   int i;
 
-  fprintf (geompipe, "(geometry \"Ternary Free Energy\" { : tfe })\n");
-  fprintf (geompipe, "(read geometry { define tfe \n");
-  fprintf (geompipe, "appearance { shading smooth }\nCOFF\n");
+  fprintf (geompipe, "(geometry \"%s\" { : %s })\n", name, label);
+  fprintf (geompipe, "(read geometry { define %s \n", label);
+  fprintf (geompipe, "appearance { %s }\nCOFF\n", appearance);
   fprintf (geompipe, "%d %d 0\n", npoints, ntriangles);
 

trunk/matml/src/ternary/ternary.c

@@ -112 +112 @@
 
   /* Send points and triangle vertex data to Geomview */
-  if (i=GeomviewDisplayTriangleCOFF (pfd, (loop_max+1)*(loop_max+2)/2, points,
-                                     loop_max*loop_max, verts))
+  if (i=GeomviewDisplayTriangleCOFF
+      (pfd, "Ternary Free Energy", "tfe", "shading smooth",
+       (loop_max+1)*(loop_max+2)/2, points, loop_max*loop_max, verts))
     { printf ("main: Error %d in Geomview Display\n", i); exit (i); }
 
-  printf ("Calling qhull\n");
   if (i=qhullCalcHull (3, (loop_max+1)*(loop_max+2)/2, points, &hullnumverts,
                        &hullverts, &qh_version))
     { printf ("main: qhullCalcHull returned %d\n", i); exit (i); }
   printf ("qhull version: %s\n", qh_version);
+
+#ifdef DEBUG
+  for (i=0; i<hullnumverts; i++)
+    printf ("Facet %d vertices: %d %d %d\n", i, hullverts[3*i],
+            hullverts[3*i+1], hullverts[3*i+2]);
+#endif
+
+  if (i=GeomviewDisplayTriangleCOFF
+      (pfd, "Free Energy Convex Hull", "ech", "-face +edge",
+       (loop_max+1)*(loop_max+2)/2, points, hullnumverts, hullverts))
+    { printf ("main: Error %d in Geomview Display\n", i); exit (i); }
 
   printf ("Press <return> to close up... ");

trunk/matml/src/ternary/ternary.h

@@ -28 +28 @@
 int GeomviewBegin (FILE **geompipe, char *version);
 int GeomviewDisplayTriangleCOFF
-(FILE *geompipe, int npoints, ternary_point *points,
- int ntriangles, int *vertices);
+(FILE *geompipe, char *name, char *label, char *appearance,
+ int npoints, ternary_point *points, int ntriangles, int *vertices);
 int GeomviewEnd (FILE **geompipe);