summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2014-05-15 20:01:37 (GMT)
committerjoye <joye>2014-05-15 20:01:37 (GMT)
commit2eafa8889ec755f4e16abc81e1f61287c075fb7d (patch)
treedae0ccb81ac3ce0b46e7b6ccab2f90c3fd806f29
parent3dab8db3b815f6223d28546ff384a48222841f31 (diff)
downloadblt-2eafa8889ec755f4e16abc81e1f61287c075fb7d.zip
blt-2eafa8889ec755f4e16abc81e1f61287c075fb7d.tar.gz
blt-2eafa8889ec755f4e16abc81e1f61287c075fb7d.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrAxis.C6
-rw-r--r--src/bltGrAxis.h6
-rw-r--r--src/bltGrAxisOp.C2
-rw-r--r--src/bltGrElem.C1
-rw-r--r--src/bltGrElem.h1
-rw-r--r--src/bltGrElemOp.C2
-rw-r--r--src/bltGrHairsOp.C2
-rw-r--r--src/bltGrLegdOp.C2
-rw-r--r--src/bltGrMarkerOp.C2
-rw-r--r--src/bltGrPenOp.C2
-rw-r--r--src/bltGraphOp.C2
11 files changed, 18 insertions, 10 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 69150a6..e6af80b 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -191,12 +191,14 @@ Axis::Axis(Graph* graphPtr, const char* name, int margin, Tcl_HashEntry* hPtr)
className_ = dupstr("none");
hashPtr_ = hPtr;
- link =NULL;
- chain =NULL;
refCount_ =0;
use_ =0;
active_ =0;
+ flags =0;
+ link =NULL;
+ chain =NULL;
+
detail_ =NULL;
titlePos_.x =0;
titlePos_.y =0;
diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index 35fece7..d2eb4dc 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -161,12 +161,14 @@ class Axis {
const char* className_;
Tcl_HashEntry* hashPtr_;
- Blt_ChainLink link;
- Blt_Chain chain;
int refCount_;
int use_;
int active_;
+ unsigned int flags;
+ Blt_ChainLink link;
+ Blt_Chain chain;
+
const char *detail_;
Point2d titlePos_;
unsigned short int titleWidth_;
diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 87b55f3..e5b6246 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -75,7 +75,7 @@ int AxisObjConfigure(Axis* axisPtr, Tcl_Interp* interp,
Tk_RestoreSavedOptions(&savedOptions);
}
- // axisPtr->flags |= mask;
+ axisPtr->flags |= mask;
graphPtr->flags |= REDRAW_WORLD | MAP_WORLD | RESET_AXES | CACHE_DIRTY;
if (axisPtr->configure() != TCL_OK)
return TCL_ERROR;
diff --git a/src/bltGrElem.C b/src/bltGrElem.C
index 9f96185..b38911f 100644
--- a/src/bltGrElem.C
+++ b/src/bltGrElem.C
@@ -53,6 +53,7 @@ Element::Element(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
active_ =0;
labelActive_ =0;
+ flags =0;
link =NULL;
}
diff --git a/src/bltGrElem.h b/src/bltGrElem.h
index bcdba31..309cf59 100644
--- a/src/bltGrElem.h
+++ b/src/bltGrElem.h
@@ -135,6 +135,7 @@ class Element {
int active_;
int labelActive_;
+ unsigned int flags;
Blt_ChainLink link;
protected:
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index b07a17e..8a961b5 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -67,6 +67,8 @@ int ElementObjConfigure( Element* elemPtr, Tcl_Interp* interp,
Tk_RestoreSavedOptions(&savedOptions);
}
+ elemPtr->flags |= mask;
+ elemPtr->flags |= MAP_ITEM;
graphPtr->flags |= RESET_WORLD | CACHE_DIRTY;
if (elemPtr->configure() != TCL_OK)
return TCL_ERROR;
diff --git a/src/bltGrHairsOp.C b/src/bltGrHairsOp.C
index 9a07ee7..af3e0ec 100644
--- a/src/bltGrHairsOp.C
+++ b/src/bltGrHairsOp.C
@@ -58,7 +58,7 @@ static int CrosshairsObjConfigure(Graph* graphPtr, Tcl_Interp* interp,
Tk_RestoreSavedOptions(&savedOptions);
}
- // graphPtr->flags |= mask;
+ graphPtr->flags |= mask;
chPtr->configure();
break;
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index 9a38da4..b4772bf 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -68,7 +68,7 @@ static int LegendObjConfigure(Graph* graphPtr, Tcl_Interp* interp,
Tk_RestoreSavedOptions(&savedOptions);
}
- // graphPtr->flags |= mask;
+ graphPtr->flags |= mask;
graphPtr->flags |= (RESET_WORLD | CACHE_DIRTY);
legendPtr->configure();
graphPtr->eventuallyRedraw();
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index dcd6112..92b2c08 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -73,7 +73,7 @@ static int MarkerObjConfigure( Graph* graphPtr,Marker* markerPtr,
Tk_RestoreSavedOptions(&savedOptions);
}
- // markerPtr->flags |= mask;
+ markerPtr->flags |= mask;
markerPtr->flags |= MAP_ITEM;
graphPtr->flags |= CACHE_DIRTY;
if (markerPtr->configure() != TCL_OK)
diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C
index b1d0c45..d96aab0 100644
--- a/src/bltGrPenOp.C
+++ b/src/bltGrPenOp.C
@@ -57,7 +57,7 @@ int PenObjConfigure(Graph* graphPtr, Pen* penPtr,
Tk_RestoreSavedOptions(&savedOptions);
}
- // graphPtr->flags |= mask;
+ graphPtr->flags |= mask;
graphPtr->flags |= CACHE_DIRTY;
if (penPtr->configure() != TCL_OK)
return TCL_ERROR;
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index 1896221..0edbc81 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -86,7 +86,7 @@ int GraphObjConfigure(Graph* graphPtr, Tcl_Interp* interp,
Tk_RestoreSavedOptions(&savedOptions);
}
- // graphPtr->flags |= mask;
+ graphPtr->flags |= mask;
graphPtr->configure();
graphPtr->eventuallyRedraw();