summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bltGrAxisOp.C6
-rw-r--r--src/bltGrMarker.C2
-rw-r--r--src/bltGrMarkerOp.C46
-rw-r--r--src/bltGrXAxisOp.C2
-rw-r--r--src/bltGraph.C17
-rw-r--r--src/bltGraph.h5
6 files changed, 38 insertions, 40 deletions
diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 1ac6dbb..4d6845c 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -417,7 +417,7 @@ static int BindOp(Tcl_Interp* interp, Graph* graphPtr, int objc,
return TCL_OK;
}
else
- return Blt_ConfigureBindingsFromObj(interp, graphPtr->bindTable, Blt_MakeAxisTag(graphPtr, Tcl_GetString(objv[3])), objc-4, objv+4);
+ return Blt_ConfigureBindingsFromObj(interp, graphPtr->bindTable_, Blt_MakeAxisTag(graphPtr, Tcl_GetString(objv[3])), objc-4, objv+4);
}
static int CreateOp(Tcl_Interp* interp, Graph* graphPtr,
@@ -467,7 +467,7 @@ static int FocusOp(Tcl_Interp* interp, Graph* graphPtr,
graphPtr->focusPtr_ = axisPtr;
}
- Blt_SetFocusItem(graphPtr->bindTable, graphPtr->focusPtr_, NULL);
+ Blt_SetFocusItem(graphPtr->bindTable_, graphPtr->focusPtr_, NULL);
if (graphPtr->focusPtr_)
Tcl_SetStringObj(Tcl_GetObjResult(interp), graphPtr->focusPtr_->name(),-1);
@@ -478,7 +478,7 @@ static int FocusOp(Tcl_Interp* interp, Graph* graphPtr,
static int GetOp(Tcl_Interp* interp, Graph* graphPtr,
int objc, Tcl_Obj* const objv[])
{
- Axis* axisPtr = (Axis*)Blt_GetCurrentItem(graphPtr->bindTable);
+ Axis* axisPtr = (Axis*)Blt_GetCurrentItem(graphPtr->bindTable_);
// Report only on axes
if ((axisPtr) &&
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index fcfe640..599aed4 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -57,7 +57,7 @@ Marker::~Marker()
Tcl_DeleteHashEntry(hashPtr_);
if (link)
- Blt_Chain_DeleteLink(graphPtr_->markers.displayList, link);
+ Blt_Chain_DeleteLink(graphPtr_->markers_.displayList, link);
Tk_FreeConfigOptions((char*)ops_, optionTable_, graphPtr_->tkwin_);
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 7ce5df0..e80a788 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -114,7 +114,7 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
int isNew;
Tcl_HashEntry* hPtr =
- Tcl_CreateHashEntry(&graphPtr->markers.table, name, &isNew);
+ Tcl_CreateHashEntry(&graphPtr->markers_.table, name, &isNew);
if (!isNew) {
Tcl_AppendResult(graphPtr->interp_, "marker \"", name,
"\" already exists in \"", Tcl_GetString(objv[0]),
@@ -145,7 +145,7 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
}
// Unlike elements, new markers are drawn on top of old markers
- markerPtr->link = Blt_Chain_Prepend(graphPtr->markers.displayList, markerPtr);
+ markerPtr->link = Blt_Chain_Prepend(graphPtr->markers_.displayList, markerPtr);
Tcl_SetStringObj(Tcl_GetObjResult(interp), name, -1);
return TCL_OK;
@@ -202,11 +202,11 @@ static int BindOp(Graph* graphPtr, Tcl_Interp* interp,
Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
Tcl_HashSearch iter;
for (Tcl_HashEntry* hp =
- Tcl_FirstHashEntry(&graphPtr->markers.tagTable, &iter);
+ Tcl_FirstHashEntry(&graphPtr->markers_.tagTable, &iter);
hp; hp = Tcl_NextHashEntry(&iter)) {
const char* tag =
- (const char*)Tcl_GetHashKey(&graphPtr->markers.tagTable, hp);
+ (const char*)Tcl_GetHashKey(&graphPtr->markers_.tagTable, hp);
Tcl_Obj* objPtr = Tcl_NewStringObj(tag, -1);
Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
}
@@ -253,7 +253,7 @@ static int ExistsOp(Graph* graphPtr, Tcl_Interp* interp,
int objc, Tcl_Obj* const objv[])
{
Tcl_HashEntry* hPtr =
- Tcl_FindHashEntry(&graphPtr->markers.table, Tcl_GetString(objv[3]));
+ Tcl_FindHashEntry(&graphPtr->markers_.table, Tcl_GetString(objv[3]));
Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (hPtr));
return TCL_OK;
@@ -304,7 +304,7 @@ static int FindOp(Graph* graphPtr, Tcl_Interp* interp,
}
int enclosed = (mode == FIND_ENCLOSED);
- for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
+ for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers_.displayList);
link; link = Blt_Chain_NextLink(link)) {
Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
MarkerOptions* ops = (MarkerOptions*)markerPtr->ops();
@@ -345,7 +345,7 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
{
Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
if (objc == 3) {
- for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers.displayList);
+ for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers_.displayList);
link; link = Blt_Chain_NextLink(link)) {
Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
Tcl_ListObjAppendElement(interp, listObjPtr,
@@ -353,7 +353,7 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
}
}
else {
- for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers.displayList);
+ for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers_.displayList);
link; link = Blt_Chain_NextLink(link)) {
Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
for (int ii = 3; ii<objc; ii++) {
@@ -385,15 +385,15 @@ static int RelinkOp(Graph* graphPtr, Tcl_Interp* interp,
return TCL_ERROR;
Blt_ChainLink link = markerPtr->link;
- Blt_Chain_UnlinkLink(graphPtr->markers.displayList, markerPtr->link);
+ Blt_Chain_UnlinkLink(graphPtr->markers_.displayList, markerPtr->link);
Blt_ChainLink place = placePtr ? placePtr->link : NULL;
const char* string = Tcl_GetString(objv[2]);
if (string[0] == 'l')
- Blt_Chain_LinkAfter(graphPtr->markers.displayList, link, place);
+ Blt_Chain_LinkAfter(graphPtr->markers_.displayList, link, place);
else
- Blt_Chain_LinkBefore(graphPtr->markers.displayList, link, place);
+ Blt_Chain_LinkBefore(graphPtr->markers_.displayList, link, place);
if (ops->drawUnder)
graphPtr->flags |= CACHE_DIRTY;
@@ -465,7 +465,7 @@ static int GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr,
Tcl_Obj *objPtr, Marker** markerPtrPtr)
{
const char* string = Tcl_GetString(objPtr);
- Tcl_HashEntry* hPtr = Tcl_FindHashEntry(&graphPtr->markers.table, string);
+ Tcl_HashEntry* hPtr = Tcl_FindHashEntry(&graphPtr->markers_.table, string);
if (hPtr) {
*markerPtrPtr = (Marker*)Tcl_GetHashValue(hPtr);
return TCL_OK;
@@ -488,7 +488,7 @@ static void FreeMarker(char* dataPtr)
void Blt::MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under)
{
- for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers.displayList);
+ for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers_.displayList);
link; link = Blt_Chain_PrevLink(link)) {
Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
MarkerOptions* ops = (MarkerOptions*)markerPtr->ops();
@@ -509,7 +509,7 @@ void Blt::MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under)
void Blt::DrawMarkers(Graph* graphPtr, Drawable drawable, int under)
{
- for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers.displayList);
+ for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers_.displayList);
link; link = Blt_Chain_PrevLink(link)) {
Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
MarkerOptions* ops = (MarkerOptions*)markerPtr->ops();
@@ -527,7 +527,7 @@ void Blt::DrawMarkers(Graph* graphPtr, Drawable drawable, int under)
void Blt::ConfigureMarkers(Graph* graphPtr)
{
- for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
+ for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers_.displayList);
link; link = Blt_Chain_NextLink(link)) {
Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
markerPtr->configure();
@@ -536,7 +536,7 @@ void Blt::ConfigureMarkers(Graph* graphPtr)
void Blt::MapMarkers(Graph* graphPtr)
{
- for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
+ for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers_.displayList);
link; link = Blt_Chain_NextLink(link)) {
Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
MarkerOptions* ops = (MarkerOptions*)markerPtr->ops();
@@ -554,7 +554,7 @@ void Blt::MapMarkers(Graph* graphPtr)
void Blt::DestroyMarkers(Graph* graphPtr)
{
Tcl_HashSearch iter;
- for (Tcl_HashEntry* hPtr=Tcl_FirstHashEntry(&graphPtr->markers.table, &iter);
+ for (Tcl_HashEntry* hPtr=Tcl_FirstHashEntry(&graphPtr->markers_.table, &iter);
hPtr; hPtr = Tcl_NextHashEntry(&iter)) {
Marker* markerPtr = (Marker*)Tcl_GetHashValue(hPtr);
@@ -562,9 +562,9 @@ void Blt::DestroyMarkers(Graph* graphPtr)
// entry from being automatically deleted.
delete markerPtr;
}
- Tcl_DeleteHashTable(&graphPtr->markers.table);
- Tcl_DeleteHashTable(&graphPtr->markers.tagTable);
- Blt_Chain_Destroy(graphPtr->markers.displayList);
+ Tcl_DeleteHashTable(&graphPtr->markers_.table);
+ Tcl_DeleteHashTable(&graphPtr->markers_.tagTable);
+ Blt_Chain_Destroy(graphPtr->markers_.displayList);
}
void* Blt::NearestMarker(Graph* graphPtr, int x, int y, int under)
@@ -572,7 +572,7 @@ void* Blt::NearestMarker(Graph* graphPtr, int x, int y, int under)
Point2d point;
point.x = (double)x;
point.y = (double)y;
- for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
+ for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers_.displayList);
link; link = Blt_Chain_NextLink(link)) {
Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
MarkerOptions* ops = (MarkerOptions*)markerPtr->ops();
@@ -594,7 +594,7 @@ ClientData Blt::MakeMarkerTag(Graph* graphPtr, const char* tagName)
{
int isNew;
Tcl_HashEntry *hPtr =
- Tcl_CreateHashEntry(&graphPtr->markers.tagTable, tagName, &isNew);
- return Tcl_GetHashKey(&graphPtr->markers.tagTable, hPtr);
+ Tcl_CreateHashEntry(&graphPtr->markers_.tagTable, tagName, &isNew);
+ return Tcl_GetHashKey(&graphPtr->markers_.tagTable, hPtr);
}
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 1805bad..0ef8d84 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -101,7 +101,7 @@ static int BindOp(Tcl_Interp* interp, Axis* axisPtr,
{
Graph* graphPtr = axisPtr->graphPtr_;
- return Blt_ConfigureBindingsFromObj(interp, graphPtr->bindTable, Blt_MakeAxisTag(graphPtr, axisPtr->name()), objc-3, objv+3);
+ return Blt_ConfigureBindingsFromObj(interp, graphPtr->bindTable_, Blt_MakeAxisTag(graphPtr, axisPtr->name()), objc-3, objv+3);
}
static int UseOp(Tcl_Interp* interp, Axis* axisPtr,
diff --git a/src/bltGraph.C b/src/bltGraph.C
index ac46fe4..5cb48f8 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -277,16 +277,15 @@ Graph::Graph(ClientData clientData, Tcl_Interp* interp,
Tcl_InitHashTable(&axes_.tagTable, TCL_STRING_KEYS);
Tcl_InitHashTable(&elements_.table, TCL_STRING_KEYS);
Tcl_InitHashTable(&elements_.tagTable, TCL_STRING_KEYS);
- Tcl_InitHashTable(&markers.table, TCL_STRING_KEYS);
- Tcl_InitHashTable(&markers.tagTable, TCL_STRING_KEYS);
- Tcl_InitHashTable(&dataTables, TCL_STRING_KEYS);
- Tcl_InitHashTable(&penTable, TCL_STRING_KEYS);
+ Tcl_InitHashTable(&markers_.table, TCL_STRING_KEYS);
+ Tcl_InitHashTable(&markers_.tagTable, TCL_STRING_KEYS);
+ Tcl_InitHashTable(&penTable_, TCL_STRING_KEYS);
Tcl_InitHashTable(&setTable_, sizeof(BarSetKey) / sizeof(int));
axes_.displayList = Blt_Chain_Create();
elements_.displayList = Blt_Chain_Create();
- markers.displayList = Blt_Chain_Create();
- bindTable = Blt_CreateBindingTable(interp_, tkwin_, this,
- PickEntry, Blt_GraphTags);
+ markers_.displayList = Blt_Chain_Create();
+ bindTable_ = Blt_CreateBindingTable(interp_, tkwin_, this,
+ PickEntry, Blt_GraphTags);
if (Blt_CreatePen(this, interp_, "activeLine", CID_ELEM_LINE, 0, NULL) !=
TCL_OK) {
@@ -342,8 +341,8 @@ Graph::~Graph()
Blt_DestroyPageSetup(this);
Blt_DestroyBarSets(this);
- if (bindTable)
- Blt_DestroyBindingTable(bindTable);
+ if (bindTable_)
+ Blt_DestroyBindingTable(bindTable_);
if (drawGC_)
Tk_FreeGC(display_, drawGC_);
diff --git a/src/bltGraph.h b/src/bltGraph.h
index 38c890d..0acf384 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -155,9 +155,8 @@ class Graph {
Component axes_;
Component elements_;
Component markers_;
- Tcl_HashTable dataTables;
- Tcl_HashTable penTable;
- Blt_BindTable bindTable;
+ Tcl_HashTable penTable_;
+ Blt_BindTable bindTable_;
Blt_Chain axisChain[4];
Legend* legend_;
generated by cgit v0.12 at 2024-10-03 19:30:27 (GMT)