summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2014-03-12 21:02:47 (GMT)
committerjoye <joye>2014-03-12 21:02:47 (GMT)
commita0a16e9c78def9991b7cf10c4463493b4c7d12e3 (patch)
tree51314f330e861e727fb37d7633711530479b4de9
parente945400d5f92a1bb81236f013ccd09a3df4b6c36 (diff)
downloadblt-a0a16e9c78def9991b7cf10c4463493b4c7d12e3.zip
blt-a0a16e9c78def9991b7cf10c4463493b4c7d12e3.tar.gz
blt-a0a16e9c78def9991b7cf10c4463493b4c7d12e3.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrElemLine.C17
-rw-r--r--src/bltGraph.h16
2 files changed, 14 insertions, 19 deletions
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index d40c6c0..a2505e1 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -43,13 +43,6 @@
#include "bltBitmap.h"
#include "bltConfig.h"
-typedef enum {
- PEN_INCREASING, PEN_DECREASING, PEN_BOTH_DIRECTIONS
-} PenDirection;
-
-/* Lines will be drawn between points regardless of the ordering of the
- * abscissas */
-
#define PointInRegion(e,x,y) (((x) <= (e)->right) && ((x) >= (e)->left) && ((y) <= (e)->bottom) && ((y) >= (e)->top))
#define BROKEN_TRACE(dir,last,next) \
@@ -59,6 +52,16 @@ typedef enum {
#define DRAW_SYMBOL(linePtr) \
(((linePtr)->symbolCounter % (linePtr)->symbolInterval) == 0)
+typedef struct {
+ Point2d *points;
+ int length;
+ int *map;
+} GraphPoints;
+
+typedef enum {
+ PEN_INCREASING, PEN_DECREASING, PEN_BOTH_DIRECTIONS
+} PenDirection;
+
typedef enum {
PEN_SMOOTH_LINEAR, PEN_SMOOTH_STEP, PEN_SMOOTH_NATURAL,
PEN_SMOOTH_QUADRATIC, PEN_SMOOTH_CATROM
diff --git a/src/bltGraph.h b/src/bltGraph.h
index 863c2f9..3b33368 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -49,8 +49,11 @@
#define bottomMargin margins[MARGIN_BOTTOM]
typedef struct _Graph Graph;
-typedef struct _Element Element;
typedef struct _Legend Legend;
+typedef struct _Crosshairs Crosshairs;
+typedef struct _Element Element;
+typedef struct _Pen Pen;
+typedef struct _Marker Marker;
typedef enum {
CID_NONE, CID_AXIS_X, CID_AXIS_Y, CID_ELEM_BAR, CID_ELEM_LINE,
@@ -106,12 +109,6 @@ typedef struct {
} GraphSegments;
typedef struct {
- Point2d *points;
- int length;
- int *map;
-} GraphPoints;
-
-typedef struct {
int nSegments; /* Number of occurrences of
* x-coordinate */
Axis2d axes; /* The axes associated with this
@@ -138,15 +135,10 @@ typedef enum BarModes {
BARS_INFRONT, BARS_STACKED, BARS_ALIGNED, BARS_OVERLAP
} BarMode;
-typedef struct _Pen Pen;
-typedef struct _Marker Marker;
-
typedef Pen *(PenCreateProc)(void);
typedef int (PenConfigureProc)(Graph* graphPtr, Pen* penPtr);
typedef void (PenDestroyProc)(Graph* graphPtr, Pen* penPtr);
-typedef struct _Crosshairs Crosshairs;
-
typedef struct {
short int width, height; /* Dimensions of the margin */
short int axesOffset;