Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Dot fixes #621

Merged
merged 9 commits into from Jul 7, 2012
Merged

Dot fixes #621

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6062042
ImporterDOT: Dot file color triples are in HSV parameterization.
bgamari May 13, 2012
710a6a4
ImporterDOT: Refactor color parsing into separate function
bgamari May 13, 2012
edbabec
ImporterDOT: Support HTML color codes
bgamari May 13, 2012
97db7d8
ImporterDOT: Log error on failed color parse
bgamari May 13, 2012
999ceee
ImporterDOT: Accept commas as well as spaces to delimit HSV colors
bgamari May 13, 2012
8492565
ImporterDOT: Rework error handling in color parser
bgamari May 13, 2012
a5cbb5b
ImporterDOT: Ensure alpha channel is used
bgamari May 13, 2012
083a44d
ImporterDOT: Add missing nextToken() call
bgamari May 14, 2012
8a7fed5
ImporterDOT: Support quoted HTML color codes
bgamari May 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 34 additions & 23 deletions ImportPlugin/src/org/gephi/io/importer/plugin/file/ImporterDOT.java
View file
Open in desktop
Expand Up @@ -75,6 +75,12 @@ public class ImporterDOT implements FileImporter, LongTask {
private Map<String, Color> colorTable = new HashMap<String, Color>();
private String graphName = "";

private static class ParseException extends RuntimeException {
public ParseException() {
super("Parse error while parsing DOT file");
}
}

public boolean execute(ContainerLoader container) {
this.container = container;
this.report = new Report();
Expand Down Expand Up @@ -191,6 +197,27 @@ protected NodeDraft getOrCreateNode(String id) {
return container.getNode(id);
}

protected Color parseColor(StreamTokenizer streamTokenizer) throws Exception {
if (streamTokenizer.ttype == '#') {
streamTokenizer.nextToken();
return new Color(Integer.parseInt(streamTokenizer.sval, 16), true);
} else if (streamTokenizer.ttype == '"' && streamTokenizer.sval.startsWith("#")) {
return new Color(Integer.parseInt(streamTokenizer.sval.substring(1), 16), true);
} else if (streamTokenizer.ttype != StreamTokenizer.TT_WORD && streamTokenizer.ttype != '"') {
throw new ParseException();
} else if (colorTable.containsKey(streamTokenizer.sval)) {
return colorTable.get(streamTokenizer.sval);
} else {
String[] colors = streamTokenizer.sval.split(" ");
if (colors.length != 3)
colors = streamTokenizer.sval.split(",");
if (colors.length != 3)
throw new ParseException();

return Color.getHSBColor(Float.parseFloat(colors[0]), Float.parseFloat(colors[1]), Float.parseFloat(colors[2]));
}
}

protected void nodeAttributes(StreamTokenizer streamTokenizer, final NodeDraft nodeDraft) throws Exception {
streamTokenizer.nextToken();

Expand All @@ -216,17 +243,9 @@ protected void nodeAttributes(StreamTokenizer streamTokenizer, final NodeDraft n
streamTokenizer.nextToken();
if (streamTokenizer.ttype == '=') {
streamTokenizer.nextToken();
if (streamTokenizer.ttype == StreamTokenizer.TT_WORD || streamTokenizer.ttype == '"') {
if (colorTable.containsKey(streamTokenizer.sval)) {
nodeDraft.setColor(colorTable.get(streamTokenizer.sval));
} else {
try {
String[] colors = streamTokenizer.sval.split(" ");
nodeDraft.setColor(Float.parseFloat(colors[0]), Float.parseFloat(colors[1]), Float.parseFloat(colors[2]));
} catch (Exception e) {
}
}
} else {
try {
nodeDraft.setColor(parseColor(streamTokenizer));
} catch (ParseException e) {
report.logIssue(new Issue(NbBundle.getMessage(ImporterDOT.class, "importerDOT_error_colorunreachable", streamTokenizer.lineno()), Issue.Level.WARNING));
streamTokenizer.pushBack();
}
Expand Down Expand Up @@ -363,18 +382,10 @@ protected void edgeAttributes(StreamTokenizer streamTokenizer, final EdgeDraft e
streamTokenizer.nextToken();
if (streamTokenizer.ttype == '=') {
streamTokenizer.nextToken();
if (streamTokenizer.ttype == StreamTokenizer.TT_WORD || streamTokenizer.ttype == '"') {
if (colorTable.containsKey(streamTokenizer.sval)) {
edge.setColor(colorTable.get(streamTokenizer.sval));
} else {
try {
String[] colors = streamTokenizer.sval.split(" ");
edge.setColor(Float.parseFloat(colors[0]), Float.parseFloat(colors[1]), Float.parseFloat(colors[2]));
} catch (Exception e) {
}
}
} else {
report.logIssue(new Issue(NbBundle.getMessage(ImporterDOT.class, "importerDOT_color_labelunreachable", streamTokenizer.lineno()), Issue.Level.WARNING));
try {
edge.setColor(parseColor(streamTokenizer));
} catch (ParseException e) {
report.logIssue(new Issue(NbBundle.getMessage(ImporterDOT.class, "importerDOT_error_colorunreachable", streamTokenizer.lineno()), Issue.Level.WARNING));
streamTokenizer.pushBack();
}
} else {
Expand Down