Lines 80-86
Link Here
|
80 |
@Override |
80 |
@Override |
81 |
double evaluate(Context ctx){ |
81 |
double evaluate(Context ctx){ |
82 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
82 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
83 |
return anchor.getY() + anchor.getHeight(); |
83 |
return anchor.getMaxY(); |
84 |
} |
84 |
} |
85 |
|
85 |
|
86 |
}); |
86 |
}); |
Lines 117-123
Link Here
|
117 |
@Override |
117 |
@Override |
118 |
double evaluate(Context ctx){ |
118 |
double evaluate(Context ctx){ |
119 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
119 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
120 |
return anchor.getX() + anchor.getWidth()/2.; |
120 |
return anchor.getCenterX(); |
121 |
} |
121 |
} |
122 |
|
122 |
|
123 |
}); |
123 |
}); |
Lines 217-223
Link Here
|
217 |
@Override |
217 |
@Override |
218 |
double evaluate(Context ctx){ |
218 |
double evaluate(Context ctx){ |
219 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
219 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
220 |
return anchor.getX() + anchor.getWidth(); |
220 |
return anchor.getMaxX(); |
221 |
} |
221 |
} |
222 |
|
222 |
|
223 |
}); |
223 |
}); |
Lines 296-302
Link Here
|
296 |
builtInFormulas.put("t", new Formula(){ |
296 |
builtInFormulas.put("t", new Formula(){ |
297 |
@Override |
297 |
@Override |
298 |
double evaluate(Context ctx){ |
298 |
double evaluate(Context ctx){ |
299 |
return ctx.getShapeAnchor().getY(); |
299 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
300 |
return anchor.getY(); |
300 |
} |
301 |
} |
301 |
}); |
302 |
}); |
302 |
|
303 |
|
Lines 305-311
Link Here
|
305 |
@Override |
306 |
@Override |
306 |
double evaluate(Context ctx){ |
307 |
double evaluate(Context ctx){ |
307 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
308 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
308 |
return anchor.getY() + anchor.getHeight()/2.; |
309 |
return anchor.getCenterY(); |
309 |
} |
310 |
} |
310 |
}); |
311 |
}); |
311 |
|
312 |
|
Lines 313-319
Link Here
|
313 |
builtInFormulas.put("w", new Formula(){ |
314 |
builtInFormulas.put("w", new Formula(){ |
314 |
@Override |
315 |
@Override |
315 |
double evaluate(Context ctx){ |
316 |
double evaluate(Context ctx){ |
316 |
return ctx.getShapeAnchor().getWidth(); |
317 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
318 |
return anchor.getWidth(); |
317 |
} |
319 |
} |
318 |
}); |
320 |
}); |
319 |
|
321 |
|
Lines 321-327
Link Here
|
321 |
builtInFormulas.put("wd2", new Formula(){ |
323 |
builtInFormulas.put("wd2", new Formula(){ |
322 |
@Override |
324 |
@Override |
323 |
double evaluate(Context ctx){ |
325 |
double evaluate(Context ctx){ |
324 |
return ctx.getShapeAnchor().getWidth()/2.; |
326 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
327 |
return anchor.getWidth()/2.; |
325 |
} |
328 |
} |
326 |
}); |
329 |
}); |
327 |
|
330 |
|
Lines 329-335
Link Here
|
329 |
builtInFormulas.put("wd3", new Formula(){ |
332 |
builtInFormulas.put("wd3", new Formula(){ |
330 |
@Override |
333 |
@Override |
331 |
double evaluate(Context ctx){ |
334 |
double evaluate(Context ctx){ |
332 |
return ctx.getShapeAnchor().getWidth()/3.; |
335 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
336 |
return anchor.getWidth()/3.; |
333 |
} |
337 |
} |
334 |
}); |
338 |
}); |
335 |
|
339 |
|
Lines 337-343
Link Here
|
337 |
builtInFormulas.put("wd4", new Formula(){ |
341 |
builtInFormulas.put("wd4", new Formula(){ |
338 |
@Override |
342 |
@Override |
339 |
double evaluate(Context ctx){ |
343 |
double evaluate(Context ctx){ |
340 |
return ctx.getShapeAnchor().getWidth()/4.; |
344 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
345 |
return anchor.getWidth()/4.; |
341 |
} |
346 |
} |
342 |
}); |
347 |
}); |
343 |
|
348 |
|
Lines 345-351
Link Here
|
345 |
builtInFormulas.put("wd5", new Formula(){ |
350 |
builtInFormulas.put("wd5", new Formula(){ |
346 |
@Override |
351 |
@Override |
347 |
double evaluate(Context ctx){ |
352 |
double evaluate(Context ctx){ |
348 |
return ctx.getShapeAnchor().getWidth()/5.; |
353 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
354 |
return anchor.getWidth()/5.; |
349 |
} |
355 |
} |
350 |
}); |
356 |
}); |
351 |
|
357 |
|
Lines 353-359
Link Here
|
353 |
builtInFormulas.put("wd6", new Formula(){ |
359 |
builtInFormulas.put("wd6", new Formula(){ |
354 |
@Override |
360 |
@Override |
355 |
double evaluate(Context ctx){ |
361 |
double evaluate(Context ctx){ |
356 |
return ctx.getShapeAnchor().getWidth()/6.; |
362 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
363 |
return anchor.getWidth()/6.; |
357 |
} |
364 |
} |
358 |
}); |
365 |
}); |
359 |
|
366 |
|
Lines 361-367
Link Here
|
361 |
builtInFormulas.put("wd8", new Formula(){ |
368 |
builtInFormulas.put("wd8", new Formula(){ |
362 |
@Override |
369 |
@Override |
363 |
double evaluate(Context ctx){ |
370 |
double evaluate(Context ctx){ |
364 |
return ctx.getShapeAnchor().getWidth()/8.; |
371 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
372 |
return anchor.getWidth()/8.; |
365 |
} |
373 |
} |
366 |
}); |
374 |
}); |
367 |
|
375 |
|
Lines 369-375
Link Here
|
369 |
builtInFormulas.put("wd10", new Formula(){ |
377 |
builtInFormulas.put("wd10", new Formula(){ |
370 |
@Override |
378 |
@Override |
371 |
double evaluate(Context ctx){ |
379 |
double evaluate(Context ctx){ |
372 |
return ctx.getShapeAnchor().getWidth()/10.; |
380 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
381 |
return anchor.getWidth()/10.; |
373 |
} |
382 |
} |
374 |
}); |
383 |
}); |
375 |
|
384 |
|
Lines 377-383
Link Here
|
377 |
builtInFormulas.put("wd32", new Formula(){ |
386 |
builtInFormulas.put("wd32", new Formula(){ |
378 |
@Override |
387 |
@Override |
379 |
double evaluate(Context ctx){ |
388 |
double evaluate(Context ctx){ |
380 |
return ctx.getShapeAnchor().getWidth()/32.; |
389 |
Rectangle2D anchor = ctx.getShapeAnchor(); |
|
|
390 |
return anchor.getWidth()/32.; |
381 |
} |
391 |
} |
382 |
}); |
392 |
}); |
383 |
} |
393 |
} |