Add label color and size transformers in appearance

modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/RankingLabelSizeTransformer.java

+/*
+ Copyright 2008-2013 Gephi
+ Authors : Mathieu Bastian <mathieu.bastian@gephi.org>
+ Website : http://www.gephi.org
+
+ This file is part of Gephi.
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2013 Gephi Consortium. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 3 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://gephi.org/about/legal/license-notice/
+ or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.  When distributing the software, include this License Header
+ Notice in each file and include the License files at
+ /cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 3, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 3] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 3 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 3 code and therefore, elected the GPL
+ Version 3 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+ Contributor(s):
+
+ Portions Copyrighted 2013 Gephi Consortium.
+ */
+package org.gephi.appearance.plugin;
+
+import org.gephi.appearance.api.Interpolator;
+import org.gephi.appearance.api.Ranking;
+import org.gephi.appearance.spi.Transformer;
+import org.gephi.graph.api.Element;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author mbastian
+ */
+@ServiceProvider(service = Transformer.class)
+public class RankingLabelSizeTransformer extends RankingNodeSizeTransformer {
+
+    @Override
+    public void transform(Element element, Ranking ranking, Interpolator interpolator, Number value) {
+        float rankingValue = ranking.normalize(value, interpolator);
+        float size = rankingValue * (maxSize - minSize) + minSize;
+        element.getTextProperties().setSize(size);
+    }
+
+    @Override
+    public boolean isNode() {
+        return true;
+    }
+
+    @Override
+    public boolean isEdge() {
+        return true;
+    }
+}

modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/RankingNodeSizeTransformer.java

@@ -45,6 +45,7 @@ import org.gephi.appearance.api.Interpolator;
 import org.gephi.appearance.api.Ranking;
 import org.gephi.appearance.spi.RankingTransformer;
 import org.gephi.appearance.spi.Transformer;
+import org.gephi.graph.api.Element;
 import org.gephi.graph.api.Node;
 import org.openide.util.lookup.ServiceProvider;
 
@@ -53,16 +54,16 @@ import org.openide.util.lookup.ServiceProvider;
  * @author mbastian
  */
 @ServiceProvider(service = Transformer.class)
