Browse Source

some missing brackets, typos

pre-master-46
Holger Vogt 6 years ago
parent
commit
32722ecc57
  1. 4
      src/frontend/plotting/graf.c
  2. 11
      src/frontend/plotting/plotit.c
  3. 2
      src/frontend/wdisp/windisp.c

4
src/frontend/plotting/graf.c

@ -79,7 +79,7 @@ int gr_init(double *xlims, double *ylims, /* The size of the screen. */
const char *ylabel, /* Labels for axes. */ const char *ylabel, /* Labels for axes. */
int xtype, int ytype, /* The types of the data graphed. */ int xtype, int ytype, /* The types of the data graphed. */
const char *pname, const char *pname,
const char *commandline) /* For xi_zoomdata() */
const char *commandline, /* For xi_zoomdata() */
int prevgraph) /* plot id, if started from a previous plot*/ int prevgraph) /* plot id, if started from a previous plot*/
{ {
GRAPH *graph; GRAPH *graph;
@ -762,7 +762,7 @@ static int iplot(struct plot *pl, int id)
(void) gr_init(xlims, ylims, xs->v_name, (void) gr_init(xlims, ylims, xs->v_name,
pl->pl_title, NULL, n_vec_plot, 0.0, 0.0, pl->pl_title, NULL, n_vec_plot, 0.0, 0.0,
GRID_LIN, PLOT_LIN, xs->v_name, yl, xs->v_type, yt, GRID_LIN, PLOT_LIN, xs->v_name, yl, xs->v_type, yt,
plot_cur->pl_typename, commandline);
plot_cur->pl_typename, commandline, 0);
for (v = pl->pl_dvecs; v; v = v->v_next) { for (v = pl->pl_dvecs; v; v = v->v_next) {
if (v->v_flags & VF_PLOT) { if (v->v_flags & VF_PLOT) {

11
src/frontend/plotting/plotit.c

@ -275,14 +275,9 @@ bool plotit(wordlist *wl, const char *hcopy, const char *devname)
return FALSE; return FALSE;
} }
/* All these things are static so that "samep" will work.
static double *xcompress = NULL, *xindices = NULL;
static double *xlim = NULL, *ylim = NULL, *xynull;
static double *xdelta = NULL, *ydelta = NULL;
static char *xlabel = NULL, *ylabel = NULL, *title = NULL;
static double *xprevgraph = NULL;*/
static double *xprevgraph = NULL;
int prevgraph = 0; int prevgraph = 0;
static bool nointerp = FALSE; static bool nointerp = FALSE;
static GRIDTYPE gtype = GRID_LIN; static GRIDTYPE gtype = GRID_LIN;
static PLOTTYPE ptype = PLOT_LIN; static PLOTTYPE ptype = PLOT_LIN;
@ -333,7 +328,7 @@ bool plotit(wordlist *wl, const char *hcopy, const char *devname)
nylabel = getword(wwl, "ylabel"); nylabel = getword(wwl, "ylabel");
ntitle = getword(wwl, "title"); ntitle = getword(wwl, "title");
/* remove sgraphid */ /* remove sgraphid */
txfee(getlims(wwl, "sgraphid", 1));
txfree(getlims(wwl, "sgraphid", 1));
/* Build the plot command. This construction had been done with wordlists /* Build the plot command. This construction had been done with wordlists
* and reversing, and flattening, but it is clearer as well as much more * and reversing, and flattening, but it is clearer as well as much more

2
src/frontend/wdisp/windisp.c

@ -412,7 +412,7 @@ LRESULT CALLBACK PlotWindowProc(HWND hwnd, UINT uMsg,
hdc = GetDC(hwnd); hdc = GetDC(hwnd);
GRAPH* gr = pGraph(hwnd); GRAPH* gr = pGraph(hwnd);
isblack = get_black(gr); isblack = get_black(gr);
if (isblack)
if (isblack) {
prevmix = SetROP2(hdc, R2_XORPEN); prevmix = SetROP2(hdc, R2_XORPEN);
} }
else { else {

Loading…
Cancel
Save