From a3ce69e44df241ec2447769afda09f8b3801ee43 Mon Sep 17 00:00:00 2001 From: Juhan Oskar Hennoste Date: Sun, 19 Nov 2023 19:18:01 +0200 Subject: [PATCH] Change default uiScale value instead of changing default element sizes --- src/main/java/ee/ut/dendroloj/Dendrologist.java | 4 ++-- src/main/java/ee/ut/dendroloj/GraphGUI.java | 6 +++--- src/test/java/Katsed.java | 2 +- src/test/java/TippKatsed.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/ee/ut/dendroloj/Dendrologist.java b/src/main/java/ee/ut/dendroloj/Dendrologist.java index 33ae2b3..db4e115 100644 --- a/src/main/java/ee/ut/dendroloj/Dendrologist.java +++ b/src/main/java/ee/ut/dendroloj/Dendrologist.java @@ -13,7 +13,7 @@ public final class Dendrologist { private static boolean awake = false; // Startup settings - private static double uiScale = 1.0; + private static double uiScale = 1.5; // Runtime settings static boolean showMethodNames = false; @@ -26,7 +26,7 @@ private Dendrologist() { /** * Sets multiplier for size of UI elements (text, nodes, etc.). *

- * Default: {@code 1.0} + * Default: {@code 1.5} */ public static void setUIScale(double uiScale) { if (awake) { diff --git a/src/main/java/ee/ut/dendroloj/GraphGUI.java b/src/main/java/ee/ut/dendroloj/GraphGUI.java index 2214bcb..c4c0247 100644 --- a/src/main/java/ee/ut/dendroloj/GraphGUI.java +++ b/src/main/java/ee/ut/dendroloj/GraphGUI.java @@ -47,8 +47,8 @@ public static void initGenericGUI(double uiScale, Graph graph, Layout layout) { " fill-mode: plain;" + " fill-color: #0096ff;" + "}", - Math.sqrt(uiScale * 1.5), uiScale * 21, uiScale + 1, - uiScale * 42, uiScale * 21, uiScale * 4.5)); + Math.sqrt(uiScale), uiScale * 14, uiScale + 1, + uiScale * 28, uiScale * 14, uiScale * 3)); init(graph, layout, null); } @@ -79,7 +79,7 @@ public static void initCallTreeGUI(double uiScale) { " fill-mode: plain;" + " fill-color: #0096ff;" + "}", - Math.sqrt(uiScale * 1.5), uiScale * 18, uiScale + 1, Math.sqrt(uiScale * 1.5) * 10, uiScale * 18, uiScale + 1)); + Math.sqrt(uiScale), uiScale * 12, uiScale + 1, Math.sqrt(uiScale) * 10, uiScale * 12, uiScale + 1)); init(CallTreeLayout.graph, null, CallTreeLayout.stepSlider); } diff --git a/src/test/java/Katsed.java b/src/test/java/Katsed.java index aa4f714..ac4fb84 100644 --- a/src/test/java/Katsed.java +++ b/src/test/java/Katsed.java @@ -89,7 +89,7 @@ public static int abi2(int[] a, int i, int n) { } public static void main(String[] args) { - // Dendrologist.setUIScale(1.3); + // Dendrologist.setUIScale(2.0); // Dendrologist.setShowMethodNames(true); // Dendrologist.setArgumentCapture(true, false); Dendrologist.wakeUp(); diff --git a/src/test/java/TippKatsed.java b/src/test/java/TippKatsed.java index 9591872..ae10fd7 100644 --- a/src/test/java/TippKatsed.java +++ b/src/test/java/TippKatsed.java @@ -19,7 +19,7 @@ static Tipp juhuslikPuu(int n, Random juhus) { } public static void main(String[] args) { - // Dendrologist.setUIScale(1.3); + // Dendrologist.setUIScale(2.0); Tipp tipp = juhuslikPuu(20, new Random(42)); nummerdaKeskjärjestuses(tipp, 1);