diff options
author | joye <joye> | 2014-03-20 17:07:21 (GMT) |
---|---|---|
committer | joye <joye> | 2014-03-20 17:07:21 (GMT) |
commit | 728d5bf2094ca2919b3ee586912558cd78267298 (patch) | |
tree | 18d826a76a307809bde848842aa4e8d8559a6bf7 /src | |
parent | a0524267394b04b7f4a558bceb866bd49a2222bf (diff) | |
download | blt-728d5bf2094ca2919b3ee586912558cd78267298.zip blt-728d5bf2094ca2919b3ee586912558cd78267298.tar.gz blt-728d5bf2094ca2919b3ee586912558cd78267298.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r-- | src/bltGrMarker.C | 2 | ||||
-rw-r--r-- | src/bltGrMarker.h | 10 | ||||
-rw-r--r-- | src/bltGrMarkerLine.h | 26 | ||||
-rw-r--r-- | src/bltGrMarkerPolygon.h | 32 | ||||
-rw-r--r-- | src/bltGrMarkerText.h | 20 | ||||
-rw-r--r-- | src/bltGraph.h | 1 |
6 files changed, 49 insertions, 42 deletions
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index ef8e676..626766b 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -676,7 +676,7 @@ static int IsElementHidden(Marker *markerPtr) hPtr = Tcl_FindHashEntry(&graphPtr->elements.table, markerPtr->elemName); if (hPtr) { Element* elemPtr = (Element*)Tcl_GetHashValue(hPtr); - if ((elemPtr->link == NULL) || (elemPtr->flags & HIDE)) + if (!elemPtr->link || elemPtr->hide) return TRUE; } } diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h index 63fe568..8fc2f02 100644 --- a/src/bltGrMarker.h +++ b/src/bltGrMarker.h @@ -63,15 +63,17 @@ struct _Marker { Tk_OptionTable optionTable; Tcl_HashEntry *hashPtr; Blt_ChainLink link; + int clipped; + unsigned int flags; + + Coords* worldPts; const char* elemName; Axis2d axes; - int drawUnder; - int clipped; int hide; - unsigned int flags; + int state; + int drawUnder; int xOffset; int yOffset; - int state; }; Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr); diff --git a/src/bltGrMarkerLine.h b/src/bltGrMarkerLine.h index 36a1837..94c1303 100644 --- a/src/bltGrMarkerLine.h +++ b/src/bltGrMarkerLine.h @@ -39,30 +39,32 @@ class LineMarker { Tk_OptionTable optionTable; Tcl_HashEntry *hashPtr; Blt_ChainLink link; + int clipped; + unsigned int flags; + + Coords* worldPts; const char* elemName; Axis2d axes; - int drawUnder; - int clipped; int hide; - unsigned int flags; + int state; + int drawUnder; int xOffset; int yOffset; - int state; - Coords* worldPts; // Fields specific to line - XColor* fillColor; - XColor* outlineColor; - int lineWidth; - int capStyle; - int joinStyle; - Blt_Dashes dashes; GC gc; Segment2d *segments; int nSegments; - int xorr; int xorState; + + int capStyle; + Blt_Dashes dashes; + XColor* fillColor; + int joinStyle; + int lineWidth; + XColor* outlineColor; + int xorr; }; #endif diff --git a/src/bltGrMarkerPolygon.h b/src/bltGrMarkerPolygon.h index 559c5a9..0838604 100644 --- a/src/bltGrMarkerPolygon.h +++ b/src/bltGrMarkerPolygon.h @@ -39,37 +39,39 @@ class PolygonMarker { Tk_OptionTable optionTable; Tcl_HashEntry *hashPtr; Blt_ChainLink link; + int clipped; + unsigned int flags; + + Coords* worldPts; const char* elemName; Axis2d axes; - int drawUnder; - int clipped; int hide; - unsigned int flags; + int state; + int drawUnder; int xOffset; int yOffset; - int state; - Coords* worldPts; // Fields specific to polygon Point2d *screenPts; - XColor* outline; - XColor* outlineBg; - XColor* fill; - XColor* fillBg; - Pixmap stipple; - int lineWidth; - int capStyle; - int joinStyle; - Blt_Dashes dashes; GC outlineGC; GC fillGC; Point2d *fillPts; int nFillPts; Segment2d *outlinePts; int nOutlinePts; - int xorr; int xorState; + + int capStyle; + Blt_Dashes dashes; + XColor* fill; + XColor* fillBg; + int joinStyle; + int lineWidth; + XColor* outline; + XColor* outlineBg; + Pixmap stipple; + int xorr; }; #endif diff --git a/src/bltGrMarkerText.h b/src/bltGrMarkerText.h index 1a33519..c5db678 100644 --- a/src/bltGrMarkerText.h +++ b/src/bltGrMarkerText.h @@ -39,28 +39,30 @@ class TextMarker { Tk_OptionTable optionTable; Tcl_HashEntry *hashPtr; Blt_ChainLink link; + int clipped; + unsigned int flags; + + Coords* worldPts; const char* elemName; Axis2d axes; - int drawUnder; - int clipped; int hide; - unsigned int flags; + int state; + int drawUnder; int xOffset; int yOffset; - int state; - Coords* worldPts; // Fields specific to text - const char* string; - Tk_Anchor anchor; Point2d anchorPt; int width; int height; - TextStyle style; + GC fillGC; Point2d outline[5]; + + Tk_Anchor anchor; XColor* fillColor; - GC fillGC; + TextStyle style; + const char* string; }; #endif diff --git a/src/bltGraph.h b/src/bltGraph.h index 558e810..389910a 100644 --- a/src/bltGraph.h +++ b/src/bltGraph.h @@ -367,7 +367,6 @@ struct _Graph { * GRAPH_FOCUS */ -#define HIDE (1<<0) /* 0x0001 */ #define DELETE_PENDING (1<<1) /* 0x0002 */ #define REDRAW_PENDING (1<<2) /* 0x0004 */ #define ACTIVE_PENDING (1<<3) /* 0x0008 */ |