manuth/ExperimentBox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: manuth:ff0c3f0b989f35a3cbd2c21cd29603d614485f9d
Branches Tags
manuth:main
manuth:dev
..
compare: manuth:5e93294c386edafb6f921d58d3bc42edafc563d1
Branches Tags
manuth:dev
manuth:main

2 commits
ff0c3f0b98 ... 5e93294c38

Author SHA1 Message Date
Manuel Thalmann
5e93294c38 Rewrite function for resolving competitor name 2022-11-15 16:35:28 +01:00
Manuel Thalmann
25068543ad Fix scaling for linux devices 2022-11-15 16:30:05 +01:00
2 changed files with 315 additions and 304 deletions
Show stats Expand all files Collapse all files

15
app/src/main/java/ch/nuth/zhaw/exbox/ExBoxFrame.java
View file

@ -29,6 +29,7 @@ import java.util.Set;
* @version 2.04 2021/9/11 Test as plugin * @version 2.04 2021/9/11 Test as plugin
*/ */
public class ExBoxFrame extends JFrame implements ActionListener, ItemListener { public class ExBoxFrame extends JFrame implements ActionListener, ItemListener {
private final Dimension UHDTHRESHOLD = new Dimension(2000, 1500);
private final String STANDARDENCODING = "UTF-8"; private final String STANDARDENCODING = "UTF-8";
private JMenuItem connect, exit, open, test, retest, textView, graphicView, clear; private JMenuItem connect, exit, open, test, retest, textView, graphicView, clear;
@ -154,8 +155,18 @@ public class ExBoxFrame extends JFrame implements ActionListener, ItemListener {
ex.printStackTrace(); ex.printStackTrace();
} }
setFontSize(11); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
setSize(new Dimension(400, 400));
double scale = (
screenSize.getWidth() > UHDTHRESHOLD.getWidth() &&
screenSize.getHeight() > UHDTHRESHOLD.getHeight()) ? 2 : 1;
scale = Math.max(scale, Toolkit.getDefaultToolkit().getScreenResolution() / 96.0);
setFontSize((int) (11 * scale));
setSize(
new Dimension((int)(400 * scale), (int)(400 * scale)));
setTitle("ExBox"); setTitle("ExBox");
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
initComponents(); initComponents();

2
app/src/main/java/ch/nuth/zhaw/exbox/MyCompetitor.java
View file

@ -63,7 +63,7 @@ public class MyCompetitor implements Comparable<MyCompetitor> {
@Override @Override
public int hashCode() { public int hashCode() {
int hashCode = 13; int hashCode = 13;
hashCode += name.hashCode(); hashCode += getName().hashCode();
hashCode *= 17; hashCode *= 17;
return hashCode + rank; return hashCode + rank;
} }