summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bltGrMarker.C89
-rw-r--r--src/bltGrMarker.h7
-rw-r--r--src/bltGrMarkerLine.C48
-rw-r--r--src/bltGrMarkerLine.h4
-rw-r--r--src/bltGrMarkerPolygon.C10
-rw-r--r--src/bltGrMarkerPolygon.h2
-rw-r--r--src/bltGrMarkerText.C4
-rw-r--r--src/bltGraph.h22
8 files changed, 101 insertions, 85 deletions
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 39f3125..9e37636 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -27,17 +27,25 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+extern "C" {
#include "bltMath.h"
#include "bltGraph.h"
#include "bltOp.h"
#include "bltGrElem.h"
#include "bltConfig.h"
+};
+
#include "bltGrMarker.h"
+
+extern "C" {
#include "bltGrMarkerBitmap.h"
-#include "bltGrMarkerLine.h"
+ //#include "bltGrMarkerLine.h"
#include "bltGrMarkerPolygon.h"
#include "bltGrMarkerText.h"
#include "bltGrMarkerWindow.h"
+};
+
+extern MarkerCreateProc Blt_CreateLineProc;
#define NORMALIZE(A,x) (((x) - (A)->axisRange.min) * (A)->axisRange.scale)
@@ -57,6 +65,21 @@ static int GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr,
Tcl_Obj* objPtr, Marker** markerPtrPtr);
static int IsElementHidden(Marker *markerPtr);
+extern "C" {
+ void Blt_FreeMarker(char*);
+ Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr);
+ int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr);
+
+ void Blt_DestroyMarkers(Graph* graphPtr);
+ void Blt_DrawMarkers(Graph* graphPtr, Drawable drawable, int under);
+ ClientData Blt_MakeMarkerTag(Graph* graphPtr, const char* tagName);
+ void Blt_MapMarkers(Graph* graphPtr);
+ int Blt_MarkerOp(Graph* graphPtr, Tcl_Interp* interp,
+ int objc, Tcl_Obj* const objv[]);
+ void Blt_MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under);
+ Marker* Blt_NearestMarker(Graph* graphPtr, int x, int y, int under);
+};
+
// OptionSpecs
static Tk_CustomOptionSetProc CoordsSetProc;
@@ -89,7 +112,7 @@ static Tcl_Obj* CoordsGetProc(ClientData clientData, Tk_Window tkwin,
Marker* markerPtr = (Marker*)widgRec;
int cnt = markerPtr->nWorldPts*2;
- Tcl_Obj** ll = calloc(cnt, sizeof(Tcl_Obj*));
+ Tcl_Obj** ll = (Tcl_Obj**)calloc(cnt, sizeof(Tcl_Obj*));
Point2d* pp = markerPtr->worldPts;
for (int ii=0; ii < markerPtr->nWorldPts*2; pp++) {
@@ -365,11 +388,10 @@ static int BindOp(Graph* graphPtr, Tcl_Interp* interp,
listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
for (hp = Tcl_FirstHashEntry(&graphPtr->markers.tagTable, &iter);
hp; hp = Tcl_NextHashEntry(&iter)) {
- const char* tag;
- Tcl_Obj *objPtr;
- tag = Tcl_GetHashKey(&graphPtr->markers.tagTable, hp);
- objPtr = Tcl_NewStringObj(tag, -1);
+ const char* tag =
+ (const char*)Tcl_GetHashKey(&graphPtr->markers.tagTable, hp);
+ Tcl_Obj* objPtr = Tcl_NewStringObj(tag, -1);
Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
}
Tcl_SetObjResult(interp, listObjPtr);
@@ -479,9 +501,7 @@ static int FindOp(Graph* graphPtr, Tcl_Interp* interp,
int enclosed = (mode == FIND_ENCLOSED);
for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
link; link = Blt_Chain_NextLink(link)) {
- Marker *markerPtr;
-
- markerPtr = Blt_Chain_GetValue(link);
+ Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
if ((markerPtr->flags & DELETE_PENDING) || markerPtr->hide) {
continue;
}
@@ -508,7 +528,7 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
if (objc == 3) {
for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers.displayList);
link; link = Blt_Chain_NextLink(link)) {
- Marker* markerPtr = Blt_Chain_GetValue(link);
+ Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
Tcl_ListObjAppendElement(interp, listObjPtr,
Tcl_NewStringObj(markerPtr->obj.name, -1));
}
@@ -516,9 +536,9 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
else {
for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers.displayList);
link; link = Blt_Chain_NextLink(link)) {
- Marker* markerPtr = Blt_Chain_GetValue(link);
+ Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
for (int ii = 3; ii<objc; ii++) {
- const char* pattern = Tcl_GetString(objv[ii]);
+ const char* pattern = (const char*)Tcl_GetString(objv[ii]);
if (Tcl_StringMatch(markerPtr->obj.name, pattern)) {
Tcl_ListObjAppendElement(interp, listObjPtr,
Tcl_NewStringObj(markerPtr->obj.name, -1));
@@ -595,26 +615,25 @@ static int TypeOp(Graph* graphPtr, Tcl_Interp* interp,
static Blt_OpSpec markerOps[] =
{
- {"bind", 1, BindOp, 3, 6, "marker sequence command",},
- {"cget", 2, CgetOp, 5, 5, "marker option",},
- {"configure", 2, ConfigureOp, 4, 0,"marker ?marker?... ?option value?...",},
- {"create", 2, CreateOp, 4, 0, "type ?option value?...",},
- {"delete", 1, DeleteOp, 3, 0, "?marker?...",},
- {"exists", 1, ExistsOp, 4, 4, "marker",},
- {"find", 1, FindOp, 8, 8, "enclosed|overlapping x1 y1 x2 y2",},
- {"get", 1, GetOp, 4, 4, "name",},
- {"lower", 1, RelinkOp, 4, 5, "marker ?afterMarker?",},
- {"names", 1, NamesOp, 3, 0, "?pattern?...",},
- {"raise", 1, RelinkOp, 4, 5, "marker ?beforeMarker?",},
- {"type", 1, TypeOp, 4, 4, "marker",},
+ {"bind", 1, (void*)BindOp, 3, 6, "marker sequence command",},
+ {"cget", 2, (void*)CgetOp, 5, 5, "marker option",},
+ {"configure", 2, (void*)ConfigureOp, 4, 0,"marker ?marker?... ?option value?...",},
+ {"create", 2, (void*)CreateOp, 4, 0, "type ?option value?...",},
+ {"delete", 1, (void*)DeleteOp, 3, 0, "?marker?...",},
+ {"exists", 1, (void*)ExistsOp, 4, 4, "marker",},
+ {"find", 1, (void*)FindOp, 8, 8, "enclosed|overlapping x1 y1 x2 y2",},
+ {"get", 1, (void*)GetOp, 4, 4, "name",},
+ {"lower", 1, (void*)RelinkOp, 4, 5, "marker ?afterMarker?",},
+ {"names", 1, (void*)NamesOp, 3, 0, "?pattern?...",},
+ {"raise", 1, (void*)RelinkOp, 4, 5, "marker ?beforeMarker?",},
+ {"type", 1, (void*)TypeOp, 4, 4, "marker",},
};
static int nMarkerOps = sizeof(markerOps) / sizeof(Blt_OpSpec);
int Blt_MarkerOp(Graph* graphPtr, Tcl_Interp* interp,
int objc, Tcl_Obj* const objv[])
{
- GraphMarkerProc* proc =
- Blt_GetOpFromObj(interp, nMarkerOps, markerOps, BLT_OP_ARG2, objc, objv,0);
+ GraphMarkerProc* proc = (GraphMarkerProc*)Blt_GetOpFromObj(interp, nMarkerOps, markerOps, BLT_OP_ARG2, objc, objv,0);
if (proc == NULL)
return TCL_ERROR;
@@ -693,7 +712,7 @@ static int ParseCoordinates(Tcl_Interp* interp, Marker *markerPtr,
return TCL_ERROR;
}
int nWorldPts = objc / 2;
- Point2d* worldPts = malloc(nWorldPts * sizeof(Point2d));
+ Point2d* worldPts = (Point2d*)malloc(nWorldPts * sizeof(Point2d));
if (worldPts == NULL) {
Tcl_AppendResult(interp, "can't allocate new coordinate array",
(char*)NULL);
@@ -734,7 +753,7 @@ static int IsElementHidden(Marker *markerPtr)
if (markerPtr->elemName) {
hPtr = Tcl_FindHashEntry(&graphPtr->elements.table, markerPtr->elemName);
if (hPtr) {
- Element* elemPtr = Tcl_GetHashValue(hPtr);
+ Element* elemPtr = (Element*)Tcl_GetHashValue(hPtr);
if ((elemPtr->link == NULL) || (elemPtr->flags & HIDE))
return TRUE;
}
@@ -808,7 +827,7 @@ static int GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr,
const char* string = Tcl_GetString(objPtr);
Tcl_HashEntry* hPtr = Tcl_FindHashEntry(&graphPtr->markers.table, string);
if (hPtr) {
- *markerPtrPtr = Tcl_GetHashValue(hPtr);
+ *markerPtrPtr = (Marker*)Tcl_GetHashValue(hPtr);
return TCL_OK;
}
if (interp) {
@@ -823,7 +842,7 @@ void Blt_MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under)
{
for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers.displayList);
link; link = Blt_Chain_PrevLink(link)) {
- Marker* markerPtr = Blt_Chain_GetValue(link);
+ Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
if ((markerPtr->classPtr->postscriptProc == NULL) ||
(markerPtr->nWorldPts == 0))
continue;
@@ -847,7 +866,7 @@ void Blt_DrawMarkers(Graph* graphPtr, Drawable drawable, int under)
{
for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers.displayList);
link; link = Blt_Chain_PrevLink(link)) {
- Marker* markerPtr = Blt_Chain_GetValue(link);
+ Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
if ((markerPtr->nWorldPts == 0) ||
(markerPtr->drawUnder != under) ||
@@ -867,7 +886,7 @@ void Blt_ConfigureMarkers(Graph* graphPtr)
{
for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
link; link = Blt_Chain_NextLink(link)) {
- Marker* markerPtr = Blt_Chain_GetValue(link);
+ Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
(*markerPtr->classPtr->configProc) (markerPtr);
}
}
@@ -876,7 +895,7 @@ void Blt_MapMarkers(Graph* graphPtr)
{
for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
link; link = Blt_Chain_NextLink(link)) {
- Marker *markerPtr = Blt_Chain_GetValue(link);
+ Marker *markerPtr = (Marker*)Blt_Chain_GetValue(link);
if (markerPtr->nWorldPts == 0)
continue;
@@ -895,7 +914,7 @@ void Blt_DestroyMarkers(Graph* graphPtr)
Tcl_HashSearch iter;
for (Tcl_HashEntry* hPtr=Tcl_FirstHashEntry(&graphPtr->markers.table, &iter);
hPtr; hPtr = Tcl_NextHashEntry(&iter)) {
- Marker* markerPtr = Tcl_GetHashValue(hPtr);
+ Marker* markerPtr = (Marker*)Tcl_GetHashValue(hPtr);
// Dereferencing the pointer to the hash table prevents the hash table
// entry from being automatically deleted.
@@ -914,7 +933,7 @@ Marker* Blt_NearestMarker(Graph* graphPtr, int x, int y, int under)
point.y = (double)y;
for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
link; link = Blt_Chain_NextLink(link)) {
- Marker* markerPtr = Blt_Chain_GetValue(link);
+ Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
if ((markerPtr->nWorldPts == 0) ||
(markerPtr->flags & (DELETE_PENDING|MAP_ITEM)) ||
(markerPtr->hide))
diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h
index ce5c496..9803ecc 100644
--- a/src/bltGrMarker.h
+++ b/src/bltGrMarker.h
@@ -32,9 +32,6 @@
#define MAX_OUTLINE_POINTS 12
-extern Blt_CustomOption bltXAxisOption;
-extern Blt_CustomOption bltYAxisOption;
-
typedef Marker *(MarkerCreateProc)(Graph*);
typedef void (MarkerDrawProc)(Marker *markerPtr, Drawable drawable);
typedef void (MarkerFreeProc)(Marker *markerPtr);
@@ -97,8 +94,4 @@ extern Tk_ObjCustomOption joinStyleObjOption;
extern Tk_ObjCustomOption xAxisObjOption;
extern Tk_ObjCustomOption yAxisObjOption;
-Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr);
-int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr);
-void Blt_FreeMarker(char*);
-
#endif
diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C
index d6093d2..52a62a1 100644
--- a/src/bltGrMarkerLine.C
+++ b/src/bltGrMarkerLine.C
@@ -27,7 +27,11 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+extern "C" {
#include "bltGraph.h"
+ Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr);
+};
+
#include "bltGrMarkerLine.h"
static Tk_OptionSpec optionSpecs[] = {
@@ -68,7 +72,7 @@ static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_PIXELS, "-xoffset", "xOffset", "XOffset",
"0", -1, Tk_Offset(LineMarker, xOffset), 0, NULL, 0},
{TK_OPTION_BOOLEAN, "-xor", "xor", "Xor",
- "no", -1, Tk_Offset(LineMarker, xor), 0, NULL, 0},
+ "no", -1, Tk_Offset(LineMarker, xorr), 0, NULL, 0},
{TK_OPTION_PIXELS, "-yoffset", "yOffset", "YOffset",
"0", -1, Tk_Offset(LineMarker, yOffset), 0, NULL, 0},
{TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0}
@@ -96,9 +100,9 @@ static MarkerClass lineMarkerClass = {
Marker* Blt_CreateLineProc(Graph* graphPtr)
{
- LineMarker* lmPtr = calloc(1, sizeof(LineMarker));
+ LineMarker* lmPtr = (LineMarker*)calloc(1, sizeof(LineMarker));
lmPtr->classPtr = &lineMarkerClass;
- lmPtr->xor = FALSE;
+ lmPtr->xorr = FALSE;
lmPtr->capStyle = CapButt;
lmPtr->joinStyle = JoinMiter;
lmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
@@ -162,7 +166,7 @@ static void DrawLineProc(Marker *markerPtr, Drawable drawable)
Blt_Draw2DSegments(graphPtr->display, drawable, lmPtr->gc,
lmPtr->segments, lmPtr->nSegments);
- if (lmPtr->xor) { /* Toggle the drawing state */
+ if (lmPtr->xorr) { /* Toggle the drawing state */
lmPtr->xorState = (lmPtr->xorState == 0);
}
}
@@ -195,7 +199,7 @@ static int ConfigureLineProc(Marker *markerPtr)
gcValues.line_style =
(gcMask & GCBackground) ? LineDoubleDash : LineOnOffDash;
}
- if (lmPtr->xor) {
+ if (lmPtr->xorr) {
unsigned long pixel;
gcValues.function = GXxor;
@@ -217,7 +221,7 @@ static int ConfigureLineProc(Marker *markerPtr)
Blt_SetDashes(graphPtr->display, newGC, &lmPtr->dashes);
}
lmPtr->gc = newGC;
- if (lmPtr->xor) {
+ if (lmPtr->xorr) {
if (drawable != None) {
MapLineProc(markerPtr);
DrawLineProc(markerPtr, drawable);
@@ -273,18 +277,15 @@ static void MapLineProc(Marker *markerPtr)
{
Graph* graphPtr = markerPtr->obj.graphPtr;
LineMarker *lmPtr = (LineMarker *)markerPtr;
- Point2d *srcPtr, *pend;
- Segment2d *segments, *segPtr;
- Point2d p, q;
- Region2d extents;
lmPtr->nSegments = 0;
- if (lmPtr->segments != NULL) {
+ if (lmPtr->segments != NULL)
free(lmPtr->segments);
- }
- if (markerPtr->nWorldPts < 2) {
- return; /* Too few points */
- }
+
+ if (markerPtr->nWorldPts < 2)
+ return;
+
+ Region2d extents;
Blt_GraphExtents(graphPtr, &extents);
/*
@@ -293,21 +294,22 @@ static void MapLineProc(Marker *markerPtr)
* because clipping against the plot area may chop the line into several
* disconnected segments.
*/
- segments = malloc(markerPtr->nWorldPts * sizeof(Segment2d));
- srcPtr = markerPtr->worldPts;
- p = Blt_MapPoint(srcPtr, &markerPtr->axes);
+ Segment2d* segments =
+ (Segment2d*)malloc(markerPtr->nWorldPts * sizeof(Segment2d));
+ Point2d* srcPtr = markerPtr->worldPts;
+ Point2d p = Blt_MapPoint(srcPtr, &markerPtr->axes);
p.x += markerPtr->xOffset;
p.y += markerPtr->yOffset;
- segPtr = segments;
+ Segment2d* segPtr = segments;
+ Point2d* pend;
for (srcPtr++, pend = markerPtr->worldPts + markerPtr->nWorldPts;
srcPtr < pend; srcPtr++) {
- Point2d next;
-
- next = Blt_MapPoint(srcPtr, &markerPtr->axes);
+ Point2d next = Blt_MapPoint(srcPtr, &markerPtr->axes);
next.x += markerPtr->xOffset;
next.y += markerPtr->yOffset;
- q = next;
+ Point2d q = next;
+
if (Blt_LineRectClip(&extents, &p, &q)) {
segPtr->p = p;
segPtr->q = q;
diff --git a/src/bltGrMarkerLine.h b/src/bltGrMarkerLine.h
index f6e8718..f5ab354 100644
--- a/src/bltGrMarkerLine.h
+++ b/src/bltGrMarkerLine.h
@@ -87,11 +87,9 @@ typedef struct {
* necessarily be connected after
* clipping. */
int nSegments; /* # segments in the above array. */
- int xor;
+ int xorr;
int xorState; /* State of the XOR drawing. Indicates
* if the marker is currently drawn. */
} LineMarker;
-extern MarkerCreateProc Blt_CreateLineProc;
-
#endif
diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C
index 35bae35..40381ad 100644
--- a/src/bltGrMarkerPolygon.C
+++ b/src/bltGrMarkerPolygon.C
@@ -30,6 +30,10 @@
#include "bltGraph.h"
#include "bltGrMarkerPolygon.h"
+extern Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr);
+extern int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr);
+extern void Blt_FreeMarker(char*);
+
static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_CUSTOM, "-bindtags", "bindTags", "BindTags",
"Polygon all", -1, Tk_Offset(PolygonMarker, obj.tags),
@@ -73,7 +77,7 @@ static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_PIXELS, "-xoffset", "xOffset", "XOffset",
"0", -1, Tk_Offset(PolygonMarker, xOffset), 0, NULL, 0},
{TK_OPTION_BOOLEAN, "-xor", "xor", "Xor",
- "no", -1, Tk_Offset(PolygonMarker, xor), 0, NULL, 0},
+ "no", -1, Tk_Offset(PolygonMarker, xorr), 0, NULL, 0},
{TK_OPTION_PIXELS, "-yoffset", "yOffset", "YOffset",
"0", -1, Tk_Offset(PolygonMarker, yOffset), 0, NULL, 0},
{TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0}
@@ -257,7 +261,7 @@ static int ConfigurePolygonProc(Marker *markerPtr)
gcValues.line_style = (pmPtr->outlineBg == NULL)
? LineOnOffDash : LineDoubleDash;
}
- if (pmPtr->xor) {
+ if (pmPtr->xorr) {
unsigned long pixel;
gcValues.function = GXxor;
@@ -301,7 +305,7 @@ static int ConfigurePolygonProc(Marker *markerPtr)
}
pmPtr->fillGC = newGC;
- if ((gcMask == 0) && !(graphPtr->flags & RESET_AXES) && (pmPtr->xor)) {
+ if ((gcMask == 0) && !(graphPtr->flags & RESET_AXES) && (pmPtr->xorr)) {
if (drawable != None) {
MapPolygonProc(markerPtr);
DrawPolygonProc(markerPtr, drawable);
diff --git a/src/bltGrMarkerPolygon.h b/src/bltGrMarkerPolygon.h
index 30b77f0..f2733fc 100644
--- a/src/bltGrMarkerPolygon.h
+++ b/src/bltGrMarkerPolygon.h
@@ -111,7 +111,7 @@ typedef struct {
* may not necessarily be closed or
* connected after clipping. */
int nOutlinePts; /* # points in the above array. */
- int xor;
+ int xorr;
int xorState; /* State of the XOR drawing. Indicates
* if the marker is visible. We have to
* drawn it again to erase it. */
diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C
index 5071904..137a181 100644
--- a/src/bltGrMarkerText.C
+++ b/src/bltGrMarkerText.C
@@ -31,6 +31,10 @@
#include "bltGrMarkerText.h"
#include "bltMath.h"
+extern Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr);
+extern int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr);
+extern void Blt_FreeMarker(char*);
+
static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
"center", -1, Tk_Offset(TextMarker, anchor), 0, NULL, 0},
diff --git a/src/bltGraph.h b/src/bltGraph.h
index 0d6c920..8e55c13 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -429,8 +429,6 @@ extern void Blt_DestroyAxes(Graph* graphPtr);
extern void Blt_DestroyElements(Graph* graphPtr);
-extern void Blt_DestroyMarkers(Graph* graphPtr);
-
extern void Blt_DestroyPageSetup(Graph* graphPtr);
extern void Blt_DrawAxes(Graph* graphPtr, Drawable drawable);
@@ -443,8 +441,6 @@ extern void Blt_DrawActiveElements(Graph* graphPtr, Drawable drawable);
extern void Blt_DrawGraph(Graph* graphPtr, Drawable drawable);
-extern void Blt_DrawMarkers(Graph* graphPtr, Drawable drawable, int under);
-
extern void Blt_Draw2DSegments(Display *display, Drawable drawable, GC gc,
Segment2d *segments, int nSegments);
@@ -473,8 +469,6 @@ extern void Blt_MapAxes(Graph* graphPtr);
extern void Blt_MapElements(Graph* graphPtr);
-extern void Blt_MapMarkers(Graph* graphPtr);
-
extern void Blt_DestroyPens(Graph* graphPtr);
extern int Blt_GetPenFromObj(Tcl_Interp* interp, Graph* graphPtr,
@@ -506,9 +500,6 @@ extern int Blt_ElementOp(Graph* graphPtr, Tcl_Interp* interp, int objc,
extern int Blt_CrosshairsOp(Graph* graphPtr, Tcl_Interp* interp, int objc,
Tcl_Obj* const objv[]);
-extern int Blt_MarkerOp(Graph* graphPtr, Tcl_Interp* interp, int objc,
- Tcl_Obj* const objv[]);
-
extern int Blt_PenOp(Graph* graphPtr, Tcl_Interp* interp, int objc,
Tcl_Obj* const objv[]);
@@ -532,21 +523,17 @@ extern Axis *Blt_GetFirstAxis(Blt_Chain chain);
extern void Blt_UpdateAxisBackgrounds(Graph* graphPtr);
-extern Marker *Blt_NearestMarker(Graph* graphPtr, int x, int y, int under);
-
extern Axis *Blt_NearestAxis(Graph* graphPtr, int x, int y);
typedef ClientData (MakeTagProc)(Graph* graphPtr, const char *tagName);
extern MakeTagProc Blt_MakeElementTag;
-extern MakeTagProc Blt_MakeMarkerTag;
extern MakeTagProc Blt_MakeAxisTag;
extern Blt_BindTagProc Blt_GraphTags;
extern Blt_BindTagProc Blt_AxisTags;
extern void Blt_GraphSetObjectClass(GraphObj *graphObjPtr,ClassId classId);
-extern void Blt_MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under);
extern void Blt_ElementsToPostScript(Graph* graphPtr, Blt_Ps ps);
extern void Blt_ActiveElementsToPostScript(Graph* graphPtr, Blt_Ps ps);
extern void Blt_LegendToPostScript(Graph* graphPtr, Blt_Ps ps);
@@ -563,4 +550,13 @@ extern void Blt_DestroyBarSets(Graph* graphPtr);
extern const char *Blt_GraphClassName(ClassId classId);
+extern void Blt_DestroyMarkers(Graph* graphPtr);
+extern void Blt_DrawMarkers(Graph* graphPtr, Drawable drawable, int under);
+extern ClientData Blt_MakeMarkerTag(Graph* graphPtr, const char* tagName);
+extern void Blt_MapMarkers(Graph* graphPtr);
+extern int Blt_MarkerOp(Graph* graphPtr, Tcl_Interp* interp,
+ int objc, Tcl_Obj* const objv[]);
+extern void Blt_MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under);
+extern Marker* Blt_NearestMarker(Graph* graphPtr, int x, int y, int under);
+
#endif
generated by cgit v0.12 at 2024-10-14 05:18:16 (GMT)