diff options
-rw-r--r-- | src/bltGrAxisOp.C | 18 | ||||
-rw-r--r-- | src/bltGrAxisOp.h | 9 | ||||
-rw-r--r-- | src/bltGraph.C | 16 | ||||
-rw-r--r-- | src/bltGraph.h | 1 |
4 files changed, 21 insertions, 23 deletions
diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C index 5ec3ff8..ad91655 100644 --- a/src/bltGrAxisOp.C +++ b/src/bltGrAxisOp.C @@ -874,24 +874,6 @@ void Blt_DrawGrids(Graph* graphPtr, Drawable drawable) } } -void Blt_AxesToPostScript(Graph* graphPtr, Blt_Ps ps) -{ - GraphOptions* gops = (GraphOptions*)graphPtr->ops_; - Margin *mp, *mend; - - for (mp = gops->margins, mend = mp + 4; mp < mend; mp++) { - Blt_ChainLink link; - - for (link = Blt_Chain_FirstLink(mp->axes); link != NULL; - link = Blt_Chain_NextLink(link)) { - Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link); - AxisOptions* ops = (AxisOptions*)axisPtr->ops(); - if (!ops->hide && axisPtr->use_ && !(axisPtr->flags & DELETE_PENDING)) - axisPtr->print(ps); - } - } -} - void Blt_GridsToPostScript(Graph* graphPtr, Blt_Ps ps) { GraphOptions* gops = (GraphOptions*)graphPtr->ops_; diff --git a/src/bltGrAxisOp.h b/src/bltGrAxisOp.h index aa5e80b..8d8970d 100644 --- a/src/bltGrAxisOp.h +++ b/src/bltGrAxisOp.h @@ -36,19 +36,18 @@ extern int Blt_AxisOp(Graph* graphPtr, Tcl_Interp* interp, extern Tcl_FreeProc FreeAxis; extern int GetAxisFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, Axis **axisPtrPtr); +extern Point2d Blt_InvMap2D(Graph* graphPtr, double x, double y, + Axis2d *pairPtr); +extern Point2d Blt_Map2D(Graph* graphPtr, double x, double y, + Axis2d *pairPtr); extern void Blt_AdjustAxisPointers(Graph* graphPtr); extern void Blt_DrawAxisLimits(Graph* graphPtr, Drawable drawable); extern void Blt_DrawGrids(Graph* graphPtr, Drawable drawable); extern void Blt_UpdateAxisBackgrounds(Graph* graphPtr); -extern void Blt_AxesToPostScript(Graph* graphPtr, Blt_Ps ps); extern void Blt_AxisLimitsToPostScript(Graph* graphPtr, Blt_Ps ps); extern void Blt_GridsToPostScript(Graph* graphPtr, Blt_Ps ps); extern Axis *Blt_GetFirstAxis(Blt_Chain chain); extern Axis *Blt_NearestAxis(Graph* graphPtr, int x, int y); -extern Point2d Blt_InvMap2D(Graph* graphPtr, double x, double y, - Axis2d *pairPtr); -extern Point2d Blt_Map2D(Graph* graphPtr, double x, double y, - Axis2d *pairPtr); #endif diff --git a/src/bltGraph.C b/src/bltGraph.C index 8feec62..5beff47 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -1133,3 +1133,19 @@ void Graph::resetAxes() flags |= (GET_AXIS_GEOMETRY | LAYOUT_NEEDED | MAP_ALL | REDRAW_WORLD); } +void Graph::printAxes(Blt_Ps ps) +{ + GraphOptions* gops = (GraphOptions*)ops_; + + Margin *mp, *mend; + for (mp = gops->margins, mend = mp + 4; mp < mend; mp++) { + for (Blt_ChainLink link=Blt_Chain_FirstLink(mp->axes); link; + link = Blt_Chain_NextLink(link)) { + Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link); + AxisOptions* ops = (AxisOptions*)axisPtr->ops(); + if (!ops->hide && axisPtr->use_ && !(axisPtr->flags & DELETE_PENDING)) + axisPtr->print(ps); + } + } +} + diff --git a/src/bltGraph.h b/src/bltGraph.h index 9ba8640..b440acc 100644 --- a/src/bltGraph.h +++ b/src/bltGraph.h @@ -228,6 +228,7 @@ class Graph { void disableCrosshairs(); void resetAxes(); + void printAxes(Blt_Ps); }; extern void Blt_ReconfigureGraph(Graph* graphPtr); |