Skip to content

Update GraphViz plugin for Gephi 10 #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master-forge
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions modules/GraphvizLayout/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>gephi-plugin-parent</artifactId>
Expand All @@ -9,7 +11,7 @@

<groupId>org.icculus.chunky</groupId>
<artifactId>gephigraphviz</artifactId>
<version>1.0.1</version>
<version>1.2.0</version>
<packaging>nbm</packaging>

<name>GraphvizLayout</name>
Expand Down Expand Up @@ -59,6 +61,7 @@
<licenseFile>license.txt</licenseFile>
<author>Gary "ChunkyKs" Briggs</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://github.com/chunky/gephi-plugins</authorUrl>
<sourceCodeUrl>https://github.com/chunky/gephi-plugins</sourceCodeUrl>
<publicPackages>

Expand All @@ -68,8 +71,16 @@
</plugin>
</plugins>
</build>
<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>

<!-- Snapshot Repositories (only needed if developing against a SNAPSHOT version) -->
<repositories>
<repository>
<id>oss-sonatype</id>
<name>oss-sonatype</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
Desktop desktop = Desktop.getDesktop();
try {
desktop.browse(new URI("http://www.graphviz.org/"));
desktop.browse(new URI("https://www.graphviz.org/"));
} catch (Exception ex) {
ex.printStackTrace();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ public void goAlgo() {
graph.readLock();

for (final Node n : this.graph.getNodes()) {
dotfile.append("\"").append(n.getId()).append("\"");
dotfile.append(n.getId());
dotfile.append(" [");
dotfile.append("pos=\"").append(n.x()).append(',').append(n.y()).append('"');
dotfile.append("];\n");
}
for (final Edge e : this.graph.getEdges()) {
dotfile.append("\"").append(e.getSource().getId()).append("\"");
dotfile.append(e.getSource().getId());
dotfile.append(edgearrow);
dotfile.append("\"").append(e.getTarget().getId()).append("\"");
dotfile.append(e.getTarget().getId());
dotfile.append(" [weight=");
dotfile.append(e.getWeight());
dotfile.append("];\n");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*/
public class GraphvizUIPanel extends javax.swing.JPanel {

GraphvizLayout gvl = null;
transient GraphvizLayout gvl = null;

/** Creates new form GraphvizUIPanel */
public GraphvizUIPanel(GraphvizLayout gvl) {
Expand All @@ -62,24 +62,20 @@ private void initComponents() {

jButton1 = new javax.swing.JButton();
jLabel1 = new javax.swing.JLabel();
algoCombo = new javax.swing.JComboBox();
algoCombo = new javax.swing.JComboBox<String>();
jLabel2 = new javax.swing.JLabel();
rankdirCombo = new javax.swing.JComboBox();
rankdirCombo = new javax.swing.JComboBox<String>();
jLabel4 = new javax.swing.JLabel();
concentrateCheck = new javax.swing.JCheckBox();
jLabel5 = new javax.swing.JLabel();
overlapCombo = new javax.swing.JComboBox();
overlapCombo = new javax.swing.JComboBox<String>();
jLabel3 = new javax.swing.JLabel();
dotBinary = new javax.swing.JTextField();

setLayout(new java.awt.GridBagLayout());

jButton1.setText(org.openide.util.NbBundle.getMessage(GraphvizUIPanel.class, "GraphvizUIPanel.jButton1.text")); // NOI18N
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
}
});
jButton1.addActionListener(evt -> jButton1ActionPerformed(evt));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4);
Expand Down Expand Up @@ -174,6 +170,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
public void keyTyped(java.awt.event.KeyEvent evt) {
dotBinaryKeyTyped(evt);
}

@Override
public void keyReleased(java.awt.event.KeyEvent evt) {
dotBinaryKeyReleased(evt);
}
Expand Down