Skip to content

Commit 0d68aa4

Browse files
committed
Update based on upcoming 0.9.3 version, mostly around Appearance
1 parent 368381f commit 0d68aa4

File tree

7 files changed

+37
-21
lines changed

7 files changed

+37
-21
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/target/
22
.DS_Store
3+
*.iml
4+
*.idea

pom.xml

+13-6
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,26 @@
44

55
<groupId>org.gephi</groupId>
66
<artifactId>toolkit-demos</artifactId>
7-
<version>0.9.2</version>
7+
<version>0.9.3-SNAPSHOT</version>
8+
<build>
9+
<plugins>
10+
<plugin>
11+
<groupId>org.apache.maven.plugins</groupId>
12+
<artifactId>maven-compiler-plugin</artifactId>
13+
<configuration>
14+
<source>8</source>
15+
<target>8</target>
16+
</configuration>
17+
</plugin>
18+
</plugins>
19+
</build>
820
<packaging>jar</packaging>
921

1022
<properties>
1123
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1224
</properties>
1325

1426
<repositories>
15-
<repository>
16-
<id>netbeans</id>
17-
<name>NetBeans</name>
18-
<url>http://bits.netbeans.org/maven2/</url>
19-
</repository>
2027
<repository>
2128
<id>oss-sonatype</id>
2229
<name>oss-sonatype</name>

