diff --git a/src/main/java/fucoin/gui/gephi/GraphWindow.java b/src/main/java/fucoin/gui/gephi/GraphWindow.java index 04cdc06d4d4d8a0a6440502e7e9d8bcab265e744..e2d1a85f12c33f7777900fd6590e2448813ec0eb 100644 --- a/src/main/java/fucoin/gui/gephi/GraphWindow.java +++ b/src/main/java/fucoin/gui/gephi/GraphWindow.java @@ -40,8 +40,6 @@ public class GraphWindow extends JFrame { } public static boolean isRetina() { - //TODO: OS and JVM specific checks... - //if (SystemInfo.isJavaVersionAtLeast("1.7.0_40") && SystemInfo.isOracleJvm) { GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); final GraphicsDevice device = env.getDefaultScreenDevice(); @@ -52,14 +50,12 @@ public class GraphWindow extends JFrame { field.setAccessible(true); Object scale = field.get(device); - if (scale instanceof Integer && ((Integer) scale).intValue() == 2) { + if (scale instanceof Integer && (Integer) scale == 2) { return true; } } } catch (Exception ignore) { } - //} - //... return false; } } diff --git a/src/main/java/fucoin/gui/gephi/ItemBuilderTemplate.java b/src/main/java/fucoin/gui/gephi/ItemBuilderTemplate.java index 2d62f90e427e821dc3523be2e00a48e472d15d23..defce3ebbf5c04bd35fd01a24e00c89c3353f5fd 100644 --- a/src/main/java/fucoin/gui/gephi/ItemBuilderTemplate.java +++ b/src/main/java/fucoin/gui/gephi/ItemBuilderTemplate.java @@ -13,10 +13,6 @@ import java.util.Arrays; public class ItemBuilderTemplate implements ItemBuilder { @Override public Item[] getItems(Graph graph) { - Node n = graph.getNodes().toArray()[0]; - Edge[] edges = graph.getEdges(n).toArray(); - Arrays.stream(edges).filter(edge -> edge.getSource() == n).map(Edge::getTarget); - //return new Item[]{new LabelItem(n)}; return new Item[0]; } diff --git a/src/main/java/fucoin/gui/gephi/PreviewSketch.java b/src/main/java/fucoin/gui/gephi/PreviewSketch.java index 40db173c880fb6a38d21062026b6e24b372fa940..255cc1f56378fbb479bc20088b4b33fcb4791df2 100644 --- a/src/main/java/fucoin/gui/gephi/PreviewSketch.java +++ b/src/main/java/fucoin/gui/gephi/PreviewSketch.java @@ -161,6 +161,7 @@ public class PreviewSketch extends JPanel implements MouseListener, MouseWheelLi Vector modelPos = new Vector(screenPos.x, screenPos.y); modelPos.sub(scaledTrans); + modelPos.mult((isRetina) ? 2f : 1f); modelPos.div(target.getScaling()); modelPos.sub(target.getTranslate()); return modelPos; diff --git a/src/main/java/fucoin/gui/gephi/RendererTemplate.java b/src/main/java/fucoin/gui/gephi/RendererTemplate.java index 20dc753cc854020e39b7123571e3dc7ffd80ba5e..7a69717f0869b037648568ee8bdd419031e85d59 100644 --- a/src/main/java/fucoin/gui/gephi/RendererTemplate.java +++ b/src/main/java/fucoin/gui/gephi/RendererTemplate.java @@ -26,7 +26,6 @@ public class RendererTemplate implements Renderer, MouseResponsiveRenderer { //Retrieve clicked node for the label: LabelItem label = (LabelItem) item; Node node = label.node; - System.out.println("Rendering"); //Finally draw your graphics for the node label in each target if (target instanceof G2DTarget) {