Skip to content

Commit

Permalink
Allow more dynamic scaling of bubbles
Browse files Browse the repository at this point in the history
  • Loading branch information
jmccrae committed Jun 28, 2018
1 parent e27235d commit 2442745
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion clouds/linguistic-lod.json
Expand Up @@ -40,7 +40,8 @@
"selection": "domain",
"selected": "linguistics",
"datasets": ["gold", "apertium-rdf-eo-en", "pdev-lemon", "universal-dependencies-treebank-persian", "apertium-rdf-en-es", "universal-dependencies-treebank-galician", "apertium-rdf-eo-es", "universal-dependencies-treebank-czech", "apertium-rdf-en-gl", "babelnet", "jrc-names-mlode", "apertium-rdf-oc-ca", "eurovoc-in-skos", "isocat-metadata", "muninn-world-war-i", "associations", "saldo-rdf", "apertium-rdf-ca-it", "geowordnet", "universal-dependencies-treebank-arabic", "universal-dependencies-treebank-catalan", "sentiws", "apertium-rdf-pt-gl", "lodac-bdls", "universal-dependencies-treebank-latin-proiel", "bll-thesaurus", "universal-dependencies-treebank-ancient-greek-proiel", "universal-dependencies-treebank-slovenian", "apertium-rdf-fr-es", "universal-dependencies-treebank-vietnamese", "emn", "wikilinks-rdf-nif", "kore-50-nif-ner-corpus", "universal-dependencies-treebank-latvian", "universal-dependencies-treebank-slovenian-sst", "greek-wordnet", "universal-dependencies-treebank-japanese-ktc", "apertium-rdf-eo-ca", "universal-dependencies-treebank-uyghur", "universal-dependencies-treebank-czech-cltt", "universal-dependencies-treebank-portuguese", "universal-dependencies-treebank-kazakh", "universal-dependencies-treebank-slovak", "semanticquran", "rss-500-nif-ner-corpus", "apertium-rdf-es-an", "dbpedia-es", "universal-dependencies-treebank-finnish", "universal-dependencies-treebank-turkish", "universal-dependencies-treebank-french", "universal-dependencies-treebank-romanian", "universal-dependencies-treebank-croatian", "dbpedia-nl", "clld-apics", "universal-dependencies-treebank-coptic", "olia-discourse", "universal-dependencies-treebank-basque", "universal-dependencies-treebank-polish", "galician-eurowordnet-lemon-lexicon-3-0", "ontos-news-portal", "mlsa", "open-data-thesaurus", "universal-dependencies-treebank-spanish", "gesis-thesoz", "zhishi-lemon", "fao-geopolitical-ontology", "asit", "universal-dependencies-treebank-russian-syntagrus", "wordnet-rdf", "masc-bn-nif", "dbpedia-abstract-corpus", "lemonwiktionary", "universal-dependencies-treebank-hindi", "zhishi-me", "universal-dependencies-treebank-italian", "universal-dependencies-treebank-swedish-sign-language", "tds", "swefn-rdf", "cornetto", "de-gaap-ontology-lexicon", "olia", "agrovoc-skos", "saldom-rdf", "apertium-rdf-es-pt", "lemonuby", "universal-dependencies-treebank-spanish-ancora", "rkb-explorer-wordnet", "universal-dependencies-treebank-russian", "universal-dependencies-treebank-english-esl", "parole-simple-lexinfo-ontology-lexicons", "wold", "universal-dependencies-treebank-galician-treegal", "apertium-rdf-es-gl", "gemet-annotated", "universal-dependencies-treebank-danish", "simple", "clean-energy-data-reegle", "apertium-rdf-es-ca", "basque-eurowordnet-lemon-lexicon-3-0", "wiktionary-dbpedia-org", "germlex", "vu-wordnet", "clld-wold", "panlex", "universal-dependencies-treebank-indonesian", "universal-dependencies-treebank-latin-ittb", "dbpedia-spotlight-nif-ner-corpus", "dbpedia", "thist", "framebase-schema", "clld-afbo", "universal-dependencies-treebank-irish", "universal-dependencies-treebank-swedish", "universal-dependencies-treebank-tamil", "universal-dependencies-treebank-old-church-slavonic", "apertium-rdf-en-ca", "apertium-rdf-pt-ca", "clld-sails", "umthes", "stw-thesaurus-for-economics", "universal-dependencies-treebank-estonian", "environmental-applications-reference-thesaurus", "dbnary", "universal-dependencies-treebank-hebrew", "catalan-eurowordnet-lemon-lexicon-3-0", "universal-dependencies-treebank-latin", "gemet", "apertium-rdf-es-ro", "universal-dependencies-treebank-ukrainian", "universal-dependencies-treebank-hungarian", "xwn", "lexinfo", "clld-phoible", "universal-dependencies-treebank-ancient-greek", "brown-corpus-in-rdf-nif", "apertium-rdf-eu-es", "universal-dependencies-treebank-norwegian", "copyrighttermbank", "ids", "gemeenschappelijke-thesaurus-audiovisuele-archieven", "universal-dependencies-treebank-bulgarian", "universal-dependencies-treebank-portuguese-br", "reuters-128-nif-ner-corpus", "universal-dependencies-treebank-finnish-ftb", "apertium-rdf-eu-en", "clld-wals", "wordnet", "universal-dependencies-treebank-sanskrit", "universal-dependencies-treebank-english", "xlid-lexica", "isocat", "universal-dependencies-treebank-greek", "universal-dependencies-treebank-dutch-lassysmall", "apertium-rdf", "universal-dependencies-treebank-gothic", "geological-survey-of-austria-thesaurus", "apertium-rdf-oc-es", "universal-dependencies-treebank-japanese", "universal-dependencies-treebank-dutch", "socialsemweb-thesaurus", "linked-hypernyms", "universal-dependencies-treebank-chinese", "news-100-nif-ner-corpus", "lingvoj", "pleiades", "iwn", "universal-dependencies-treebank-czech-cac", "universal-dependencies-treebank-english-lines", "clld-glottolog", "iate-rdf", "apertium-rdf-eo-fr", "universal-dependencies-treebank-german", "multext-east", "masc", "universal-dependencies-treebank-swedish-lines", "apertium-rdf-es-ast", "phoible", "apertium-rdf-fr-ca", "framester"],
"rights_text": "The Linguistic Linked Open Data Cloud from lod-cloud.net"
"rights_text": "The Linguistic Linked Open Data Cloud from lod-cloud.net",
"bubble_size_factor": 5.0

}