-public class RankingNodeSizeTransformer implements RankingTransformer<Node> {
+public class RankingNodeSizeTransformer implements RankingTransformer<Element> {
 
     protected float minSize = 1f;
     protected float maxSize = 4f;
 
     @Override
-    public void transform(Node node, Ranking ranking, Interpolator interpolator, Number value) {
+    public void transform(Element element, Ranking ranking, Interpolator interpolator, Number value) {
         float rankingValue = ranking.normalize(value, interpolator);
         float size = rankingValue * (maxSize - minSize) + minSize;
-        node.setSize(size);
+        ((Node) element).setSize(size);
     }
 
     @Override

modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RankingElementColorTransformerUI.java

@@ -75,7 +75,7 @@ public class RankingElementColorTransformerUI implements TransformerUI {
 
     @Override
     public String getDisplayName() {
-        return NbBundle.getMessage(UniqueElementColorTransformerUI.class, "Attribute.name");
+        return NbBundle.getMessage(RankingElementColorTransformerUI.class, "Attribute.name");
     }
 
     @Override

modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RankingLabelColorTransformerUI.java

+/*
+ Copyright 2008-2013 Gephi
+ Authors : Mathieu Bastian <mathieu.bastian@gephi.org>
+ Website : http://www.gephi.org
+
+ This file is part of Gephi.
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2013 Gephi Consortium. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 3 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://gephi.org/about/legal/license-notice/
+ or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.  When distributing the software, include this License Header
+ Notice in each file and include the License files at
+ /cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 3, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 3] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 3 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 3 code and therefore, elected the GPL
+ Version 3 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+ Contributor(s):
+
+ Portions Copyrighted 2013 Gephi Consortium.
+ */
+package org.gephi.ui.appearance.plugin;
+
+import javax.swing.AbstractButton;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import org.gephi.appearance.api.Function;
+import org.gephi.appearance.api.RankingFunction;
+import org.gephi.appearance.plugin.RankingLabelColorTransformer;
+import org.gephi.appearance.spi.RankingTransformer;
+import org.gephi.appearance.spi.TransformerCategory;
+import org.gephi.appearance.spi.TransformerUI;
+import org.gephi.ui.appearance.plugin.category.DefaultCategory;
+import org.openide.util.NbBundle;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author mbastian
+ */
+@ServiceProvider(service = TransformerUI.class, position = 400)
+public class RankingLabelColorTransformerUI implements TransformerUI {
+
+    private RankingColorTransformerPanel panel;
+
+    @Override
+    public TransformerCategory getCategory() {
+        return DefaultCategory.LABEL_COLOR;
+    }
+
+    @Override
+    public Icon getIcon() {
+        return null;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return NbBundle.getMessage(RankingLabelColorTransformerUI.class, "Attribute.name");
+    }
+
+    @Override
+    public String getDescription() {
+        return null;
+    }
+
+    @Override
+    public synchronized JPanel getPanel(Function function) {
+        if (panel == null) {
+            panel = new RankingColorTransformerPanel();
+        }
+        panel.setup((RankingFunction) function);
+        return panel;
+    }
+
+    @Override
+    public synchronized AbstractButton[] getControlButton() {
+        return null;
+    }
+
+    @Override
+    public Class<? extends RankingTransformer> getTransformerClass() {
+        return RankingLabelColorTransformer.class;
+    }
+}

modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RankingLabelSizeTransformerUI.java

+/*
+ Copyright 2008-2013 Gephi
+ Authors : Mathieu Bastian <mathieu.bastian@gephi.org>
+ Website : http://www.gephi.org
+
+ This file is part of Gephi.
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2013 Gephi Consortium. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 3 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://gephi.org/about/legal/license-notice/
+ or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.  When distributing the software, include this License Header
+ Notice in each file and include the License files at
+ /cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 3, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 3] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 3 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 3 code and therefore, elected the GPL
+ Version 3 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+ Contributor(s):
+
+ Portions Copyrighted 2013 Gephi Consortium.
+ */
+package org.gephi.ui.appearance.plugin;
+
+import javax.swing.AbstractButton;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import org.gephi.appearance.api.Function;
+import org.gephi.appearance.api.RankingFunction;
+import org.gephi.appearance.plugin.RankingLabelSizeTransformer;
+import org.gephi.appearance.spi.RankingTransformer;
+import org.gephi.appearance.spi.TransformerCategory;
+import org.gephi.appearance.spi.TransformerUI;
+import org.gephi.ui.appearance.plugin.category.DefaultCategory;
+import org.openide.util.NbBundle;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author mbastian
+ */
+@ServiceProvider(service = TransformerUI.class, position = 500)
+public class RankingLabelSizeTransformerUI implements TransformerUI {
+
+    private RankingSizeTransformerPanel panel;
+
+    @Override
+    public TransformerCategory getCategory() {
+        return DefaultCategory.LABEL_SIZE;
+    }
+
+    @Override
+    public Icon getIcon() {
+        return null;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return NbBundle.getMessage(UniqueElementColorTransformerUI.class, "Attribute.name");
+    }
+
+    @Override
+    public String getDescription() {
+        return null;
+    }
+
+    @Override
+    public synchronized JPanel getPanel(Function function) {
+        if (panel == null) {
+            panel = new RankingSizeTransformerPanel();
+        }
+        panel.setup((RankingFunction) function);
+        return panel;
+    }
+
+    @Override
+    public synchronized AbstractButton[] getControlButton() {
+        return null;
+    }
+
+    @Override
+    public Class<? extends RankingTransformer> getTransformerClass() {
+        return RankingLabelSizeTransformer.class;
+    }
+}

modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/category/DefaultCategory.java

@@ -84,4 +84,36 @@ public class DefaultCategory {
             return "COLOR";
         }
     };
+    public static TransformerCategory LABEL_COLOR = new TransformerCategory() {
+        @Override
+        public String getDisplayName() {
+            return NbBundle.getMessage(DefaultCategory.class, "Category.LabelColor.name");
+        }
+
+        @Override
+        public Icon getIcon() {
+            return new ImageIcon(getClass().getResource("/org/gephi/ui/appearance/plugin/resources/labelcolor.png"));
+        }
+
+        @Override
+        public String toString() {
+            return "LABEL_COLOR";
+        }
+    };
+    public static TransformerCategory LABEL_SIZE = new TransformerCategory() {
+        @Override
+        public String getDisplayName() {
+            return NbBundle.getMessage(DefaultCategory.class, "Category.LabelSize.name");
+        }
+
+        @Override
+        public Icon getIcon() {
+            return new ImageIcon(getClass().getResource("/org/gephi/ui/appearance/plugin/resources/labelsize.png"));
+        }
+
+        @Override
+        public String toString() {
+            return "LABEL_SIZE";
+        }
+    };
 }

modules/AppearancePluginUI/src/main/resources/org/gephi/ui/appearance/plugin/category/Bundle.properties

 Category.Size.name = Size
-Category.Color.name = Color
\ No newline at end of file
+Category.Color.name = Color
+Category.LabelColor.name = Label Color
+Category.LabelSize.name = Label Size
\ No newline at end of file

modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceUIModel.java

@@ -42,7 +42,6 @@
 package org.gephi.desktop.appearance;
 
 import java.awt.Color;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -64,7 +63,6 @@ import static org.gephi.desktop.appearance.AppearanceUIController.ELEMENT_CLASSE
 import org.gephi.graph.api.Graph;
 import org.gephi.graph.api.GraphController;
 import org.gephi.ui.appearance.plugin.category.DefaultCategory;
-import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 
 /**

modules/VisualizationImpl/src/main/java/org/gephi/visualization/component/ActionsToolbar.java

@@ -172,10 +172,10 @@ public class ActionsToolbar extends JToolBar {
                 GraphModel gm = gc.getGraphModel();
                 Graph graph = gm.getGraphVisible();
                 for (Node n : graph.getNodes().toArray()) {
-                    n.getTextProperties().setColor(null);
+                    n.getTextProperties().setColor(Color.BLACK);
                 }
                 for (Edge e : graph.getEdges().toArray()) {
-                    e.getTextProperties().setColor(null);
+                    e.getTextProperties().setColor(Color.BLACK);
                 }
             }
         });