** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ezset.cpp,v 1.13 2000/12/27 03:16:02 kevin Exp $
+** $Id: ezset.cpp,v 1.15 2000/12/29 15:45:06 kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
char str [POL::MAXTOK+1];
int code;
bool retval = true;
- if (! m_pol.usertok (str, &code)) {
+ if (! m_pol.readUserToken (str, &code)) {
sys_error (ERR_WARNING, "Illegal EZSET command: %s", str);
m_pol.reader();
retval = false;
switch (lx) {
case S_TEXTSIZE:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
if (f >= 0.0 && f <= 1.0) {
v_textsize = f;
s_textsize = TRUE;
}
break;
case S_REPLOT:
- plot ();
+ plot (m_pSGP);
break;
case S_CLEAR:
clearCurves ();
break;
case S_TITLE:
- m_pol.gettext (strIn, sizeof(strIn));
+ m_pol.readText (strIn, sizeof(strIn));
c_title = strIn;
break;
case S_LEGEND:
- m_pol.gettext (strIn, sizeof(strIn));\r
+ m_pol.readText (strIn, sizeof(strIn));\r
if (m_iCurrentCurve >= 0)\r
setLegend (m_iCurrentCurve, strIn);
break;
case S_XLABEL:
- m_pol.gettext (strIn, sizeof(strIn));
+ m_pol.readText (strIn, sizeof(strIn));
c_xlabel = strIn;
break;
case S_YLABEL:
- m_pol.gettext (strIn, sizeof(strIn));
+ m_pol.readText (strIn, sizeof(strIn));
c_ylabel = strIn;
break;
case S_XCROSS:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
v_xcross = f;
s_xcross = TRUE;
} else
s_xcross = FALSE;
break;
case S_YCROSS:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
v_ycross = f;
s_ycross = TRUE;
} else
s_ymax = FALSE;
break;
case S_XMIN:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
v_xmin = f;
s_xmin = TRUE;
}
break;
case S_XMAX:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
v_xmax = f;
s_xmax = TRUE;
}
break;
case S_YMIN:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
v_ymin = f;
s_ymin = TRUE;
}
break;
case S_YMAX:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE) {
v_ymax = f;
s_ymax = TRUE;
}
case S_DASH:
int ls;\r
ls = SGP::LS_DASH1;\r
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {\r
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {\r
if (n == 1)
ls = SGP::LS_DASH1;
else if (n == 2)
break;
case S_PEN:
case S_COLOR:
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
{
if (n >= 0) {\r
if (m_iCurrentCurve < 0)
o_grid = FALSE;
break;
case S_XLENGTH:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
if (f > 0.0 && f <= 1.0)
o_xlength = f;
break;
case S_YLENGTH:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
if (f > 0.0 && f <= 1.0)
o_ylength = f;
break;
case S_XPORIGIN:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
if (f >= 0.0 && f < 1.0)
o_xporigin = f;
break;
case S_YPORIGIN:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
if (f >= 0.0 && f < 1.0)
o_yporigin = f;
break;
case S_TAG:
- if (m_pol.word("no", 2) == TRUE)
+ if (m_pol.readWord("no", 2) == TRUE)
o_tag = FALSE;
- else if (m_pol.word("off", 2) == TRUE)
+ else if (m_pol.readWord("off", 2) == TRUE)
o_tag = FALSE;
else
o_tag = TRUE;
break;
case S_LEGENDBOX:
- if (m_pol.word("inside", 2) == TRUE)
+ if (m_pol.readWord("inside", 2) == TRUE)
o_legendbox = INSIDE;
- else if (m_pol.word("outside", 3) == TRUE)
+ else if (m_pol.readWord("outside", 3) == TRUE)
o_legendbox = OUTSIDE;
- else if (m_pol.word("none",2) == TRUE)
+ else if (m_pol.readWord("none",2) == TRUE)
o_legendbox = NOLEGEND;
else {
- m_pol.gettext (str, POL::MAXTOK);
+ m_pol.readText (str, POL::MAXTOK);
bad_option(str);
}
break;
case S_XLEGEND:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
{
if (f >= 0.0 && f < 1.0) {
v_xlegend = f;
}
break;
case S_YLEGEND:
- if (m_pol.readfloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
+ if (m_pol.readFloat (&f, POL::TT_REAL, FALSE, 0.0, 0.0) == TRUE)
{
if (f >= 0.0 && f < 1.0) {
v_ylegend = f;
}
break;
case S_SYMBOL:
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {
if (n > 0 && n <= MAXSYMBOL) {
if (m_iCurrentCurve < 0)\r
o_symbol = n;\r
setSymbol (m_iCurrentCurve, n);\r
}\r
} else {
- if (m_pol.word("every",5) == TRUE) {
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {\r
+ if (m_pol.readWord("every",5) == TRUE) {
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {\r
int sym = 1;
if (n > 0)\r
sym = n;\r
else \r
setSymbolFreq (m_iCurrentCurve, sym);\r
}
- } else if (m_pol.word ("none",4) == TRUE) {
+ } else if (m_pol.readWord ("none",4) == TRUE) {
o_symbol = -1;
}
}
break;
case S_CURVE:\r
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {\r
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {\r
if (n > 0)\r
m_iCurrentCurve = n - 1;\r
} else {\r
- if (m_pol.word ("all",3) == TRUE) \r
+ if (m_pol.readWord ("all",3) == TRUE) \r
m_iCurrentCurve = -1;\r
}\r
break;\r
case S_XTICKS:
- if (m_pol.usertok(str,&lx) == FALSE)
+ if (m_pol.readUserToken(str,&lx) == FALSE)
break;
if (lx == S_ABOVE)
o_xticks = ABOVE;
else if (lx == S_LABEL)
o_xtlabel = TRUE;
else if (lx == S_MAJOR) {
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
if (n > 1 && n < 100)
o_xmajortick = n;
} else if (lx == S_MINOR)
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
if (n >= 0 && n < 100)
o_xminortick = n;
break;
case S_YTICKS:
- if (m_pol.usertok(str,&lx) == FALSE)
+ if (m_pol.readUserToken(str,&lx) == FALSE)
break;
if (lx == S_RIGHT)
o_yticks = RIGHT;
else if (lx == S_LABEL)
o_ytlabel = TRUE;
else if (lx == S_MAJOR) {
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
if (n > 1 && n < 100)
o_ymajortick = n;
} else if (lx == S_MINOR)
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE)
if (n >= 0 && n < 100)
o_yminortick = n;
break;
case S_LXFRAC:
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {
if (n >= 0) {
v_lxfrac = n;
s_lxfrac = TRUE;
s_lxfrac = FALSE;
break;
case S_LYFRAC:
- if (m_pol.integer (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {
+ if (m_pol.readInteger (&n, POL::TT_REAL, FALSE, 0, 0) == TRUE) {
if (n >= 0) {
v_lyfrac = n;
s_lyfrac = TRUE;
EZPlot::initKeywords ()
{
for (int i = 0; i < NKEYS; i++)
- if (! m_pol.installKeyword (m_sKeywords[i].keyword, m_sKeywords [i].code))
- sys_error (ERR_SEVERE, "error installing ezset keywords [EZPlot::initKeywords]");
+ m_pol.addKeyword (m_sKeywords[i].keyword, m_sKeywords [i].code);
}