src/main/java/org/gephi/toolkit/demos/Filtering.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void script() {
100100
System.out.println("Nodes: " + graph.getNodeCount() + " Edges: " + graph.getEdgeCount());
101101

102102
//Filter, keep partition 'Blogarama'. Build partition with 'source' column in the data
103-
NodePartitionFilter partitionFilter = new NodePartitionFilter(graphModel.getNodeTable().getColumn("source"), appearanceModel);
103+
NodePartitionFilter partitionFilter = new NodePartitionFilter(appearanceModel.getNodePartition(graphModel.getNodeTable().getColumn("source")));
104104
partitionFilter.unselectAll();
105105
partitionFilter.addPart("Blogarama");
106106
Query query2 = filterController.createQuery(partitionFilter);

src/main/java/org/gephi/toolkit/demos/HeadlessSimple.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,16 @@ public void script() {
139139
distance.execute(graphModel);
140140

141141
//Rank color by Degree
142-
Function degreeRanking = appearanceModel.getNodeFunction(graph, AppearanceModel.GraphFunction.NODE_DEGREE, RankingElementColorTransformer.class);
143-
RankingElementColorTransformer degreeTransformer = (RankingElementColorTransformer) degreeRanking.getTransformer();
142+
Function degreeRanking = appearanceModel.getNodeFunction(graphModel.defaultColumns()
143+
.degree(), RankingElementColorTransformer.class);
144+
RankingElementColorTransformer degreeTransformer = degreeRanking.getTransformer();
144145
degreeTransformer.setColors(new Color[]{new Color(0xFEF0D9), new Color(0xB30000)});
145146
degreeTransformer.setColorPositions(new float[]{0f, 1f});
146147
appearanceController.transform(degreeRanking);
147148

148149
//Rank size by centrality
149150
Column centralityColumn = graphModel.getNodeTable().getColumn(GraphDistance.BETWEENNESS);
150-
Function centralityRanking = appearanceModel.getNodeFunction(graph, centralityColumn, RankingNodeSizeTransformer.class);
151+
Function centralityRanking = appearanceModel.getNodeFunction(centralityColumn, RankingNodeSizeTransformer.class);
151152
RankingNodeSizeTransformer centralityTransformer = (RankingNodeSizeTransformer) centralityRanking.getTransformer();
152153
centralityTransformer.setMinSize(3);
153154
centralityTransformer.setMaxSize(10);

src/main/java/org/gephi/toolkit/demos/PartitionGraph.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ public void script() {
9898

9999
//Partition with 'source' column, which is in the data
100100
Column column = graphModel.getNodeTable().getColumn("source");
101-
Function func = appearanceModel.getNodeFunction(graph, column, PartitionElementColorTransformer.class);
101+
Function func = appearanceModel.getNodeFunction(column, PartitionElementColorTransformer.class);
102102
Partition partition = ((PartitionFunction) func).getPartition();
103-
Palette palette = PaletteManager.getInstance().generatePalette(partition.size());
104-
partition.setColors(palette.getColors());
103+
Palette palette = PaletteManager.getInstance().generatePalette(partition.size(graph));
104+
partition.setColors(graph, palette.getColors());
105105
appearanceController.transform(func);
106106

107107
//Export
@@ -119,11 +119,11 @@ public void script() {
119119

120120
//Partition with 'modularity_class', just created by Modularity algorithm
121121
Column modColumn = graphModel.getNodeTable().getColumn(Modularity.MODULARITY_CLASS);
122-
Function func2 = appearanceModel.getNodeFunction(graph, modColumn, PartitionElementColorTransformer.class);
122+
Function func2 = appearanceModel.getNodeFunction(modColumn, PartitionElementColorTransformer.class);
123123
Partition partition2 = ((PartitionFunction) func2).getPartition();
124-
System.out.println(partition2.size() + " partitions found");
125-
Palette palette2 = PaletteManager.getInstance().randomPalette(partition2.size());
126-
partition2.setColors(palette2.getColors());
124+
System.out.println(partition2.size(graph) + " partitions found");
125+
Palette palette2 = PaletteManager.getInstance().randomPalette(partition2.size(graph));
126+
partition2.setColors(graph, palette2.getColors());
127127
appearanceController.transform(func2);
128128

129129
//Export

src/main/java/org/gephi/toolkit/demos/RankingGraph.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ public void script() {
9494
System.out.println("Edges: " + graph.getEdgeCount());
9595

9696
//Rank color by Degree
97-
Function degreeRanking = appearanceModel.getNodeFunction(graph, AppearanceModel.GraphFunction.NODE_DEGREE, RankingElementColorTransformer.class);
98-
RankingElementColorTransformer degreeTransformer = (RankingElementColorTransformer) degreeRanking.getTransformer();
97+
Function degreeRanking = appearanceModel.getNodeFunction(graphModel.defaultColumns()
98+
.degree(), RankingElementColorTransformer.class);
99+
RankingElementColorTransformer degreeTransformer = degreeRanking.getTransformer();
99100
degreeTransformer.setColors(new Color[]{new Color(0xFEF0D9), new Color(0xB30000)});
100101
degreeTransformer.setColorPositions(new float[]{0f, 1f});
101102
appearanceController.transform(degreeRanking);
@@ -107,14 +108,14 @@ public void script() {
107108

108109
//Rank size by centrality
109110
Column centralityColumn = graphModel.getNodeTable().getColumn(GraphDistance.BETWEENNESS);
110-
Function centralityRanking = appearanceModel.getNodeFunction(graph, centralityColumn, RankingNodeSizeTransformer.class);
111+
Function centralityRanking = appearanceModel.getNodeFunction(centralityColumn, RankingNodeSizeTransformer.class);
111112
RankingNodeSizeTransformer centralityTransformer = (RankingNodeSizeTransformer) centralityRanking.getTransformer();
112113
centralityTransformer.setMinSize(3);
113114
centralityTransformer.setMaxSize(10);
114115
appearanceController.transform(centralityRanking);
115116

116117
//Rank label size - set a multiplier size
117-
Function centralityRanking2 = appearanceModel.getNodeFunction(graph, centralityColumn, RankingLabelSizeTransformer.class);
118+
Function centralityRanking2 = appearanceModel.getNodeFunction(centralityColumn, RankingLabelSizeTransformer.class);
118119
RankingLabelSizeTransformer labelSizeTransformer = (RankingLabelSizeTransformer) centralityRanking2.getTransformer();
119120
labelSizeTransformer.setMinSize(1);
120121
labelSizeTransformer.setMaxSize(3);

src/main/java/org/gephi/toolkit/demos/plugins/preview/RendererTemplate.java

+5
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ public String getDisplayName() {
5050
public void preProcess(PreviewModel previewModel) {
5151
}
5252

53+
@Override
54+
public void postProcess(PreviewModel previewModel, RenderTarget target,
55+
PreviewProperties properties) {
56+
}
57+
5358
@Override
5459
public void render(Item item, RenderTarget target, PreviewProperties properties) {
5560
//Retrieve clicked node for the label:

0 commit comments

Comments
 (0)