diff options
| author | joye <joye> | 2014-09-09 20:13:34 (GMT) |
|---|---|---|
| committer | joye <joye> | 2014-09-09 20:13:34 (GMT) |
| commit | 578c6c9a9aeace7bbe593287294f94729999040f (patch) | |
| tree | d94b5aaff5e874d02dde4692a5241541c6b881cf /src | |
| parent | aeb5f18931f9d6ac0c878bdee3610c776a4d43af (diff) | |
| download | blt-578c6c9a9aeace7bbe593287294f94729999040f.zip blt-578c6c9a9aeace7bbe593287294f94729999040f.tar.gz blt-578c6c9a9aeace7bbe593287294f94729999040f.tar.bz2 | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/bltGrElemBar.C | 5 | ||||
| -rw-r--r-- | src/bltGrElemLine.C | 5 | ||||
| -rw-r--r-- | src/bltGrPenBar.C | 2 | ||||
| -rw-r--r-- | src/bltGrPenLine.C | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index 3efb206..be93935 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -89,7 +89,7 @@ static Tk_OptionSpec optionSpecs[] = { "1", -1, Tk_Offset(BarElementOptions, builtinPen.errorBarLineWidth), 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", - "2", -1, Tk_Offset(BarElementOptions, builtinPen.errorBarCapWidth), + "0", -1, Tk_Offset(BarElementOptions, builtinPen.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}, @@ -452,8 +452,7 @@ void BarElement::map() BarPen* penPtr = stylePtr->penPtr; BarPenOptions* pops = (BarPenOptions*)penPtr->ops(); stylePtr->symbolSize = size; - stylePtr->errorBarCapWidth = (pops->errorBarCapWidth > 0) ? - pops->errorBarCapWidth : size*.66666; + stylePtr->errorBarCapWidth = pops->errorBarCapWidth; } BarStyle** dataToStyle = (BarStyle**)StyleMap(); diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index e28f775..c521f7d 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -109,7 +109,7 @@ static Tk_OptionSpec optionSpecs[] = { "1", -1, Tk_Offset(LineElementOptions, builtinPen.errorBarLineWidth), 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", - "2", -1, Tk_Offset(LineElementOptions, builtinPen.errorBarCapWidth), + "0", -1, Tk_Offset(LineElementOptions, builtinPen.errorBarCapWidth), 0, NULL, LAYOUT}, {TK_OPTION_COLOR, "-fill", "fill", "Fill", NULL, -1, Tk_Offset(LineElementOptions, builtinPen.symbol.fillColor), @@ -368,8 +368,7 @@ void LineElement::map() LinePenOptions* penOps = (LinePenOptions*)penPtr->ops(); int size = scaleSymbol(penOps->symbol.size); stylePtr->symbolSize = size; - stylePtr->errorBarCapWidth = (penOps->errorBarCapWidth > 0) - ? penOps->errorBarCapWidth : size*0.66666; + stylePtr->errorBarCapWidth = penOps->errorBarCapWidth; } LineStyle** styleMap = (LineStyle**)StyleMap(); diff --git a/src/bltGrPenBar.C b/src/bltGrPenBar.C index 010be09..96e63cb 100644 --- a/src/bltGrPenBar.C +++ b/src/bltGrPenBar.C @@ -50,7 +50,7 @@ static Tk_OptionSpec barPenOptionSpecs[] = { {TK_OPTION_PIXELS, "-errorbarwidth", "errorBarWidth","ErrorBarWidth", "1", -1, Tk_Offset(BarPenOptions, errorBarLineWidth), 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", - "2", -1, Tk_Offset(BarPenOptions, errorBarCapWidth), 0, NULL, LAYOUT}, + "0", -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}, diff --git a/src/bltGrPenLine.C b/src/bltGrPenLine.C index e3dd68b..ee29d77 100644 --- a/src/bltGrPenLine.C +++ b/src/bltGrPenLine.C @@ -56,7 +56,7 @@ static Tk_OptionSpec linePenOptionSpecs[] = { {TK_OPTION_PIXELS, "-errorbarwidth", "errorBarWidth", "ErrorBarWidth", "1", -1, Tk_Offset(LinePenOptions, errorBarLineWidth), 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", - "2", -1, Tk_Offset(LinePenOptions, errorBarCapWidth), 0, NULL, LAYOUT}, + "0", -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, CACHE}, |