diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AppearanceModelImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AppearanceModelImpl.java index 6a678f22858f390a5efd6492641f0e9cd2cd9216..dbde6821956b275dd70a7058d33597308cf8feba 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AppearanceModelImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AppearanceModelImpl.java @@ -188,13 +188,13 @@ public class AppearanceModelImpl implements AppearanceModel { @Override public void refreshGraphFunctions() { if (!rankings.containsKey(getId("degree"))) { - rankings.put(getId("degree"), new DegreeRankingImpl(graph, defaultInterpolator)); + rankings.put(getId("degree"), new DegreeRankingImpl(graph)); } if (graph.isDirected()) { if (!rankings.containsKey(getId("indegree"))) { DirectedGraph directedGraph = (DirectedGraph) graph; - rankings.put(getId("indegree"), new InDegreeRankingImpl(directedGraph, defaultInterpolator)); - rankings.put(getId("outdegree"), new OutDegreeRankingImpl(directedGraph, defaultInterpolator)); + rankings.put(getId("indegree"), new InDegreeRankingImpl(directedGraph)); + rankings.put(getId("outdegree"), new OutDegreeRankingImpl(directedGraph)); } } else { rankings.remove(getId("indegree")); @@ -207,7 +207,7 @@ public class AppearanceModelImpl implements AppearanceModel { RankingImpl degreeRanking = rankings.get(getId("degree")); if (!graphFunctions.containsKey(degreeId)) { String name = NbBundle.getMessage(AppearanceModelImpl.class, "NodeGraphFunction.Degree.name"); - graphFunctions.put(degreeId, new GraphFunctionImpl(degreeId, name, graph, t, getTransformerUI(t), degreeRanking)); + graphFunctions.put(degreeId, new GraphFunctionImpl(degreeId, name, graph, t, getTransformerUI(t), degreeRanking, defaultInterpolator)); } degreeRanking.refresh(); @@ -220,8 +220,8 @@ public class AppearanceModelImpl implements AppearanceModel { if (!graphFunctions.containsKey(indegreeId)) { String inDegreeName = NbBundle.getMessage(AppearanceModelImpl.class, "NodeGraphFunction.InDegree.name"); String outDegreeName = NbBundle.getMessage(AppearanceModelImpl.class, "NodeGraphFunction.OutDegree.name"); - graphFunctions.put(indegreeId, new GraphFunctionImpl(indegreeId, inDegreeName, graph, t, getTransformerUI(t), indegreeRanking)); - graphFunctions.put(outdegreeId, new GraphFunctionImpl(outdegreeId, outDegreeName, graph, t, getTransformerUI(t), outdegreeRanking)); + graphFunctions.put(indegreeId, new GraphFunctionImpl(indegreeId, inDegreeName, graph, t, getTransformerUI(t), indegreeRanking, defaultInterpolator)); + graphFunctions.put(outdegreeId, new GraphFunctionImpl(outdegreeId, outDegreeName, graph, t, getTransformerUI(t), outdegreeRanking, defaultInterpolator)); } indegreeRanking.refresh(); outdegreeRanking.refresh(); @@ -267,7 +267,7 @@ public class AppearanceModelImpl implements AppearanceModel { @Override public void refreshGraphFunctions() { if (!rankings.containsKey(getId("weight"))) { - rankings.put(getId("weight"), new EdgeWeightRankingImpl(graph, defaultInterpolator)); + rankings.put(getId("weight"), new EdgeWeightRankingImpl(graph)); } if (graph.getModel().isMultiGraph()) { if (!partitions.containsKey(getId("type"))) { @@ -283,7 +283,7 @@ public class AppearanceModelImpl implements AppearanceModel { RankingImpl ranking = rankings.get(getId("weight")); if (!graphFunctions.containsKey(weightId)) { String name = NbBundle.getMessage(AppearanceModelImpl.class, "EdgeGraphFunction.Weight.name"); - graphFunctions.put(weightId, new GraphFunctionImpl(weightId, name, graph, t, getTransformerUI(t), ranking)); + graphFunctions.put(weightId, new GraphFunctionImpl(weightId, name, graph, t, getTransformerUI(t), ranking, defaultInterpolator)); } ranking.refresh(); } @@ -423,7 +423,7 @@ public class AppearanceModelImpl implements AppearanceModel { partition = new AttributePartitionImpl(column, getIndex(false)); partitions.put(getId(column), partition); } else { - ranking = new AttributeRankingImpl(column, getIndex(localScale), defaultInterpolator); + ranking = new AttributeRankingImpl(column, getIndex(localScale)); rankings.put(getId(column), ranking); } } @@ -442,7 +442,7 @@ public class AppearanceModelImpl implements AppearanceModel { if (ranking != null) { String id = getId(t, col); if (!attributeFunctions.containsKey(id)) { - attributeFunctions.put(id, new AttributeFunctionImpl(id, graph, col, t, getTransformerUI(t), ranking)); + attributeFunctions.put(id, new AttributeFunctionImpl(id, graph, col, t, getTransformerUI(t), ranking, defaultInterpolator)); } } } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeFunctionImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeFunctionImpl.java index f121cc6e3af46a093fe195faefcb284a8f05283a..7501851af09a1f9bd8e3c002ed8818065a4ffcea 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeFunctionImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeFunctionImpl.java @@ -6,6 +6,7 @@ package org.gephi.appearance; import org.gephi.appearance.api.AttributeFunction; +import org.gephi.appearance.api.Interpolator; import org.gephi.appearance.api.Partition; import org.gephi.appearance.api.PartitionFunction; import org.gephi.appearance.api.Ranking; @@ -21,12 +22,22 @@ import org.gephi.graph.api.Graph; */ public class AttributeFunctionImpl extends FunctionImpl implements RankingFunction, PartitionFunction, AttributeFunction { - public AttributeFunctionImpl(String id, Graph graph, Column column, Transformer transformer, TransformerUI transformerUI, RankingImpl ranking) { - super(id, null, graph, column, transformer, transformerUI, null, ranking); + public AttributeFunctionImpl(String id, Graph graph, Column column, Transformer transformer, TransformerUI transformerUI, RankingImpl ranking, Interpolator interpolator) { + super(id, null, graph, column, transformer, transformerUI, null, ranking, interpolator); } public AttributeFunctionImpl(String id, Graph graph, Column column, Transformer transformer, TransformerUI transformerUI, PartitionImpl partition) { - super(id, null, graph, column, transformer, transformerUI, partition, null); + super(id, null, graph, column, transformer, transformerUI, partition, null, null); + } + + @Override + public Interpolator getInterpolator() { + return interpolator; + } + + @Override + public void setInterpolator(Interpolator interpolator) { + this.interpolator = interpolator; } @Override diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeRankingImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeRankingImpl.java index 330c716c4a342bc2c0dea07ee374696d1d327dd2..1ee32c4dd1bdaf8e55a75f6013379ac24ff9913b 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeRankingImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeRankingImpl.java @@ -19,8 +19,8 @@ public class AttributeRankingImpl extends RankingImpl { protected final Index index; protected final Column column; - public AttributeRankingImpl(Column column, Index index, Interpolator interpolator) { - super(interpolator); + public AttributeRankingImpl(Column column, Index index) { + super(); this.column = column; this.index = index; } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/DegreeRankingImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/DegreeRankingImpl.java index a32ed8f5d2973278733ab07a64b1f7ecaba9d316..724e60cbaef53dd47c115b1e6f53156657eb6bba 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/DegreeRankingImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/DegreeRankingImpl.java @@ -41,7 +41,6 @@ */ package org.gephi.appearance; -import org.gephi.appearance.api.Interpolator; import org.gephi.graph.api.Element; import org.gephi.graph.api.Graph; import org.gephi.graph.api.Node; @@ -54,8 +53,8 @@ public class DegreeRankingImpl extends RankingImpl { private final Graph graph; - public DegreeRankingImpl(Graph graph, Interpolator interpolator) { - super(interpolator); + public DegreeRankingImpl(Graph graph) { + super(); this.graph = graph; } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java index a8834ecb7cd3515dd95bcb00bae69848c1955a34..271aa0f68dd89299f8b650ca3bb13d5948d1a4a4 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java @@ -65,7 +65,8 @@ public class EdgeTypePartitionImpl extends PartitionImpl { @Override public Iterable getValues() { - return Arrays.asList(model.getEdgeTypeLabels()); +// return Arrays.asList(model.getEdgeTypeLabels()); + return null; } @Override @@ -91,7 +92,8 @@ public class EdgeTypePartitionImpl extends PartitionImpl { @Override public int size() { - return model.getEdgeTypeCount(); +// return model.getEdgeTypeCount(); + return 0; } @Override diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeWeightRankingImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeWeightRankingImpl.java index d023b6a41b07e48527f18603e91bdf00b3aaf788..0c7d58eda9dee9c1619d4d828aa3c94b62eb27b0 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeWeightRankingImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeWeightRankingImpl.java @@ -41,7 +41,6 @@ */ package org.gephi.appearance; -import org.gephi.appearance.api.Interpolator; import org.gephi.graph.api.Edge; import org.gephi.graph.api.Element; import org.gephi.graph.api.Graph; @@ -54,8 +53,8 @@ public class EdgeWeightRankingImpl extends RankingImpl { private final Graph graph; - public EdgeWeightRankingImpl(Graph graph, Interpolator interpolator) { - super(interpolator); + public EdgeWeightRankingImpl(Graph graph) { + super(); this.graph = graph; } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/FunctionImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/FunctionImpl.java index 5962347b54cb711eb6eff3cbe7bf2dbc321e8309..e25ac9f9c11ee58bdc8e8c2f7676f4af3db398e3 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/FunctionImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/FunctionImpl.java @@ -42,6 +42,7 @@ package org.gephi.appearance; import org.gephi.appearance.api.Function; +import org.gephi.appearance.api.Interpolator; import org.gephi.appearance.spi.PartitionTransformer; import org.gephi.appearance.spi.RankingTransformer; import org.gephi.appearance.spi.SimpleTransformer; @@ -65,8 +66,9 @@ public abstract class FunctionImpl implements Function { protected final TransformerUI transformerUI; protected final PartitionImpl partition; protected final RankingImpl ranking; + protected Interpolator interpolator; - protected FunctionImpl(String id, String name, Graph graph, Column column, Transformer transformer, TransformerUI transformerUI, PartitionImpl partition, RankingImpl ranking) { + protected FunctionImpl(String id, String name, Graph graph, Column column, Transformer transformer, TransformerUI transformerUI, PartitionImpl partition, RankingImpl ranking, Interpolator interpolator) { if (id == null) { throw new NullPointerException("The id can't be null"); } @@ -74,6 +76,7 @@ public abstract class FunctionImpl implements Function { this.name = name; this.column = column; this.graph = graph; + this.interpolator = interpolator; try { this.transformer = transformer.getClass().newInstance(); } catch (Exception ex) { @@ -90,7 +93,7 @@ public abstract class FunctionImpl implements Function { ((SimpleTransformer) transformer).transform(element); } else if (isRanking()) { Number val = ranking.getValue(element); - ((RankingTransformer) transformer).transform(element, ranking, val); + ((RankingTransformer) transformer).transform(element, ranking, interpolator, val); } else if (isPartition()) { Object val = partition.getValue(element); ((PartitionTransformer) transformer).transform(element, partition, val); diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/GraphFunctionImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/GraphFunctionImpl.java index 6e394453fb8af60ea215b37dc1302ad15c4a1ec2..2515f76e16e78722b671476cda14483acb4fb5fa 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/GraphFunctionImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/GraphFunctionImpl.java @@ -6,9 +6,8 @@ package org.gephi.appearance; import org.gephi.appearance.api.GraphFunction; -import org.gephi.appearance.api.Partition; +import org.gephi.appearance.api.Interpolator; import org.gephi.appearance.api.PartitionFunction; -import org.gephi.appearance.api.Ranking; import org.gephi.appearance.api.RankingFunction; import org.gephi.appearance.spi.Transformer; import org.gephi.appearance.spi.TransformerUI; @@ -20,12 +19,22 @@ import org.gephi.graph.api.Graph; */ public class GraphFunctionImpl extends FunctionImpl implements GraphFunction, RankingFunction, PartitionFunction { - public GraphFunctionImpl(String id, String name, Graph graph, Transformer transformer, TransformerUI transformerUI, RankingImpl ranking) { - super(id, name, graph, null, transformer, transformerUI, null, ranking); + public GraphFunctionImpl(String id, String name, Graph graph, Transformer transformer, TransformerUI transformerUI, RankingImpl ranking, Interpolator interpolator) { + super(id, name, graph, null, transformer, transformerUI, null, ranking, interpolator); } public GraphFunctionImpl(String id, String name, Graph graph, Transformer transformer, TransformerUI transformerUI, PartitionImpl partition) { - super(id, name, graph, null, transformer, transformerUI, partition, null); + super(id, name, graph, null, transformer, transformerUI, partition, null, null); + } + + @Override + public Interpolator getInterpolator() { + return interpolator; + } + + @Override + public void setInterpolator(Interpolator interpolator) { + this.interpolator = interpolator; } @Override diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/InDegreeRankingImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/InDegreeRankingImpl.java index ecf78bf732ac6bc0355bb06cf8674a9e74466328..af7784d2f1854419bc9058225489972fba6576d2 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/InDegreeRankingImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/InDegreeRankingImpl.java @@ -41,7 +41,6 @@ */ package org.gephi.appearance; -import org.gephi.appearance.api.Interpolator; import org.gephi.graph.api.DirectedGraph; import org.gephi.graph.api.Element; import org.gephi.graph.api.Node; @@ -54,8 +53,8 @@ public class InDegreeRankingImpl extends RankingImpl { private final DirectedGraph graph; - public InDegreeRankingImpl(DirectedGraph graph, Interpolator interpolator) { - super(interpolator); + public InDegreeRankingImpl(DirectedGraph graph) { + super(); this.graph = graph; } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/OutDegreeRankingImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/OutDegreeRankingImpl.java index 82dab8122bb75419ccbf01f1f9db5148771c6be7..93822329a58161a235cad49b3a4efbdeb874cf5a 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/OutDegreeRankingImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/OutDegreeRankingImpl.java @@ -41,7 +41,6 @@ */ package org.gephi.appearance; -import org.gephi.appearance.api.Interpolator; import org.gephi.graph.api.DirectedGraph; import org.gephi.graph.api.Element; import org.gephi.graph.api.Node; @@ -54,8 +53,8 @@ public class OutDegreeRankingImpl extends RankingImpl { private final DirectedGraph graph; - public OutDegreeRankingImpl(DirectedGraph graph, Interpolator interpolator) { - super(interpolator); + public OutDegreeRankingImpl(DirectedGraph graph) { + super(); this.graph = graph; } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/RankingImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/RankingImpl.java index 952483193f174c4ed24893b41a08c4db9a6c7249..fd284859bf2364083e92f9760ef723fa9d085557 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/RankingImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/RankingImpl.java @@ -50,12 +50,10 @@ import org.gephi.appearance.api.Ranking; */ public abstract class RankingImpl implements Ranking { - protected Interpolator interpolator; protected Number min; protected Number max; - protected RankingImpl(Interpolator interpolator) { - this.interpolator = interpolator; + protected RankingImpl() { } protected abstract void refresh(); @@ -71,17 +69,7 @@ public abstract class RankingImpl implements Ranking { } @Override - public Interpolator getInterpolator() { - return interpolator; - } - - @Override - public void setInterpolator(Interpolator interpolator) { - this.interpolator = interpolator; - } - - @Override - public float normalize(Number value) { + public float normalize(Number value, Interpolator interpolator) { float normalizedValue = (float) (value.doubleValue() - min.doubleValue()) / (float) (max.doubleValue() - min.doubleValue()); return interpolator.interpolate(normalizedValue); } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/SimpleFunctionImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/SimpleFunctionImpl.java index 1bf1a92ca599af2530b66fe06429de646163f5e9..f4dcb8c1a77e7237b100efc109f233ca23cba20d 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/SimpleFunctionImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/SimpleFunctionImpl.java @@ -17,6 +17,6 @@ import org.gephi.graph.api.Graph; public class SimpleFunctionImpl extends FunctionImpl implements SimpleFunction { public SimpleFunctionImpl(String id, Graph graph, Transformer transformer, TransformerUI transformerUI) { - super(id, null, graph, null, transformer, transformerUI, null, null); + super(id, null, graph, null, transformer, transformerUI, null, null, null); } } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/Ranking.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/Ranking.java index a5922f4b31bceacc3078c8ea8f9c4ddc9e2df353..e4629e961b4f37f47b8e4fd41bd10525770b0fa8 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/Ranking.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/Ranking.java @@ -53,11 +53,7 @@ public interface Ranking { public Number getMaxValue(); - public Interpolator getInterpolator(); - - public void setInterpolator(Interpolator interpolator); - public Number getValue(Element element); - public float normalize(Number value); + public float normalize(Number value, Interpolator interpolator); } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/RankingFunction.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/RankingFunction.java index 5ed05b93978a4b8addb59aa2987bfc0fbd6d714b..38be861d4e8b3b7f2f8b9e04be991eea1be8083d 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/RankingFunction.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/RankingFunction.java @@ -48,4 +48,8 @@ package org.gephi.appearance.api; public interface RankingFunction extends Function { public Ranking getRanking(); + + public void setInterpolator(Interpolator interpolator); + + public Interpolator getInterpolator(); } diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/spi/RankingTransformer.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/spi/RankingTransformer.java index ab4565441b9603ee42dafecc4d9a8012ed12c0a5..05307c006fad583046eaf0f923316dff18dcec2a 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/spi/RankingTransformer.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/spi/RankingTransformer.java @@ -41,6 +41,7 @@ */ package org.gephi.appearance.spi; +import org.gephi.appearance.api.Interpolator; import org.gephi.appearance.api.Ranking; import org.gephi.graph.api.Element; @@ -50,5 +51,5 @@ import org.gephi.graph.api.Element; */ public interface RankingTransformer extends Transformer { - public void transform(E element, Ranking ranking, Number value); + public void transform(E element, Ranking ranking, Interpolator interpolator, Number value); } diff --git a/modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/RankingElementColorTransformer.java b/modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/RankingElementColorTransformer.java index 6120ba4f7a13c2adc3d0149b3463f71cc49026f1..181726a68f35891ac880585a61f9e2c23a7d61db 100644 --- a/modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/RankingElementColorTransformer.java +++ b/modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/RankingElementColorTransformer.java @@ -44,6 +44,7 @@ package org.gephi.appearance.plugin; import java.awt.Color; import java.io.Serializable; import java.util.Arrays; +import org.gephi.appearance.api.Interpolator; import org.gephi.appearance.api.Ranking; import org.gephi.appearance.spi.RankingTransformer; import org.gephi.appearance.spi.Transformer; @@ -60,8 +61,8 @@ public class RankingElementColorTransformer implements RankingTransformer { protected float maxSize = 4f; @Override - public void transform(Node node, Ranking ranking, Number value) { - float rankingValue = ranking.normalize(value); + public void transform(Node node, Ranking ranking, Interpolator interpolator, Number value) { + float rankingValue = ranking.normalize(value, interpolator); float size = rankingValue * (maxSize - minSize) + minSize; node.setSize(size); } diff --git a/modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceTopComponent.java b/modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceTopComponent.java index b84990ebf25b851ddf4756288219183adba2ecf7..791d1a69e784a8c9d03eecfa2507620362957e3a 100644 --- a/modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceTopComponent.java +++ b/modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceTopComponent.java @@ -341,7 +341,7 @@ public class AppearanceTopComponent extends TopComponent implements Lookup.Provi if (splineEditor == null) { splineEditor = new SplineEditor(NbBundle.getMessage(AppearanceTopComponent.class, "AppearanceTopComponent.splineEditor.title")); } - Interpolator interpolator = function.getRanking().getInterpolator(); + Interpolator interpolator = function.getInterpolator(); if (interpolator instanceof Interpolator.BezierInterpolator) { Interpolator.BezierInterpolator bezierInterpolator = (Interpolator.BezierInterpolator) interpolator; splineEditor.setControl1(bezierInterpolator.getControl1()); @@ -351,7 +351,7 @@ public class AppearanceTopComponent extends TopComponent implements Lookup.Provi splineEditor.setControl2(new Point2D.Float(1, 1)); } splineEditor.setVisible(true); - function.getRanking().setInterpolator( + function.setInterpolator( new Interpolator.BezierInterpolator( (float) splineEditor.getControl1().getX(), (float) splineEditor.getControl1().getY(), (float) splineEditor.getControl2().getX(), (float) splineEditor.getControl2().getY()));