From f2d01585c777e8084b68274529435b0eea81cf94 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Mon, 27 May 2013 23:15:45 -0700 Subject: [PATCH] Minor debug --- .../java/org/gephi/desktop/preview/PreviewTopComponent.java | 3 +-- .../org/gephi/preview/plugin/renderers/ArrowRenderer.java | 2 +- .../java/org/gephi/preview/plugin/renderers/EdgeRenderer.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/DesktopPreview/src/main/java/org/gephi/desktop/preview/PreviewTopComponent.java b/modules/DesktopPreview/src/main/java/org/gephi/desktop/preview/PreviewTopComponent.java index 5d4a67486..c1b8ee5a0 100644 --- a/modules/DesktopPreview/src/main/java/org/gephi/desktop/preview/PreviewTopComponent.java +++ b/modules/DesktopPreview/src/main/java/org/gephi/desktop/preview/PreviewTopComponent.java @@ -54,9 +54,9 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import org.gephi.desktop.preview.api.PreviewUIController; import org.gephi.desktop.preview.api.PreviewUIModel; +import org.gephi.preview.api.G2DTarget; import org.gephi.preview.api.PreviewController; import org.gephi.preview.api.PreviewProperty; -import org.gephi.preview.api.G2DTarget; import org.gephi.preview.api.RenderTarget; import org.gephi.ui.components.JColorButton; import org.gephi.ui.utils.UIUtils; @@ -178,7 +178,6 @@ public final class PreviewTopComponent extends TopComponent implements PropertyC } public void initTarget(PreviewUIModel previewUIModel) { - System.out.println("INIT T"); // inits the preview applet if (previewUIModel != null && target == null) { PreviewController previewController = Lookup.getDefault().lookup(PreviewController.class); diff --git a/modules/PreviewPlugin/src/main/java/org/gephi/preview/plugin/renderers/ArrowRenderer.java b/modules/PreviewPlugin/src/main/java/org/gephi/preview/plugin/renderers/ArrowRenderer.java index 1748fab6d..120343456 100644 --- a/modules/PreviewPlugin/src/main/java/org/gephi/preview/plugin/renderers/ArrowRenderer.java +++ b/modules/PreviewPlugin/src/main/java/org/gephi/preview/plugin/renderers/ArrowRenderer.java @@ -85,7 +85,7 @@ public class ArrowRenderer implements Renderer { Item targetItem = item.getData(EdgeRenderer.TARGET); //Weight and color - Float weight = item.getData(EdgeItem.WEIGHT); + Double weight = item.getData(EdgeItem.WEIGHT); EdgeColor edgeColor = (EdgeColor) properties.getValue(PreviewProperty.EDGE_COLOR); Color color = edgeColor.getColor((Color) item.getData(EdgeItem.COLOR), (Color) sourceItem.getData(NodeItem.COLOR), diff --git a/modules/PreviewPlugin/src/main/java/org/gephi/preview/plugin/renderers/EdgeRenderer.java b/modules/PreviewPlugin/src/main/java/org/gephi/preview/plugin/renderers/EdgeRenderer.java index d81d8bd3d..82b881fb4 100644 --- a/modules/PreviewPlugin/src/main/java/org/gephi/preview/plugin/renderers/EdgeRenderer.java +++ b/modules/PreviewPlugin/src/main/java/org/gephi/preview/plugin/renderers/EdgeRenderer.java @@ -149,13 +149,13 @@ public class EdgeRenderer implements Renderer { if ((Boolean) item.getData(EdgeItem.DIRECTED) || edgeRadius > 0f) { //Target Item targetItem = (Item) item.getData(TARGET); - Float weight = item.getData(EdgeItem.WEIGHT); + Double weight = item.getData(EdgeItem.WEIGHT); //Avoid negative arrow size: float arrowSize = properties.getFloatValue(PreviewProperty.ARROW_SIZE); if (arrowSize < 0) { arrowSize = 0; } - float size = arrowSize * weight; + float size = arrowSize * weight.floatValue(); targetRadius = -(edgeRadius + (Float) targetItem.getData(NodeItem.SIZE) / 2f + properties.getFloatValue(PreviewProperty.NODE_BORDER_WIDTH)); item.setData(TARGET_RADIUS, targetRadius - size); } -- GitLab