Merge remote-tracking branch 'origin/patch'

This commit is contained in:
Ryan Kurtz 2024-12-04 13:15:37 -05:00
commit 6af8107f04

View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -55,7 +55,7 @@ public class KnotLabelPanel extends JPanel {
int fontOffset = ascent / 3; // this looks about right int fontOffset = ascent / 3; // this looks about right
ArrayList<KnotRecord> knots = palette.getKnots(); ArrayList<KnotRecord> knots = palette.getKnots();
g.setColor(Colors.BORDER); g.setColor(Colors.FOREGROUND);
g.drawLine(5, topBottomMargin - 6, 10, topBottomMargin - ascent + 2); g.drawLine(5, topBottomMargin - 6, 10, topBottomMargin - ascent + 2);
g.drawString("min entropy (0.0)", 20, topBottomMargin - ascent - descent); g.drawString("min entropy (0.0)", 20, topBottomMargin - ascent - descent);
@ -70,10 +70,8 @@ public class KnotLabelPanel extends JPanel {
g.drawLine(5, y, 10, y); g.drawLine(5, y, 10, y);
} }
g.setColor(Colors.BORDER);
g.drawLine(5, height + topBottomMargin + 4, 10, height + topBottomMargin + 8); g.drawLine(5, height + topBottomMargin + 4, 10, height + topBottomMargin + 8);
g.drawString("max entropy (8.0)", 20, topBottomMargin + height + ascent + descent); g.drawString("max entropy (8.0)", 20, topBottomMargin + height + ascent + descent);
} }
private String getLabel(KnotRecord record) { private String getLabel(KnotRecord record) {