From 558d13bd64d9b121b2d8aa38b19527eac75302f8 Mon Sep 17 00:00:00 2001 From: joye Date: Tue, 20 May 2014 19:08:57 +0000 Subject: *** empty log message *** --- src/bltGrElemBar.C | 18 +++++++++--------- src/bltGrElemLine.C | 22 +++++++++++----------- src/bltGrPenBar.C | 31 +++++++++++++++++-------------- src/bltGrPenLine.C | 40 +++++++++++++++++++++------------------- src/bltGrPenOp.C | 2 +- src/bltGraph.C | 2 -- tests/all.tcl | 4 +++- tests/barpen.tcl | 44 ++++++++++++++++++++++++++++++++++++++++++++ tests/lineelement.tcl | 4 ++-- tests/linepen.tcl | 25 +++++++++++++++++-------- 10 files changed, 125 insertions(+), 67 deletions(-) create mode 100644 tests/barpen.tcl diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index 6404024..3b4eb1a 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, RESET}, + TK_OPTION_NULL_OK, &penObjOption, LAYOUT}, {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, RESET}, + "0", -1, Tk_Offset(BarElementOptions, barWidth), 0, NULL, LAYOUT}, {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", @@ -90,17 +90,17 @@ static Tk_OptionSpec optionSpecs[] = { 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", "5", -1, Tk_Offset(BarElementOptions, builtinPen.errorBarCapWidth), - 0, NULL, RESET}, + 0, NULL, LAYOUT}, {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, RESET}, + "no", -1, Tk_Offset(BarElementOptions, hide), 0, NULL, LAYOUT}, {TK_OPTION_STRING, "-label", "label", "Label", NULL, -1, Tk_Offset(BarElementOptions, label), - TK_OPTION_NULL_OK, NULL, RESET}, + TK_OPTION_NULL_OK, NULL, LAYOUT}, {TK_OPTION_RELIEF, "-legendrelief", "legendRelief", "LegendRelief", - "flat", -1, Tk_Offset(BarElementOptions, legendRelief), 0, NULL, RESET}, + "flat", -1, Tk_Offset(BarElementOptions, legendRelief), 0, NULL, LAYOUT}, {TK_OPTION_CUSTOM, "-mapx", "mapX", "MapX", "x", -1, Tk_Offset(BarElementOptions, xAxis), 0, &xAxisObjOption, RESET}, {TK_OPTION_CUSTOM, "-mapy", "mapY", "MapY", @@ -110,13 +110,13 @@ static Tk_OptionSpec optionSpecs[] = { TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_CUSTOM, "-pen", "pen", "Pen", NULL, -1, Tk_Offset(BarElementOptions, normalPenPtr), - TK_OPTION_NULL_OK, &penObjOption, RESET}, + TK_OPTION_NULL_OK, &penObjOption, LAYOUT}, {TK_OPTION_RELIEF, "-relief", "relief", "Relief", "raised", -1, Tk_Offset(BarElementOptions, builtinPen.relief), - 0, NULL, RESET}, + 0, NULL, LAYOUT}, {TK_OPTION_STRING_TABLE, "-showerrorbars", "showErrorBars", "ShowErrorBars", "both", -1, Tk_Offset(BarElementOptions, builtinPen.errorBarShow), - 0, &fillObjOption, RESET}, + 0, &fillObjOption, LAYOUT}, {TK_OPTION_STRING_TABLE, "-showvalues", "showValues", "ShowValues", "none", -1, Tk_Offset(BarElementOptions, builtinPen.valueShow), 0, &fillObjOption, CACHE}, diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index 27f4e15..8490a7d 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -91,10 +91,10 @@ 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, RESET}, + TK_OPTION_NULL_OK, &penObjOption, LAYOUT}, {TK_OPTION_BORDER, "-areabackground", "areaBackground", "AreaBackground", NULL, -1, Tk_Offset(LineElementOptions, fillBg), - TK_OPTION_NULL_OK, NULL, RESET}, + TK_OPTION_NULL_OK, NULL, LAYOUT}, {TK_OPTION_CUSTOM, "-bindtags", "bindTags", "BindTags", "all", -1, Tk_Offset(LineElementOptions, tags), TK_OPTION_NULL_OK, &listObjOption, 0}, @@ -115,17 +115,17 @@ static Tk_OptionSpec optionSpecs[] = { 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", "5", -1, Tk_Offset(LineElementOptions, builtinPen.errorBarCapWidth), - 0, NULL, RESET}, + 0, NULL, LAYOUT}, {TK_OPTION_COLOR, "-fill", "fill", "Fill", NULL, -1, Tk_Offset(LineElementOptions, builtinPen.symbol.fillColor), TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_BOOLEAN, "-hide", "hide", "Hide", - "no", -1, Tk_Offset(LineElementOptions, hide), 0, NULL, RESET}, + "no", -1, Tk_Offset(LineElementOptions, hide), 0, NULL, LAYOUT}, {TK_OPTION_STRING, "-label", "label", "Label", NULL, -1, Tk_Offset(LineElementOptions, label), - TK_OPTION_NULL_OK | TK_OPTION_DONT_SET_DEFAULT, NULL, RESET}, + TK_OPTION_NULL_OK | TK_OPTION_DONT_SET_DEFAULT, NULL, LAYOUT}, {TK_OPTION_RELIEF, "-legendrelief", "legendRelief", "LegendRelief", - "flat", -1, Tk_Offset(LineElementOptions, legendRelief), 0, NULL, RESET}, + "flat", -1, Tk_Offset(LineElementOptions, legendRelief), 0, NULL, LAYOUT}, {TK_OPTION_PIXELS, "-linewidth", "lineWidth", "LineWidth", "1", -1, Tk_Offset(LineElementOptions, builtinPen.traceWidth), 0, NULL, CACHE}, @@ -146,23 +146,23 @@ static Tk_OptionSpec optionSpecs[] = { 0, NULL, CACHE}, {TK_OPTION_CUSTOM, "-pen", "pen", "Pen", NULL, -1, Tk_Offset(LineElementOptions, normalPenPtr), - TK_OPTION_NULL_OK, &penObjOption, RESET}, + TK_OPTION_NULL_OK, &penObjOption, LAYOUT}, {TK_OPTION_PIXELS, "-pixels", "pixels", "Pixels", "0.1i", -1, Tk_Offset(LineElementOptions, builtinPen.symbol.size), - 0, NULL, RESET}, + 0, NULL, LAYOUT}, {TK_OPTION_DOUBLE, "-reduce", "reduce", "Reduce", "0", -1, Tk_Offset(LineElementOptions, rTolerance), 0, NULL, RESET}, {TK_OPTION_BOOLEAN, "-scalesymbols", "scaleSymbols", "ScaleSymbols", - "yes", -1, Tk_Offset(LineElementOptions, scaleSymbols), 0, NULL, RESET}, + "yes", -1, Tk_Offset(LineElementOptions, scaleSymbols), 0, NULL, LAYOUT}, {TK_OPTION_STRING_TABLE, "-showerrorbars", "showErrorBars", "ShowErrorBars", "both", -1, Tk_Offset(LineElementOptions, builtinPen.errorBarShow), - 0, &fillObjOption, RESET}, + 0, &fillObjOption, LAYOUT}, {TK_OPTION_STRING_TABLE, "-showvalues", "showValues", "ShowValues", "none", -1, Tk_Offset(LineElementOptions, builtinPen.valueShow), 0, &fillObjOption, CACHE}, {TK_OPTION_STRING_TABLE, "-smooth", "smooth", "Smooth", "linear", -1, Tk_Offset(LineElementOptions, reqSmooth), - 0, &smoothObjOption, RESET}, + 0, &smoothObjOption, LAYOUT}, {TK_OPTION_CUSTOM, "-styles", "styles", "Styles", "", -1, Tk_Offset(LineElementOptions, stylePalette), 0, &styleObjOption, RESET}, diff --git a/src/bltGrPenBar.C b/src/bltGrPenBar.C index f9e56de..b9e3ed4 100644 --- a/src/bltGrPenBar.C +++ b/src/bltGrPenBar.C @@ -41,40 +41,43 @@ static Tk_OptionSpec barPenOptionSpecs[] = { {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_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", - STD_BORDERWIDTH, -1, Tk_Offset(BarPenOptions, borderWidth), 0, NULL, 0}, + STD_BORDERWIDTH, -1, Tk_Offset(BarPenOptions, borderWidth), 0, NULL, CACHE}, {TK_OPTION_BORDER, "-color", "color", "Color", STD_NORMAL_FOREGROUND, -1, Tk_Offset(BarPenOptions, fill), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_COLOR, "-errorbarcolor", "errorBarColor", "ErrorBarColor", NULL, -1, Tk_Offset(BarPenOptions, errorBarColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarwidth", "errorBarWidth","ErrorBarWidth", - "1", -1, Tk_Offset(BarPenOptions, errorBarLineWidth), 0, NULL, 0}, + "1", -1, Tk_Offset(BarPenOptions, errorBarLineWidth), 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", - "5", -1, Tk_Offset(BarPenOptions, errorBarCapWidth), 0, NULL, 0}, + "5", -1, Tk_Offset(BarPenOptions, errorBarCapWidth), 0, NULL, LAYOUT}, {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_COLOR, "-outline", "outline", "Outline", NULL, -1, Tk_Offset(BarPenOptions, outlineColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_RELIEF, "-relief", "relief", "Relief", - "raised", -1, Tk_Offset(BarPenOptions, relief), 0, NULL, 0}, + "raised", -1, Tk_Offset(BarPenOptions, relief), 0, NULL, LAYOUT}, {TK_OPTION_STRING_TABLE, "-showerrorbars", "showErrorBars", "ShowErrorBars", - "both", -1, Tk_Offset(BarPenOptions, errorBarShow), 0, &fillObjOption, 0}, + "both", -1, Tk_Offset(BarPenOptions, errorBarShow), + 0, &fillObjOption, LAYOUT}, {TK_OPTION_STRING_TABLE, "-showvalues", "showValues", "ShowValues", - "none", -1, Tk_Offset(BarPenOptions, valueShow), 0, &fillObjOption, 0}, + "none", -1, Tk_Offset(BarPenOptions, valueShow), 0, &fillObjOption, CACHE}, {TK_OPTION_ANCHOR, "-valueanchor", "valueAnchor", "ValueAnchor", - "s", -1, Tk_Offset(BarPenOptions, valueStyle.anchor), 0, NULL, 0}, + "s", -1, Tk_Offset(BarPenOptions, valueStyle.anchor), 0, NULL, CACHE}, {TK_OPTION_COLOR, "-valuecolor", "valueColor", "ValueColor", STD_NORMAL_FOREGROUND, -1, Tk_Offset(BarPenOptions, valueStyle.color), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_FONT, "-valuefont", "valueFont", "ValueFont", - STD_FONT_SMALL, -1, Tk_Offset(BarPenOptions, valueStyle.font), 0, NULL, 0}, + STD_FONT_SMALL, -1, Tk_Offset(BarPenOptions, valueStyle.font), + 0, NULL, CACHE}, {TK_OPTION_STRING, "-valueformat", "valueFormat", "ValueFormat", - "%g", -1, Tk_Offset(BarPenOptions, valueFormat), TK_OPTION_NULL_OK, NULL, 0}, + "%g", -1, Tk_Offset(BarPenOptions, valueFormat), + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_DOUBLE, "-valuerotate", "valueRotate", "ValueRotate", - "0", -1, Tk_Offset(BarPenOptions, valueStyle.angle), 0, NULL, 0}, + "0", -1, Tk_Offset(BarPenOptions, valueStyle.angle), 0, NULL, CACHE}, {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0} }; diff --git a/src/bltGrPenLine.C b/src/bltGrPenLine.C index 324efc5..4d590d2 100644 --- a/src/bltGrPenLine.C +++ b/src/bltGrPenLine.C @@ -175,50 +175,52 @@ static void DestroySymbol(Display* display, Symbol* symbolPtr) static Tk_OptionSpec linePenOptionSpecs[] = { {TK_OPTION_COLOR, "-color", "color", "Color", STD_NORMAL_FOREGROUND, -1, Tk_Offset(LinePenOptions, traceColor), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_CUSTOM, "-dashes", "dashes", "Dashes", NULL, -1, Tk_Offset(LinePenOptions, traceDashes), - TK_OPTION_NULL_OK, &dashesObjOption, 0}, + TK_OPTION_NULL_OK, &dashesObjOption, CACHE}, {TK_OPTION_COLOR, "-errorbarcolor", "errorBarColor", "ErrorBarColor", NULL, -1, Tk_Offset(LinePenOptions, errorBarColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarwidth", "errorBarWidth", "ErrorBarWidth", - "1", -1, Tk_Offset(LinePenOptions, errorBarLineWidth), 0, NULL, 0}, + "1", -1, Tk_Offset(LinePenOptions, errorBarLineWidth), 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", - "5", -1, Tk_Offset(LinePenOptions, errorBarCapWidth), 0, NULL, 0}, + "5", -1, Tk_Offset(LinePenOptions, errorBarCapWidth), 0, NULL, LAYOUT}, {TK_OPTION_COLOR, "-fill", "fill", "Fill", NULL, -1, Tk_Offset(LinePenOptions, symbol.fillColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_PIXELS, "-linewidth", "lineWidth", "LineWidth", - "1", -1, Tk_Offset(LinePenOptions, traceWidth), 0, NULL, 0}, + "1", -1, Tk_Offset(LinePenOptions, traceWidth), 0, NULL, CACHE}, {TK_OPTION_COLOR, "-offdash", "offDash", "OffDash", NULL, -1, Tk_Offset(LinePenOptions, traceOffColor), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_COLOR, "-outline", "outline", "Outline", NULL, -1, Tk_Offset(LinePenOptions, symbol.outlineColor), - TK_OPTION_NULL_OK, NULL,0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_PIXELS, "-outlinewidth", "outlineWidth", "OutlineWidth", - "1", -1, Tk_Offset(LinePenOptions, symbol.outlineWidth), 0, NULL, 0}, + "1", -1, Tk_Offset(LinePenOptions, symbol.outlineWidth), 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-pixels", "pixels", "Pixels", - "0.1i", -1, Tk_Offset(LinePenOptions, symbol.size), 0, NULL, 0}, + "0.1i", -1, Tk_Offset(LinePenOptions, symbol.size), 0, NULL, LAYOUT}, {TK_OPTION_STRING_TABLE, "-showerrorbars", "showErrorBars", "ShowErrorBars", - "both", -1, Tk_Offset(LinePenOptions, errorBarShow), 0, &fillObjOption, 0}, + "both", -1, Tk_Offset(LinePenOptions, errorBarShow), + 0, &fillObjOption, LAYOUT}, {TK_OPTION_STRING_TABLE, "-showvalues", "showValues", "ShowValues", - "none", -1, Tk_Offset(LinePenOptions, valueShow), 0, &fillObjOption, 0}, + "none", -1, Tk_Offset(LinePenOptions, valueShow), 0, &fillObjOption, CACHE}, {TK_OPTION_CUSTOM, "-symbol", "symbol", "Symbol", - "none", -1, Tk_Offset(LinePenOptions, symbol), 0, &symbolObjOption, 0}, + "none", -1, Tk_Offset(LinePenOptions, symbol), 0, &symbolObjOption, CACHE}, {TK_OPTION_ANCHOR, "-valueanchor", "valueAnchor", "ValueAnchor", - "s", -1, Tk_Offset(LinePenOptions, valueStyle.anchor), 0, NULL, 0}, + "s", -1, Tk_Offset(LinePenOptions, valueStyle.anchor), 0, NULL, CACHE}, {TK_OPTION_COLOR, "-valuecolor", "valueColor", "ValueColor", STD_NORMAL_FOREGROUND, -1, Tk_Offset(LinePenOptions, valueStyle.color), - 0, NULL, 0}, + 0, NULL, CACHE}, {TK_OPTION_FONT, "-valuefont", "valueFont", "ValueFont", - STD_FONT_SMALL, -1, Tk_Offset(LinePenOptions, valueStyle.font), 0, NULL, 0}, + STD_FONT_SMALL, -1, Tk_Offset(LinePenOptions, valueStyle.font), + 0, NULL, CACHE}, {TK_OPTION_STRING, "-valueformat", "valueFormat", "ValueFormat", "%g", -1, Tk_Offset(LinePenOptions, valueFormat), - TK_OPTION_NULL_OK, NULL, 0}, + TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_DOUBLE, "-valuerotate", "valueRotate", "ValueRotate", - "0", -1, Tk_Offset(LinePenOptions, valueStyle.angle), 0, NULL, 0}, + "0", -1, Tk_Offset(LinePenOptions, valueStyle.angle), 0, NULL, CACHE}, {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0} }; diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C index 9d156e9..c9da794 100644 --- a/src/bltGrPenOp.C +++ b/src/bltGrPenOp.C @@ -59,7 +59,7 @@ int PenObjConfigure(Graph* graphPtr, Pen* penPtr, if (penPtr->configure() != TCL_OK) return TCL_ERROR; - graphPtr->flags |= RESET; + graphPtr->flags |= mask; graphPtr->eventuallyRedraw(); break; diff --git a/src/bltGraph.C b/src/bltGraph.C index 32e97e7..e0623c9 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -353,8 +353,6 @@ void Graph::draw() enableCrosshairs(); Tk_FreePixmap(display_, drawable); - - cerr << "flags= " << hex << flags << endl << endl; } int Graph::print(const char *ident, Blt_Ps ps) diff --git a/tests/all.tcl b/tests/all.tcl index 4a11aae..12089d9 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -1,9 +1,11 @@ source linegraph.tcl source lineelement.tcl +source linepen.tcl source barbar.tcl source barelement.tcl -source xaxis.tcl +source barpen.tcl source axis.tcl +source xaxis.tcl source legend.tcl source crosshairs.tcl source marker.tcl diff --git a/tests/barpen.tcl b/tests/barpen.tcl new file mode 100644 index 0000000..6189b2a --- /dev/null +++ b/tests/barpen.tcl @@ -0,0 +1,44 @@ +source base.tcl + +set w .bar +set graph [bltBarGraph $w] + +$graph pen create foo -color red -showvalues y +$graph element configure data2 -pen foo + +echo "Testing Bar Pen..." + +bltTest3 $graph pen foo -background yellow +bltTest3 $graph pen foo -bd 4 +bltTest3 $graph pen foo -bg yellow +bltTest3 $graph pen foo -borderwidth 4 +bltTest3 $graph pen foo -color yellow +bltTest3 $graph pen foo -errorbarcolor green +bltTest3 $graph pen foo -errorbarwidth 2 +bltTest3 $graph pen foo -errorbarcap 10 +bltTest3 $graph pen foo -fg yellow +bltTest3 $graph pen foo -fill cyan +bltTest3 $graph pen foo -foreground green +bltTest3 $graph pen foo -outline red +bltTest3 $graph pen foo -relief flat +bltTest3 $graph pen foo -showerrorbars no +bltTest3 $graph pen foo -showvalues none +bltTest3 $graph pen foo -showvalues x +bltTest3 $graph pen foo -showvalues both +bltTest3 $graph pen foo -valueanchor n +bltTest3 $graph pen foo -valuecolor cyan +bltTest3 $graph pen foo -valuefont "times 18 bold italic" +bltTest3 $graph pen foo -valueformat "%e" +bltTest3 $graph pen foo -valuerotate 45 + +bltCmd $graph pen cget foo -color +bltCmd $graph pen configure foo +bltCmd $graph pen configure foo -color +bltCmd $graph pen create bar +bltCmd $graph pen delete bar +bltCmd $graph pen names +bltCmd $graph pen type foo + +echo "done" +bltPlotDestroy $w + diff --git a/tests/lineelement.tcl b/tests/lineelement.tcl index d0ffcf5..4c2aefb 100644 --- a/tests/lineelement.tcl +++ b/tests/lineelement.tcl @@ -27,8 +27,8 @@ bltTest3 $graph element data2 -linewidth 3 bltTest3 $graph element data2 -mapx x2 bltTest3 $graph element data2 -mapy y2 bltTest3 $graph element data1 -maxsymbols 4 -bltTest3 $graph element data1 -offdash red -bltTest3 $graph element data1 -outline red +bltTest3 $graph element data1 -offdash black +bltTest3 $graph element data1 -outline green bltTest3 $graph element data1 -outlinewidth 5 bltTest3 $graph element data2 -pen foo bltTest3 $graph element data1 -pixels 20 diff --git a/tests/linepen.tcl b/tests/linepen.tcl index 38b29fc..e3f5634 100644 --- a/tests/linepen.tcl +++ b/tests/linepen.tcl @@ -3,23 +3,32 @@ source base.tcl set w .line set graph [bltLineGraph $w] -$graph pen create foo -showvalues y -symbol circle -dashes "8 4" +$graph pen create foo -color red -showvalues y -symbol circle -dashes {4 4} $graph element configure data2 -pen foo echo "Testing Line Pen..." -bltTest3 $graph pen foo -color red -bltTest3 $graph pen foo -dashes "5 8 3" -bltTest3 $graph pen foo -errorbarcolor yellow +bltTest3 $graph pen foo -color yellow +bltTest3 $graph pen foo -dashes {8 3} +bltTest3 $graph pen foo -errorbarcolor green bltTest3 $graph pen foo -errorbarwidth 2 -bltTest3 $graph pen foo -fill green -bltTest3 $graph pen foo -linewidth 2 -bltTest3 $graph pen foo -offdash yellow +bltTest3 $graph pen foo -errorbarcap 10 +bltTest3 $graph pen foo -fill cyan +bltTest3 $graph pen foo -linewidth 3 +bltTest3 $graph pen foo -offdash black bltTest3 $graph pen foo -outline green -bltTest3 $graph pen foo -outlinewidth 2 +bltTest3 $graph pen foo -outlinewidth 5 bltTest3 $graph pen foo -pixels 20 bltTest3 $graph pen foo -showvalues none +bltTest3 $graph pen foo -symbol arrow +bltTest3 $graph pen foo -symbol cross +bltTest3 $graph pen foo -symbol diamond +bltTest3 $graph pen foo -symbol none +bltTest3 $graph pen foo -symbol plus +bltTest3 $graph pen foo -symbol scross +bltTest3 $graph pen foo -symbol splus bltTest3 $graph pen foo -symbol square +bltTest3 $graph pen foo -symbol triangle bltTest3 $graph pen foo -valueanchor n bltTest3 $graph pen foo -valuecolor cyan bltTest3 $graph pen foo -valuefont "times 18 bold italic" -- cgit v0.12