andreacavalli/WarpPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Logarithm natural display

Browse Source
This commit is contained in:
Andrea Cavalli 2018-05-06 16:37:54 +02:00
parent 47fe4f5647
commit 59a8e79e4d
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/java/org/warp/picalculator/gui/expression/blocks/BlockLogarithm.java
View File

@ -16,12 +16,16 @@ public class BlockLogarithm extends Block {
private final BlockContainer containerBase; private final BlockContainer containerBase;
private final BlockContainer containerNumber; private final BlockContainer containerNumber;
private final String prefix = "LOG_TEST"; private final String prefix = "log";
private int prw; private int prw;
private int bw; private int bw;
private int bh; private int bh;
private int bl;
private int chw; private int chw;
private int chh; private int chh;
private int schh;
private int nmbh;
private int toph;
public BlockLogarithm() { public BlockLogarithm() {
containerBase = new BlockContainer(true); containerBase = new BlockContainer(true);
@ -42,21 +46,21 @@ public class BlockLogarithm extends Block {
if (prefix != null) { if (prefix != null) {
r.glDrawStringLeft(x + 1, y + line - chh / 2, prefix); r.glDrawStringLeft(x + 1, y + line - chh / 2, prefix);
} }
r.glDrawCharLeft(x + bw + prw, y, '╭'); r.glDrawCharLeft(x + bw + prw, y + toph, '╭');
r.glDrawCharLeft(x + bw + prw, y + height - chh, '╰'); r.glDrawCharLeft(x + bw + prw, y + toph + nmbh - chh, '╰');
if (small) { if (small) {
r.glFillColor(x + bw + prw + 1, y + 5, 1, height - 4 * 2); r.glFillColor(x + bw + prw + 1, y + toph + 5, 1, nmbh - 4 * 2);
r.glFillColor(x + width - 3, y + 5, 1, height - 4 * 2); r.glFillColor(x + width - 3, y + toph + 5, 1, nmbh - 4 * 2);
} else { } else {
r.glFillColor(x + bw + prw + 3, y + 6, 2, height - 6 * 2); r.glFillColor(x + bw + prw + 3, y + toph + 6, 2, nmbh - 6 * 2);
r.glFillColor(x + width - 5, y + 6, 2, height - 6 * 2); r.glFillColor(x + width - 5, y + toph + 6, 2, nmbh - 6 * 2);
} }
r.glDrawCharLeft(x + width - chw, y, '╮'); r.glDrawCharLeft(x + width - chw, y + toph, '╮');
r.glDrawCharLeft(x + width - chw, y + height - chh, '╯'); r.glDrawCharLeft(x + width - chw, y + toph + nmbh - chh, '╯');
r.glColor(BlockContainer.getDefaultColor()); r.glColor(BlockContainer.getDefaultColor());
containerBase.draw(ge, r, x + prw, y + height - bh, caret); containerBase.draw(ge, r, x + prw, y + line + chh/2 - bl, caret);
r.glColor(BlockContainer.getDefaultColor()); r.glColor(BlockContainer.getDefaultColor());
containerNumber.draw(ge, r, x + bw + prw + chw, y, caret); containerNumber.draw(ge, r, x + bw + prw + chw, y + toph, caret);
} }
@Override @Override
@ -97,15 +101,35 @@ public class BlockLogarithm extends Block {
if (prefix == null) { if (prefix == null) {
prw = 0; prw = 0;
} else { } else {
prw = 1 + BlockContainer.getDefaultCharWidth(small) * prefix.length() + 2; prw = 1 + BlockContainer.getDefaultCharWidth(small) * prefix.length();
} }
bw = containerBase.getWidth(); bw = containerBase.getWidth();
bh = containerBase.getHeight(); bh = containerBase.getHeight();
bl = containerBase.getLine();
chw = BlockContainer.getDefaultCharWidth(small); chw = BlockContainer.getDefaultCharWidth(small);
chh = BlockContainer.getDefaultCharHeight(small); chh = BlockContainer.getDefaultCharHeight(small);
schh = BlockContainer.getDefaultCharHeight(true);
width = prw + bw + chw + containerNumber.getWidth() + chw + 3; width = prw + bw + chw + containerNumber.getWidth() + chw + 3;
height = containerNumber.getHeight(); nmbh = containerNumber.getHeight();
line = containerNumber.getLine(); int nl = containerNumber.getLine();
if (bl > nmbh) {
toph = bl - nmbh;
line = toph + nl;
if (bl + (bh - bl) > toph + nmbh) {
height = bl + (bh - bl);
} else {
height = toph + nmbh;
}
} else {
System.out.println("b");
toph = 0;
line = toph + nl;
if (nmbh + bh - bl > toph + nmbh) {
height = nmbh + (bh - bl);
} else {
height = toph + nmbh;
}
}
} }
@Override @Override