diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bltGrElemBar.C | 71 | ||||
| -rw-r--r-- | src/bltGrElemLine.C | 88 | ||||
| -rw-r--r-- | src/bltGrElemOp.C | 10 | ||||
| -rw-r--r-- | src/bltGrLegdOp.C | 2 | ||||
| -rw-r--r-- | src/bltGraph.C | 3 | ||||
| -rw-r--r-- | src/bltGraphOp.C | 2 |
6 files changed, 89 insertions, 87 deletions
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index f17b1ea..67ccb28 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -64,10 +64,10 @@ extern Tk_ObjCustomOption yAxisObjOption; static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CUSTOM, "-activepen", "activePen", "ActivePen", "active", -1, Tk_Offset(BarElementOptions, activePenPtr), - TK_OPTION_NULL_OK, &penObjOption, 0}, + TK_OPTION_NULL_OK, &penObjOption, RESET}, {TK_OPTION_SYNONYM, "-background", NULL, NULL, NULL, -1, 0, 0, "-color", 0}, {TK_OPTION_DOUBLE, "-barwidth", "barWidth", "BarWidth", - "0", -1, Tk_Offset(BarElementOptions, barWidth), 0, NULL, 0}, + "0", -1, Tk_Offset(BarElementOptions, barWidth), 0, NULL, RESET}, {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, -1, 0, 0, "-borderwidth", 0}, {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, -1, 0, 0, "-color", 0}, {TK_OPTION_CUSTOM, "-bindtags", "bindTags", "BindTags", @@ -75,100 +75,101 @@ static Tk_OptionSpec optionSpecs[] = { TK_OPTION_NULL_OK, &listObjOption, 0}, {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", STD_BORDERWIDTH, -1, Tk_Offset(BarElementOptions, builtinPen.borderWidth), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_BORDER, "-color", "color", "color", STD_NORMAL_FOREGROUND, -1, Tk_Offset(BarElementOptions, builtinPen.fill), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_CUSTOM, "-data", "data", "Data", NULL, -1, Tk_Offset(BarElementOptions, coords), - TK_OPTION_NULL_OK, &pairsObjOption, 0}, + TK_OPTION_NULL_OK, &pairsObjOption, RESET}, {TK_OPTION_COLOR, "-errorbarcolor", "errorBarColor", "ErrorBarColor", NULL, -1, Tk_Offset(BarElementOptions, builtinPen.errorBarColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_PIXELS,"-errorbarwidth", "errorBarWidth", "ErrorBarWidth", "1", -1, Tk_Offset(BarElementOptions, builtinPen.errorBarLineWidth), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", "5", -1, Tk_Offset(BarElementOptions, builtinPen.errorBarCapWidth), - 0, NULL, 0}, + 0, NULL, RESET}, {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, -1, 0, 0, "-outline", 0}, {TK_OPTION_SYNONYM, "-fill", NULL, NULL, NULL, -1, 0, 0, "-color", 0}, {TK_OPTION_SYNONYM, "-foreground", NULL, NULL, NULL, -1, 0, 0, "-outline", 0}, {TK_OPTION_BOOLEAN, "-hide", "hide", "Hide", - "no", -1, Tk_Offset(BarElementOptions, hide), 0, NULL, 0}, + "no", -1, Tk_Offset(BarElementOptions, hide), 0, NULL, RESET}, {TK_OPTION_STRING, "-label", "label", "Label", NULL, -1, Tk_Offset(BarElementOptions, label), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, RESET}, {TK_OPTION_RELIEF, "-legendrelief", "legendRelief", "LegendRelief", - "flat", -1, Tk_Offset(BarElementOptions, legendRelief), 0, NULL, 0}, + "flat", -1, Tk_Offset(BarElementOptions, legendRelief), 0, NULL, RESET}, {TK_OPTION_CUSTOM, "-mapx", "mapX", "MapX", - "x", -1, Tk_Offset(BarElementOptions, xAxis), 0, &xAxisObjOption, 0}, + "x", -1, Tk_Offset(BarElementOptions, xAxis), 0, &xAxisObjOption, RESET}, {TK_OPTION_CUSTOM, "-mapy", "mapY", "MapY", - "y", -1, Tk_Offset(BarElementOptions, yAxis), 0, &yAxisObjOption, 0}, + "y", -1, Tk_Offset(BarElementOptions, yAxis), 0, &yAxisObjOption, RESET}, {TK_OPTION_COLOR, "-outline", "outline", "Outline", NULL, -1, Tk_Offset(BarElementOptions, builtinPen.outlineColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_CUSTOM, "-pen", "pen", "Pen", NULL, -1, Tk_Offset(BarElementOptions, normalPenPtr), - TK_OPTION_NULL_OK, &penObjOption}, + TK_OPTION_NULL_OK, &penObjOption, RESET}, {TK_OPTION_RELIEF, "-relief", "relief", "Relief", - "raised", -1, Tk_Offset(BarElementOptions, builtinPen.relief), 0, NULL, 0}, + "raised", -1, Tk_Offset(BarElementOptions, builtinPen.relief), + 0, NULL, RESET}, {TK_OPTION_STRING_TABLE, "-showerrorbars", "showErrorBars", "ShowErrorBars", "both", -1, Tk_Offset(BarElementOptions, builtinPen.errorBarShow), - 0, &fillObjOption, 0}, + 0, &fillObjOption, RESET}, {TK_OPTION_STRING_TABLE, "-showvalues", "showValues", "ShowValues", "none", -1, Tk_Offset(BarElementOptions, builtinPen.valueShow), - 0, &fillObjOption, 0}, + 0, &fillObjOption, CACHE}, {TK_OPTION_STRING, "-stack", "stack", "Stack", NULL, -1, Tk_Offset(BarElementOptions, groupName), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, RESET}, {TK_OPTION_CUSTOM, "-styles", "styles", "Styles", - "", -1, Tk_Offset(BarElementOptions, stylePalette), 0, &styleObjOption, 0}, + "", -1, Tk_Offset(BarElementOptions, stylePalette), + 0, &styleObjOption, RESET}, {TK_OPTION_ANCHOR, "-valueanchor", "valueAnchor", "ValueAnchor", "s", -1, Tk_Offset(BarElementOptions, builtinPen.valueStyle.anchor), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_COLOR, "-valuecolor", "valueColor", "ValueColor", STD_NORMAL_FOREGROUND, -1, - Tk_Offset(BarElementOptions,builtinPen.valueStyle.color), - 0, NULL, 0}, + Tk_Offset(BarElementOptions,builtinPen.valueStyle.color), 0, NULL, CACHE}, {TK_OPTION_FONT, "-valuefont", "valueFont", "ValueFont", STD_FONT_SMALL, -1, Tk_Offset(BarElementOptions, builtinPen.valueStyle.font), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_STRING, "-valueformat", "valueFormat", "ValueFormat", "%g", -1, Tk_Offset(BarElementOptions, builtinPen.valueFormat), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_DOUBLE, "-valuerotate", "valueRotate", "ValueRotate", "0", -1, Tk_Offset(BarElementOptions, builtinPen.valueStyle.angle), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_CUSTOM, "-weights", "weights", "Weights", NULL, -1, Tk_Offset(BarElementOptions, w), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_SYNONYM, "-x", NULL, NULL, NULL, -1, 0, 0, "-xdata", 0}, {TK_OPTION_CUSTOM, "-xdata", "xData", "XData", NULL, -1, Tk_Offset(BarElementOptions, coords.x), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-xerror", "xError", "XError", NULL, -1, Tk_Offset(BarElementOptions, xError), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-xhigh", "xHigh", "XHigh", NULL, -1, Tk_Offset(BarElementOptions, xHigh), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-xlow", "xLow", "XLow", NULL, -1, Tk_Offset(BarElementOptions, xLow), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_SYNONYM, "-y", NULL, NULL, NULL, -1, 0, 0, "-ydata", 0}, {TK_OPTION_CUSTOM, "-ydata", "yData", "YData", NULL, -1, Tk_Offset(BarElementOptions, coords.y), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-yerror", "yError", "YError", NULL, -1, Tk_Offset(BarElementOptions, yError), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-yhigh", "yHigh", "YHigh", NULL, -1, Tk_Offset(BarElementOptions, yHigh), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-ylow", "yLow", "YLow", NULL, -1, Tk_Offset(BarElementOptions, yLow), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0} }; diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index b0ddb47..27f4e15 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -91,133 +91,133 @@ extern Tk_ObjCustomOption yAxisObjOption; static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CUSTOM, "-activepen", "activePen", "ActivePen", "active", -1, Tk_Offset(LineElementOptions, activePenPtr), - TK_OPTION_NULL_OK, &penObjOption, 0}, + TK_OPTION_NULL_OK, &penObjOption, RESET}, {TK_OPTION_BORDER, "-areabackground", "areaBackground", "AreaBackground", NULL, -1, Tk_Offset(LineElementOptions, fillBg), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, RESET}, {TK_OPTION_CUSTOM, "-bindtags", "bindTags", "BindTags", "all", -1, Tk_Offset(LineElementOptions, tags), TK_OPTION_NULL_OK, &listObjOption, 0}, {TK_OPTION_COLOR, "-color", "color", "Color", STD_NORMAL_FOREGROUND, -1, - Tk_Offset(LineElementOptions, builtinPen.traceColor), - 0, NULL, 0}, + Tk_Offset(LineElementOptions, builtinPen.traceColor), 0, NULL, CACHE}, {TK_OPTION_CUSTOM, "-dashes", "dashes", "Dashes", NULL, -1, Tk_Offset(LineElementOptions, builtinPen.traceDashes), - TK_OPTION_NULL_OK, &dashesObjOption, 0}, + TK_OPTION_NULL_OK, &dashesObjOption, CACHE}, {TK_OPTION_CUSTOM, "-data", "data", "Data", NULL, -1, Tk_Offset(LineElementOptions, coords), - TK_OPTION_NULL_OK, &pairsObjOption, 0}, + TK_OPTION_NULL_OK, &pairsObjOption, RESET}, {TK_OPTION_COLOR, "-errorbarcolor", "errorBarColor", "ErrorBarColor", NULL, -1, Tk_Offset(LineElementOptions, builtinPen.errorBarColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_PIXELS,"-errorbarwidth", "errorBarWidth", "ErrorBarWidth", "1", -1, Tk_Offset(LineElementOptions, builtinPen.errorBarLineWidth), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", "5", -1, Tk_Offset(LineElementOptions, builtinPen.errorBarCapWidth), - 0, NULL, 0}, + 0, NULL, RESET}, {TK_OPTION_COLOR, "-fill", "fill", "Fill", NULL, -1, Tk_Offset(LineElementOptions, builtinPen.symbol.fillColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_BOOLEAN, "-hide", "hide", "Hide", - "no", -1, Tk_Offset(LineElementOptions, hide), 0, NULL, 0}, + "no", -1, Tk_Offset(LineElementOptions, hide), 0, NULL, RESET}, {TK_OPTION_STRING, "-label", "label", "Label", NULL, -1, Tk_Offset(LineElementOptions, label), - TK_OPTION_NULL_OK | TK_OPTION_DONT_SET_DEFAULT, NULL, 0}, + TK_OPTION_NULL_OK | TK_OPTION_DONT_SET_DEFAULT, NULL, RESET}, {TK_OPTION_RELIEF, "-legendrelief", "legendRelief", "LegendRelief", - "flat", -1, Tk_Offset(LineElementOptions, legendRelief), 0, NULL, 0}, + "flat", -1, Tk_Offset(LineElementOptions, legendRelief), 0, NULL, RESET}, {TK_OPTION_PIXELS, "-linewidth", "lineWidth", "LineWidth", "1", -1, Tk_Offset(LineElementOptions, builtinPen.traceWidth), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_CUSTOM, "-mapx", "mapX", "MapX", - "x", -1, Tk_Offset(LineElementOptions, xAxis), 0, &xAxisObjOption, 0}, + "x", -1, Tk_Offset(LineElementOptions, xAxis), 0, &xAxisObjOption, RESET}, {TK_OPTION_CUSTOM, "-mapy", "mapY", "MapY", - "y", -1, Tk_Offset(LineElementOptions, yAxis), 0, &yAxisObjOption, 0}, + "y", -1, Tk_Offset(LineElementOptions, yAxis), 0, &yAxisObjOption, RESET}, {TK_OPTION_INT, "-maxsymbols", "maxSymbols", "MaxSymbols", - "0", -1, Tk_Offset(LineElementOptions, reqMaxSymbols), 0, NULL, 0}, + "0", -1, Tk_Offset(LineElementOptions, reqMaxSymbols), 0, NULL, CACHE}, {TK_OPTION_COLOR, "-offdash", "offDash", "OffDash", NULL, -1, Tk_Offset(LineElementOptions, builtinPen.traceOffColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_COLOR, "-outline", "outline", "Outline", NULL, -1, Tk_Offset(LineElementOptions, builtinPen.symbol.outlineColor), - TK_OPTION_NULL_OK, NULL,0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_PIXELS, "-outlinewidth", "outlineWidth", "OutlineWidth", "1", -1, Tk_Offset(LineElementOptions, builtinPen.symbol.outlineWidth), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_CUSTOM, "-pen", "pen", "Pen", NULL, -1, Tk_Offset(LineElementOptions, normalPenPtr), - TK_OPTION_NULL_OK, &penObjOption, 0}, + TK_OPTION_NULL_OK, &penObjOption, RESET}, {TK_OPTION_PIXELS, "-pixels", "pixels", "Pixels", "0.1i", -1, Tk_Offset(LineElementOptions, builtinPen.symbol.size), - 0, NULL, 0}, + 0, NULL, RESET}, {TK_OPTION_DOUBLE, "-reduce", "reduce", "Reduce", - "0", -1, Tk_Offset(LineElementOptions, rTolerance), 0, NULL, 0}, + "0", -1, Tk_Offset(LineElementOptions, rTolerance), 0, NULL, RESET}, {TK_OPTION_BOOLEAN, "-scalesymbols", "scaleSymbols", "ScaleSymbols", - "yes", -1, Tk_Offset(LineElementOptions, scaleSymbols), 0, NULL, 0}, + "yes", -1, Tk_Offset(LineElementOptions, scaleSymbols), 0, NULL, RESET}, {TK_OPTION_STRING_TABLE, "-showerrorbars", "showErrorBars", "ShowErrorBars", "both", -1, Tk_Offset(LineElementOptions, builtinPen.errorBarShow), - 0, &fillObjOption, 0}, + 0, &fillObjOption, RESET}, {TK_OPTION_STRING_TABLE, "-showvalues", "showValues", "ShowValues", "none", -1, Tk_Offset(LineElementOptions, builtinPen.valueShow), - 0, &fillObjOption, 0}, + 0, &fillObjOption, CACHE}, {TK_OPTION_STRING_TABLE, "-smooth", "smooth", "Smooth", "linear", -1, Tk_Offset(LineElementOptions, reqSmooth), - 0, &smoothObjOption, 0}, + 0, &smoothObjOption, RESET}, {TK_OPTION_CUSTOM, "-styles", "styles", "Styles", - "", -1, Tk_Offset(LineElementOptions, stylePalette), 0, &styleObjOption, 0}, + "", -1, Tk_Offset(LineElementOptions, stylePalette), + 0, &styleObjOption, RESET}, {TK_OPTION_CUSTOM, "-symbol", "symbol", "Symbol", "none", -1, Tk_Offset(LineElementOptions, builtinPen.symbol), - 0, &symbolObjOption, 0}, + 0, &symbolObjOption, CACHE}, {TK_OPTION_STRING_TABLE, "-trace", "trace", "Trace", "both", -1, Tk_Offset(LineElementOptions, penDir), - 0, &penDirObjOption, 0}, + 0, &penDirObjOption, RESET}, {TK_OPTION_ANCHOR, "-valueanchor", "valueAnchor", "ValueAnchor", "s", -1, Tk_Offset(LineElementOptions, builtinPen.valueStyle.anchor), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_COLOR, "-valuecolor", "valueColor", "ValueColor", STD_NORMAL_FOREGROUND,-1, Tk_Offset(LineElementOptions, builtinPen.valueStyle.color), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_FONT, "-valuefont", "valueFont", "ValueFont", STD_FONT_SMALL, -1, Tk_Offset(LineElementOptions, builtinPen.valueStyle.font), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_STRING, "-valueformat", "valueFormat", "ValueFormat", "%g", -1, Tk_Offset(LineElementOptions, builtinPen.valueFormat), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_DOUBLE, "-valuerotate", "valueRotate", "ValueRotate", "0", -1, Tk_Offset(LineElementOptions, builtinPen.valueStyle.angle), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_CUSTOM, "-weights", "weights", "Weights", NULL, -1, Tk_Offset(LineElementOptions, w), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_SYNONYM, "-x", NULL, NULL, NULL, -1, 0, 0, "-xdata", 0}, {TK_OPTION_CUSTOM, "-xdata", "xData", "XData", NULL, -1, Tk_Offset(LineElementOptions, coords.x), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-xerror", "xError", "XError", NULL, -1, Tk_Offset(LineElementOptions, xError), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-xhigh", "xHigh", "XHigh", NULL, -1, Tk_Offset(LineElementOptions, xHigh), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-xlow", "xLow", "XLow", NULL, -1, Tk_Offset(LineElementOptions, xLow), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_SYNONYM, "-y", NULL, NULL, NULL, -1, 0, 0, "-ydata", 0}, {TK_OPTION_CUSTOM, "-ydata", "yData", "YData", NULL, -1, Tk_Offset(LineElementOptions, coords.y), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-yerror", "yError", "YError", NULL, -1, Tk_Offset(LineElementOptions, yError), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-yhigh", "yHigh", "YHigh", NULL, -1, Tk_Offset(LineElementOptions, yHigh), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_CUSTOM, "-ylow", "yLow", "YLow", NULL, -1, Tk_Offset(LineElementOptions, yLow), - TK_OPTION_NULL_OK, &valuesObjOption, 0}, + TK_OPTION_NULL_OK, &valuesObjOption, RESET}, {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0} }; diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C index 7a5959c..e7d8a38 100644 --- a/src/bltGrElemOp.C +++ b/src/bltGrElemOp.C @@ -69,8 +69,7 @@ int ElementObjConfigure( Element* elemPtr, Tcl_Interp* interp, if (elemPtr->configure() != TCL_OK) return TCL_ERROR; - - graphPtr->flags |= RESET; + graphPtr->flags |= mask; graphPtr->eventuallyRedraw(); break; @@ -293,6 +292,9 @@ static int CreateOp(ClientData clientData, Tcl_Interp* interp, return TCL_ERROR; Tcl_SetObjResult(interp, objv[3]); + graphPtr->flags |= RESET; + graphPtr->eventuallyRedraw(); + return TCL_OK; } @@ -392,7 +394,7 @@ static int LowerOp(ClientData clientData, Tcl_Interp* interp, } Blt_Chain_Destroy(chain); - graphPtr->flags |= RESET; + graphPtr->flags |= CACHE; graphPtr->eventuallyRedraw(); Tcl_SetObjResult(interp, DisplayListObj(graphPtr)); @@ -457,7 +459,7 @@ static int RaiseOp(ClientData clientData, Tcl_Interp* interp, } Blt_Chain_Destroy(chain); - graphPtr->flags |= RESET; + graphPtr->flags |= CACHE; graphPtr->eventuallyRedraw(); Tcl_SetObjResult(interp, DisplayListObj(graphPtr)); diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C index af5fcce..7f146d1 100644 --- a/src/bltGrLegdOp.C +++ b/src/bltGrLegdOp.C @@ -68,9 +68,9 @@ static int LegendObjConfigure(Graph* graphPtr, Tcl_Interp* interp, Tk_RestoreSavedOptions(&savedOptions); } - graphPtr->flags |= mask; if (legendPtr->configure() != TCL_OK) return TCL_ERROR; + graphPtr->flags |= mask; graphPtr->eventuallyRedraw(); break; diff --git a/src/bltGraph.C b/src/bltGraph.C index 459d88f..32e97e7 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -240,7 +240,6 @@ void Graph::map() void Graph::draw() { - cerr << endl << "flags= " << hex << flags << endl; GraphOptions* ops = (GraphOptions*)ops_; flags &= ~REDRAW_PENDING; @@ -355,7 +354,7 @@ void Graph::draw() enableCrosshairs(); Tk_FreePixmap(display_, drawable); - cerr << "flags= " << hex << flags << endl; + cerr << "flags= " << hex << flags << endl << endl; } int Graph::print(const char *ident, Blt_Ps ps) diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C index 15ac1b0..dd630af 100644 --- a/src/bltGraphOp.C +++ b/src/bltGraphOp.C @@ -86,9 +86,9 @@ int GraphObjConfigure(Graph* graphPtr, Tcl_Interp* interp, Tk_RestoreSavedOptions(&savedOptions); } - graphPtr->flags |= mask; if (graphPtr->configure() != TCL_OK) return TCL_ERROR; + graphPtr->flags |= mask; graphPtr->eventuallyRedraw(); break; |