Changeset 41340 for trunk/Ohana/src/kapa2/include/structures.h

Timestamp:

Apr 16, 2020, 1:54:47 PM (6 years ago)

Author:

tdeboer

Message:

revert to working Ohana build

File:

• trunk/Ohana/src/kapa2/include/structures.h (modified) (3 diffs)

trunk/Ohana/src/kapa2/include/structures.h

@@ -48 +48 @@
   unsigned long  back;        // basic background color
 
-  float smooth_sigma; // anti-aliasing smoothing scale
-
   unsigned long  overlay_color[NOVERLAYS]; // image plotting colors 
 } Graphic;
@@ -133 +131 @@
 } Overlay;
   
-// a set of objects all have the same basic properties
-typedef struct {
-  float *x; // x-coordinates of the points
-  float *y; // y-coordinates of the points
-  float *z; // size/colorscale for points
-  float *dxp; // lower-errorbar in x
-  float *dxm; // upper-errorbar in x
-  float *dyp; // lower-errorbar in y
-  float *dym; // upper-errorbar in y
-  int Npts;   // number of points in this set
-  int style;  // how are the object draw: CONNECT, HISTOGRAM,
-  int ptype;  // shape of object at each point
-  // ptype is overloaded for NPOLYGON to be the number of points / polygon
-  int ltype;  // style of line (solid, dot, dash, etc)
-  int color;  // color for point (if not colorscaled)
-  int etype;  // errorbars to draw (0x01 = y, 0x02 = x)
-  int ebar;   // draw a cap on the error bar
-  double lweight; // line thickness
-  double size; // size of the object
+typedef struct {
+  float *x, *y, *z, *dxp, *dxm, *dyp, *dym;
+  int Npts;
+  int style, ptype, ltype, color, etype, ebar;
+  double lweight, size;
   double x0, x1, y0, y1;  /* limits for this object */
   double alpha;
@@ -250 +234 @@
   char *name;
 } Section;
-
-typedef struct {
-  FILE *f;
-  int Nsegment;
-  int NSEGMENT;
-  int *offset;
-  int *objnum;
-
-  int Nstream;
-  int NSTREAM;
-  int *streamObjnum;
-
-  int Nimage;
-  int NIMAGE;
-  int *imageObjnum;
-} PDF_FILE;
-