Expand Down
4 changes: 3 additions & 1 deletion src/settings.rs
Expand Up @@ -77,7 +77,9 @@ pub struct Settings {
/// The logo (link)
pub logo_link : Option<String>,
/// The logo width
pub logo_width : Option<usize>
pub logo_width : Option<usize>,
/// The factor of the bubble size
pub bubble_size_factor : Option<f64>
}

/// A single type of data to be included in the Legend
Expand Down
8 changes: 4 additions & 4 deletions src/svg.rs
Expand Up @@ -113,7 +113,7 @@ pub fn write_graph<P : AsRef<Path>>(graph : &Graph, loc : &Vec<f64>,
</a>
</g>",
i,
bubble_size(dataset),
bubble_size(dataset, settings.bubble_size_factor.unwrap_or(10.0)),
loc[i * 2] + abs_max,
loc[i * 2 + 1] + abs_max,
get_colour(&dataset.domain, &dataset.keywords, settings),
Expand All @@ -124,7 +124,7 @@ pub fn write_graph<P : AsRef<Path>>(graph : &Graph, loc : &Vec<f64>,
encode_minimal(&shorten_text(&title)))?;
},
None => {
eprintln!("Dataset not in set: {}",
eprintln!("Dataset not in set: {} (maybe `identifier` is incorrect?)",
&dataset_name);
}
}
Expand Down Expand Up @@ -206,9 +206,9 @@ fn shorten_text(text : &str) -> String {
}
}

fn bubble_size(dataset : &Dataset) -> String {
fn bubble_size(dataset : &Dataset, factor : f64) -> String {
let size = (dataset.triples.get() as f64) + 1.0;
format!("{:.1}", 15.0 + size.log(10.0))
format!("{:.1}", 15.0 + size.log(factor))
}


Expand Down

0 comments on commit 2442745

Please sign in to comment.