From e747df9455ae6a5ab545dc3715d0eb3c082dc6fa Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Thu, 10 Dec 2015 11:50:10 +0100 Subject: [PATCH] Fix label custom coloring and remove unneeded reset actions --- .../component/ActionsToolbar.java | 52 +----------------- .../gephi/visualization/model/TextModel.java | 1 - .../visualization/model/edge/EdgeModel.java | 2 +- .../visualization/model/node/NodeModel.java | 2 +- .../visualization/component/Bundle.properties | 3 - .../component/resetLabelSize.png | Bin 340 -> 0 bytes .../visualization/component/resetSize.png | Bin 304 -> 0 bytes 7 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 modules/VisualizationImpl/src/main/resources/org/gephi/visualization/component/resetLabelSize.png delete mode 100644 modules/VisualizationImpl/src/main/resources/org/gephi/visualization/component/resetSize.png diff --git a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/component/ActionsToolbar.java b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/component/ActionsToolbar.java index 5b09c161d..423a1246d 100644 --- a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/component/ActionsToolbar.java +++ b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/component/ActionsToolbar.java @@ -130,37 +130,6 @@ public class ActionsToolbar extends JToolBar { add(resetColorButton); //Reset sizes - final JButton resetSizeButton = new JButton(); - resetSizeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/gephi/visualization/component/resetSize.png"))); - resetSizeButton.setToolTipText(NbBundle.getMessage(ActionsToolbar.class, "ActionsToolbar.resetSizes")); - resetSizeButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - GraphController gc = Lookup.getDefault().lookup(GraphController.class); - GraphModel gm = gc.getGraphModel(); - Graph graph = gm.getGraphVisible(); - for (Node n : graph.getNodes()) { - n.setSize(size); - } - } - }); - resetSizeButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - - if (SwingUtilities.isRightMouseButton(e)) { - Object res = JOptionPane.showInputDialog(resetSizeButton, NbBundle.getMessage(ActionsToolbar.class, "ActionsToolbar.resetSizes.dialog"), "" + size); - if (res != null) { - try { - size = Float.parseFloat((String) res); - } catch (Exception ex) { - } - } - } - } - }); - add(resetSizeButton); - //Reset label colors final JButton resetLabelColorButton = new JButton(); resetLabelColorButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/gephi/visualization/component/resetLabelColor.png"))); @@ -173,15 +142,17 @@ public class ActionsToolbar extends JToolBar { Graph graph = gm.getGraphVisible(); for (Node n : graph.getNodes().toArray()) { n.getTextProperties().setColor(Color.BLACK); + n.getTextProperties().setAlpha(0f); } for (Edge e : graph.getEdges().toArray()) { e.getTextProperties().setColor(Color.BLACK); + e.getTextProperties().setAlpha(0f); } } }); add(resetLabelColorButton); - //Reset label colors + //Reset label visible final JButton resetLabelVisibleButton = new JButton(); resetLabelVisibleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/gephi/visualization/component/resetLabelVisible.png"))); resetLabelVisibleButton.setToolTipText(NbBundle.getMessage(ActionsToolbar.class, "ActionsToolbar.resetLabelVisible")); @@ -200,23 +171,6 @@ public class ActionsToolbar extends JToolBar { } }); add(resetLabelVisibleButton); - - //Reset label size - JButton resetLabelSizeButton = new JButton(); - resetLabelSizeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/gephi/visualization/component/resetLabelSize.png"))); - resetLabelSizeButton.setToolTipText(NbBundle.getMessage(ActionsToolbar.class, "ActionsToolbar.resetLabelSizes")); - resetLabelSizeButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - GraphController gc = Lookup.getDefault().lookup(GraphController.class); - GraphModel gm = gc.getGraphModel(); - Graph graph = gm.getGraphVisible(); - for (Node n : graph.getNodes()) { - n.getTextProperties().setSize(1f); - } - } - }); - add(resetLabelSizeButton); } private void initDesign() { diff --git a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/TextModel.java b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/TextModel.java index c4e6b56c4..5c0d711e3 100644 --- a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/TextModel.java +++ b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/TextModel.java @@ -4,7 +4,6 @@ */ package org.gephi.visualization.model; -import java.awt.geom.Rectangle2D; import org.gephi.graph.api.ElementProperties; /** diff --git a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/edge/EdgeModel.java b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/edge/EdgeModel.java index 219a3e5e4..b9f5ccfa2 100644 --- a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/edge/EdgeModel.java +++ b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/edge/EdgeModel.java @@ -100,7 +100,7 @@ public abstract class EdgeModel implements Model, TextModel { @Override public boolean hasCustomTextColor() { - return edge.getTextProperties().getR() > 0; + return edge.getTextProperties().getAlpha()> 0; } @Override diff --git a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/node/NodeModel.java b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/node/NodeModel.java index 5334215cf..69c096743 100644 --- a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/node/NodeModel.java +++ b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/model/node/NodeModel.java @@ -165,7 +165,7 @@ public abstract class NodeModel implements Model, TextModel { @Override public boolean hasCustomTextColor() { - return node.getTextProperties().getR() > 0; + return node.getTextProperties().getAlpha()> 0; } @Override diff --git a/modules/VisualizationImpl/src/main/resources/org/gephi/visualization/component/Bundle.properties b/modules/VisualizationImpl/src/main/resources/org/gephi/visualization/component/Bundle.properties index c1893faf6..4766768af 100644 --- a/modules/VisualizationImpl/src/main/resources/org/gephi/visualization/component/Bundle.properties +++ b/modules/VisualizationImpl/src/main/resources/org/gephi/visualization/component/Bundle.properties @@ -53,10 +53,7 @@ SelectionToolbar.drag.tooltip = Drag ActionsToolbar.centerOnGraph = Center On Graph ActionsToolbar.centerOnZero = Center On Zero ActionsToolbar.resetColors = Reset colors -ActionsToolbar.resetSizes = Reset size -ActionsToolbar.resetSizes.dialog = Set size ActionsToolbar.resetLabelColors = Reset label color -ActionsToolbar.resetLabelSizes = Reset label size ActionsToolbar.resetLabelVisible = Reset label visible LabelAttributesPanel.title = Label text settings diff --git a/modules/VisualizationImpl/src/main/resources/org/gephi/visualization/component/resetLabelSize.png b/modules/VisualizationImpl/src/main/resources/org/gephi/visualization/component/resetLabelSize.png deleted file mode 100644 index 9d953b012aa48c60c2d59d83e59bafee950649ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmV-a0jvIrP)u4@#2P?66^K)Tm<=k12|(!phCzUlkr9M91F;H}4Z>YeF-$#Z25EV_1F_@&xsnI4rbHmv4{|CnrTxbYD{$(22vx&~%K%4^0$`G6L^ptu m5gcLvp=uD~1D+cJ0t^6g3U+ z|9>EpAW)j>HxHg~wTAQ!3@x(9%@l2YvPFP|_ zc$T3_-f7`}cA6yzcSL2O7rU>FVdQ&MBb@ E02~%nn*aa+ -- GitLab