*** empty log message ***

1 files changed, 44 insertions, 39 deletions

diff --git a/src/bltGraphLine.C b/src/bltGraphLine.C
index 0480c71..edcd33c 100644
--- a/src/bltGraphLine.C
+++ b/src/bltGraphLine.C
@@ -59,117 +59,122 @@ static const char* searchAlongObjOption[] = {"x", "y", "both", NULL};
 
 static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_DOUBLE, "-aspect", "aspect", "Aspect", 
-   "0", -1, Tk_Offset(GraphOptions, aspect), 
+   "0", -1, Tk_Offset(LineGraphOptions, aspect), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_BORDER, "-background", "background", "Background",
-   STD_NORMAL_BACKGROUND, -1, Tk_Offset(GraphOptions, normalBg), 
+   STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, normalBg), 
    0, NULL, CACHE_DIRTY},
   {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, -1, 0, 0, "-borderwidth", 0},
   {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, -1, 0, 0, "-background", 0},
   {TK_OPTION_SYNONYM, "-bm", NULL, NULL, NULL, -1, 0, 0, "-bottommargin", 0},
   {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
-   STD_BORDERWIDTH, -1, Tk_Offset(GraphOptions, borderWidth), 0, NULL, 
+   STD_BORDERWIDTH, -1, Tk_Offset(LineGraphOptions, borderWidth), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_PIXELS, "-bottommargin", "bottomMargin", "BottomMargin",
-   "0", -1, Tk_Offset(GraphOptions, bottomMargin.reqSize), 0, NULL, 
+   "0", -1, Tk_Offset(LineGraphOptions, bottomMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_STRING, "-bottomvariable", "bottomVariable", "BottomVariable",
-   NULL, -1, Tk_Offset(GraphOptions, bottomMargin.varName), 
+   NULL, -1, Tk_Offset(LineGraphOptions, bottomMargin.varName), 
    TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_BOOLEAN, "-bufferelements", "bufferElements", "BufferElements",
-   "yes", -1, Tk_Offset(GraphOptions, backingStore), 0, NULL, 0},
+   "yes", -1, Tk_Offset(LineGraphOptions, backingStore), 0, NULL, 0},
   {TK_OPTION_BOOLEAN, "-buffergraph", "bufferGraph", "BufferGraph",
-   "yes", -1, Tk_Offset(GraphOptions, doubleBuffer), 0, NULL, 0},
+   "yes", -1, Tk_Offset(LineGraphOptions, doubleBuffer), 0, NULL, 0},
   {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor", 
-   "crosshair", -1, Tk_Offset(GraphOptions, cursor), 
+   "crosshair", -1, Tk_Offset(LineGraphOptions, cursor), 
    TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, -1, 0, 0, "-foreground", 0},
   {TK_OPTION_FONT, "-font", "font", "Font", 
-   STD_FONT_MEDIUM, -1, Tk_Offset(GraphOptions, titleTextStyle.font), 0, NULL, 
+   STD_FONT_MEDIUM, -1, Tk_Offset(LineGraphOptions, titleTextStyle.font),
+   0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground",
-   STD_NORMAL_FOREGROUND, -1, Tk_Offset(GraphOptions, titleTextStyle.color), 
-   0, NULL, 
-   CACHE_DIRTY},
+   STD_NORMAL_FOREGROUND, -1, 
+   Tk_Offset(LineGraphOptions, titleTextStyle.color), 
+   0, NULL, CACHE_DIRTY},
   {TK_OPTION_SYNONYM, "-halo", NULL, NULL, NULL, -1, 0, 0, "-searchhalo", 0},
   {TK_OPTION_PIXELS, "-height", "height", "Height", 
-   "4i", -1, Tk_Offset(GraphOptions, reqHeight), 
+   "4i", -1, Tk_Offset(LineGraphOptions, reqHeight), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_COLOR, "-highlightbackground", "highlightBackground",
    "HighlightBackground", 
-   STD_NORMAL_BACKGROUND, -1, Tk_Offset(GraphOptions, highlightBgColor), 
+   STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, highlightBgColor), 
    0, NULL, 
    CACHE_DIRTY},
   {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor",
-   STD_NORMAL_FOREGROUND, -1, Tk_Offset(GraphOptions, highlightColor), 
+   STD_NORMAL_FOREGROUND, -1, Tk_Offset(LineGraphOptions, highlightColor), 
    0, NULL, 0},
   {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness",
    "HighlightThickness", 
-   "2", -1, Tk_Offset(GraphOptions, highlightWidth), 0, NULL, 0},
+   "2", -1, Tk_Offset(LineGraphOptions, highlightWidth), 0, NULL, 0},
   {TK_OPTION_BOOLEAN, "-invertxy", "invertXY", "InvertXY", 
-   "no", -1, Tk_Offset(GraphOptions, inverted), 0, NULL, 
+   "no", -1, Tk_Offset(LineGraphOptions, inverted), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY | RESET_AXES},
   {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify", 
-   "center", -1, Tk_Offset(GraphOptions, titleTextStyle.justify), 0, NULL, 0},
+   "center", -1, Tk_Offset(LineGraphOptions, titleTextStyle.justify),
+   0, NULL, 0},
   {TK_OPTION_PIXELS, "-leftmargin", "leftMargin", "Margin", 
-   "0", -1, Tk_Offset(GraphOptions, leftMargin.reqSize), 0, NULL, 
+   "0", -1, Tk_Offset(LineGraphOptions, leftMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_STRING, "-leftvariable", "leftVariable", "LeftVariable",
-   NULL, -1, Tk_Offset(GraphOptions, leftMargin.varName), 
+   NULL, -1, Tk_Offset(LineGraphOptions, leftMargin.varName), 
    TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_SYNONYM, "-lm", NULL, NULL, NULL, -1, 0, 0, "-leftmargin", 0},
   {TK_OPTION_BORDER, "-plotbackground", "plotbackground", "PlotBackground",
-   STD_NORMAL_BACKGROUND, -1, Tk_Offset(GraphOptions, plotBg), 0, NULL,
+   STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, plotBg), 0, NULL,
    RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_PIXELS, "-plotborderwidth", "plotBorderWidth", "PlotBorderWidth",
-   STD_BORDERWIDTH, -1, Tk_Offset(GraphOptions, plotBW), 0, NULL, 
+   STD_BORDERWIDTH, -1, Tk_Offset(LineGraphOptions, plotBW), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_PIXELS, "-plotpadx", "plotPadX", "PlotPad", 
-   "0", -1, Tk_Offset(GraphOptions, xPad), 0, NULL, RESET_WORLD | CACHE_DIRTY},
+   "0", -1, Tk_Offset(LineGraphOptions, xPad),
+   0, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_PIXELS, "-plotpady", "plotPadY", "PlotPad", 
-   "0", -1, Tk_Offset(GraphOptions, yPad), 0, NULL, RESET_WORLD | CACHE_DIRTY},
+   "0", -1, Tk_Offset(LineGraphOptions, yPad),
+   0, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_RELIEF, "-plotrelief", "plotRelief", "Relief", 
-   "flat", -1, Tk_Offset(GraphOptions, plotRelief), 0, NULL, 
+   "flat", -1, Tk_Offset(LineGraphOptions, plotRelief), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_RELIEF, "-relief", "relief", "Relief", 
-   "flat", -1, Tk_Offset(GraphOptions, relief), 0, NULL, 0},
+   "flat", -1, Tk_Offset(LineGraphOptions, relief), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-rightmargin", "rightMargin", "Margin", 
-   "0", -1, Tk_Offset(GraphOptions, rightMargin.reqSize), 0, NULL, 
+   "0", -1, Tk_Offset(LineGraphOptions, rightMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_STRING, "-rightvariable", "rightVariable", "RightVariable",
-   NULL, -1, Tk_Offset(GraphOptions, rightMargin.varName), 
+   NULL, -1, Tk_Offset(LineGraphOptions, rightMargin.varName), 
    TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, -1, 0, 0, "-rightmargin", 0},
   {TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo", 
-   "2m", -1, Tk_Offset(GraphOptions, search.halo), 0, NULL, 0},
+   "2m", -1, Tk_Offset(LineGraphOptions, search.halo), 0, NULL, 0},
   {TK_OPTION_STRING_TABLE, "-searchmode", "searchMode", "SearchMode",
-   "points", -1, Tk_Offset(GraphOptions, search.mode), 
+   "points", -1, Tk_Offset(LineGraphOptions, search.mode), 
    0, &searchModeObjOption, 0}, 
   {TK_OPTION_STRING_TABLE, "-searchalong", "searchAlong", "SearchAlong",
-   "both", -1, Tk_Offset(GraphOptions, search.along), 
+   "both", -1, Tk_Offset(LineGraphOptions, search.along), 
    0, &searchAlongObjOption, 0},
   {TK_OPTION_BOOLEAN, "-stackaxes", "stackAxes", "StackAxes", 
-   "no", -1, Tk_Offset(GraphOptions, stackAxes), 0, NULL, 0},
+   "no", -1, Tk_Offset(LineGraphOptions, stackAxes), 0, NULL, 0},
   {TK_OPTION_STRING, "-takefocus", "takeFocus", "TakeFocus",
-   NULL, -1, Tk_Offset(GraphOptions, takeFocus), TK_OPTION_NULL_OK, NULL, 0},
+   NULL, -1, Tk_Offset(LineGraphOptions, takeFocus),
+   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_STRING, "-title", "title", "Title", 
-   NULL, -1, Tk_Offset(GraphOptions, title), 
+   NULL, -1, Tk_Offset(LineGraphOptions, title), 
    TK_OPTION_NULL_OK, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_SYNONYM, "-tm", NULL, NULL, NULL, -1, 0, 0, "-topmargin", 0},
   {TK_OPTION_PIXELS, "-topmargin", "topMargin", "TopMargin", 
-   "0", -1, Tk_Offset(GraphOptions, topMargin.reqSize), 
+   "0", -1, Tk_Offset(LineGraphOptions, topMargin.reqSize), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_STRING, "-topvariable", "topVariable", "TopVariable",
-   NULL, -1, Tk_Offset(GraphOptions, topMargin.varName), 
+   NULL, -1, Tk_Offset(LineGraphOptions, topMargin.varName), 
    TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_PIXELS, "-width", "width", "Width", 
-   "5i", -1, Tk_Offset(GraphOptions, reqWidth), 
+   "5i", -1, Tk_Offset(LineGraphOptions, reqWidth), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_PIXELS, "-plotwidth", "plotWidth", "PlotWidth", 
-   "0", -1, Tk_Offset(GraphOptions, reqPlotWidth), 
+   "0", -1, Tk_Offset(LineGraphOptions, reqPlotWidth), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_PIXELS, "-plotheight", "plotHeight", "PlotHeight", 
-   "0", -1, Tk_Offset(GraphOptions, reqPlotHeight), 
+   "0", -1, Tk_Offset(LineGraphOptions, reqPlotHeight), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
   {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0}
 };