diff options
author | joye <joye> | 2014-05-20 19:32:08 (GMT) |
---|---|---|
committer | joye <joye> | 2014-05-20 19:32:08 (GMT) |
commit | d74aaafd24ac3e8cd1e8a63f85e97a80b634ebb4 (patch) | |
tree | 043dc6400a59ae08c88fa7044183a690a6a61893 | |
parent | 558d13bd64d9b121b2d8aa38b19527eac75302f8 (diff) | |
download | blt-d74aaafd24ac3e8cd1e8a63f85e97a80b634ebb4.zip blt-d74aaafd24ac3e8cd1e8a63f85e97a80b634ebb4.tar.gz blt-d74aaafd24ac3e8cd1e8a63f85e97a80b634ebb4.tar.bz2 |
*** empty log message ***
-rw-r--r-- | src/bltGrElemOption.C | 1 | ||||
-rw-r--r-- | src/bltGrMarkerOp.C | 8 | ||||
-rw-r--r-- | src/bltGraph.C | 1 | ||||
-rw-r--r-- | src/bltGraphBar.C | 2 | ||||
-rw-r--r-- | src/bltGraphLine.C | 5 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C index c098965..fa77102 100644 --- a/src/bltGrElemOption.C +++ b/src/bltGrElemOption.C @@ -441,6 +441,7 @@ static void VectorChangedProc(Tcl_Interp* interp, ClientData clientData, Element* elemPtr = valuesPtr->elemPtr; Graph* graphPtr = elemPtr->graphPtr_; + graphPtr->flags |= RESET; graphPtr->eventuallyRedraw(); } diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C index 32c3477..7bb61ac 100644 --- a/src/bltGrMarkerOp.C +++ b/src/bltGrMarkerOp.C @@ -237,6 +237,9 @@ static int CreateOp(ClientData clientData, Tcl_Interp* interp, // set in CreateMarker // Tcl_SetObjResult(interp, objv[3]); + graphPtr->flags |= CACHE; + graphPtr->eventuallyRedraw(); + return TCL_OK; } @@ -254,6 +257,7 @@ static int DeleteOp(ClientData clientData, Tcl_Interp* interp, } delete markerPtr; } + graphPtr->flags |= CACHE; graphPtr->eventuallyRedraw(); @@ -403,7 +407,6 @@ static int RelinkOp(ClientData clientData, Tcl_Interp* interp, Marker* markerPtr; if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK) return TCL_ERROR; - MarkerOptions* ops = (MarkerOptions*)markerPtr->ops(); Marker* placePtr =NULL; if (objc == 5) @@ -421,8 +424,7 @@ static int RelinkOp(ClientData clientData, Tcl_Interp* interp, else Blt_Chain_LinkBefore(graphPtr->markers_.displayList, link, place); - if (ops->drawUnder) - graphPtr->flags |= CACHE; + graphPtr->flags |= CACHE; graphPtr->eventuallyRedraw(); return TCL_OK; diff --git a/src/bltGraph.C b/src/bltGraph.C index e0623c9..03f64c0 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -353,6 +353,7 @@ void Graph::draw() enableCrosshairs(); Tk_FreePixmap(display_, drawable); + cerr << "---" << endl; } int Graph::print(const char *ident, Blt_Ps ps) diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C index a3a93e1..309f456 100644 --- a/src/bltGraphBar.C +++ b/src/bltGraphBar.C @@ -136,7 +136,7 @@ static Tk_OptionSpec optionSpecs[] = { "0", -1, Tk_Offset(BarGraphOptions, rightMargin.reqSize), 0, NULL, RESET}, {TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, -1, 0, 0, "-rightmargin", 0}, {TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo", - "2m", -1, Tk_Offset(BarGraphOptions, search.halo), 0, NULL, RESET}, + "2m", -1, Tk_Offset(BarGraphOptions, search.halo), 0, NULL, 0}, {TK_OPTION_STRING_TABLE, "-searchmode", "searchMode", "SearchMode", "points", -1, Tk_Offset(BarGraphOptions, search.mode), 0, &searchModeObjOption, 0}, diff --git a/src/bltGraphLine.C b/src/bltGraphLine.C index a864e59..26d8b04 100644 --- a/src/bltGraphLine.C +++ b/src/bltGraphLine.C @@ -112,7 +112,7 @@ static Tk_OptionSpec optionSpecs[] = { "0", -1, Tk_Offset(LineGraphOptions, rightMargin.reqSize), 0, NULL, RESET}, {TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, -1, 0, 0, "-rightmargin", 0}, {TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo", - "2m", -1, Tk_Offset(LineGraphOptions, search.halo), 0, NULL, RESET}, + "2m", -1, Tk_Offset(LineGraphOptions, search.halo), 0, NULL, 0}, {TK_OPTION_STRING_TABLE, "-searchmode", "searchMode", "SearchMode", "points", -1, Tk_Offset(LineGraphOptions, search.mode), 0, &searchModeObjOption, 0}, @@ -204,9 +204,6 @@ int LineGraph::createPen(const char* penName, int objc, Tcl_Obj* const objv[]) return TCL_ERROR; } - flags |= RESET; - eventuallyRedraw(); - return TCL_OK; } |