Changeset 423 for trunk/matml

Timestamp:

02/23/2009 06:47:29 PM (3 years ago)

Author:

powell

Message:

New GeomviewDisplayFacets? function, pretty self-explanatory.

Location:

trunk/matml/src/ternary

Files:

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

trunk/matml/src/ternary/geomview.c

@@ -114 +114 @@
 
 /*++++++++++++++++++++++++++++++++++++++
+  This sends a bunch of facet objects to Geomview in COFF format.
+
+  int GeomviewDisplayFacets It returns zero or an error code.
+
+  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.
+
+  ternary_point *points Point coordinates and colors.
+
+  int numfacets Number of facet objects to display.
+
+  hull_facet *facets Array of facet objects.
+
+  facet_type type Facet type to display, or ALL_TYPES to display all of them.
+  ++++++++++++++++++++++++++++++++++++++*/
+
+int GeomviewDisplayFacets
+(FILE *geompipe, char *name, char *label, char *appearance,
+ int npoints, ternary_point *points, int numfacets, hull_facet *facets,
+ facet_type type)
+{
+  int i, n=0;
+
+  // Count number of relevant facets
+  if (type == ALL_TYPES)
+    n = numfacets;
+  else
+    for (i=0; i<numfacets; i++)
+      if (facets [i].type == type)
+        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, n);
+
+  for (i=0; i<npoints; i++)
+    fprintf (geompipe, "%g %g %g %g %g %g %g\n", points[i].x, points[i].y,
+             points[i].z, points[i].red, points[i].green, points[i].blue,
+             points[i].alpha);
+
+  for (i=0; i<numfacets; i++)
+    if (type == ALL_TYPES || type == facets[i].type)
+      fprintf (geompipe, "3 %d %d %d\n", facets[i].vertex[0], facets[i].vertex[1], facets[i].vertex[2]);
+
+  fprintf (geompipe, "})\n");
+  fflush (geompipe);
+
+  return 0;
+}
+
+
+/*++++++++++++++++++++++++++++++++++++++
   Displays a phase boundary.  Note this pipes all of the points back to
   geomview again.

trunk/matml/src/ternary/ternary.c

@@ -111 +111 @@
     { printf ("main: error %d in hullRefine\n", i); exit (i); }*/
 
-  /* Take out hull triangles which are on the main function (in one phase) */
-  /*for (i=0; i<hullnumfacets; i++)
-    {
-
-      // Remove one-phase facets to display just binodal and ternary
-      if (hullfacets [i].type == ONE_PHASE)
-        {
-          for (j=i; j<hullnumfacets-1; j++)
-            hullfacets [j] = hullfacets [j+1];
-          hullnumfacets--;
-          i--;
-        }
-    } */
-
-  printf ("Binodal region has %d facets\n", hullnumfacets);
-
   if (i=scale_energy_array (numpoints, points, 0., -.2, 1., .9, NULL, NULL))
     { printf ("main: Error %d in scale_triangle_array\n", i); exit (i); }
+
+  if (i=GeomviewDisplayFacets
+      (pfd, "Binodal and Tie Lines", "ech", "-face +edge",
+       numpoints, points, hullnumfacets, hullfacets, TWO_PHASE))
+    { printf ("main: Error %d in Geomview Display\n", i); exit (i); }
 
   printf ("Press <return> to close up... ");

trunk/matml/src/ternary/ternary.h

@@ -157 +157 @@
 (FILE *geompipe, char *name, char *label, char *appearance,
  int npoints, ternary_point *points, int ntriangles, int *vertices);
+int GeomviewDisplayFacets
+(FILE *geompipe, char *name, char *label, char *appearance,
+ int npoints, ternary_point *points, int numfacets, hull_facet *facets,
+ facet_type type);
 int GeomviewDisplayPhaseBoundary
 (FILE *geompipe, char *name, char *label, char *appearance,