Adding x, y, radial forces#5

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

Merged
jeffbaumes merged 1 commit into from
Jul 12, 2019
Merged

Adding x, y, radial forces #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
175 changes: 126 additions & 49 deletions src/App.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
<v-navigation-drawer fixed app class="pa-4">
<v-btn block @click="$refs.file.click()">Upload CSV or JSON</v-btn>
<input ref="file" type="file" style="display:none" @change="upload">
<div>{{ nodeCount }} nodes, {{ edgeCount }} edges</div>
<v-checkbox
v-model="showEdges"
label="Show edges"
Expand All@@ -12,16 +13,22 @@
v-model="edgeOpacity"
:min="0.01" :max="1.00" :step="0.01"
thumb-label
label="Edge Opacity"
label="Edge opacity"
hide-details
></v-slider>
<v-slider
v-model="radius"
:min="0.1" :max="10" :step="0.1"
v-model="size"
:min="0.01" :max="1" :step="0.01"
thumb-label
label="Radius"
label="Size"
hide-details
></v-slider>
<v-combobox
v-model="sizeField"
:items="fields"
label="Size field"
hide-details
></v-combobox>
<v-btn block @click="toggleLayout">{{ layoutRunning ? 'Stop' : 'Start' }} layout</v-btn>
<v-slider
v-model="alpha"
Expand All@@ -31,54 +38,78 @@
label="Energy"
hide-details
></v-slider>
<v-checkbox
v-model="charge"
label="Charge force"
hide-details
></v-checkbox>
<v-slider
v-model="chargeStrength"
:min="-50" :max="50" :step="1"
:min="0" :max="50" :step="1"
thumb-label
label="Strength"
label="Charge strength"
hide-details
></v-slider>
<v-slider
v-model="theta"
:min="0.5" :max="3.0" :step="0.1"
thumb-label
label="Approximate"
label="Charge approximation"
hide-details
></v-slider>
<v-checkbox
v-model="collide"
label="Collide force"
hide-details
></v-checkbox>
<v-slider
v-model="collideStrength"
:min="0.00" :max="1.00" :step="0.01"
thumb-label
label="Strength"
label="Collide force"
hide-details
></v-slider>
<v-checkbox
v-model="link"
label="Link force"
hide-details
></v-checkbox>
<v-slider
v-model="linkStrength"
:min="0.00" :max="1.00" :step="0.01"
thumb-label
label="Strength"
label="Link force"
hide-details
></v-slider>
<v-checkbox
v-model="center"
label="Center force"
hide-details
></v-checkbox>
<v-slider
v-model="xStrength"
:min="0.00" :max="1.00" :step="0.01"
thumb-label
label="X force"
hide-details
></v-slider>
<v-combobox
v-model="xField"
:items="fields"
label="X field"
hide-details
></v-combobox>
<v-slider
v-model="yStrength"
:min="0.00" :max="1.00" :step="0.01"
thumb-label
label="Y force"
hide-details
></v-slider>
<v-combobox
v-model="yField"
:items="fields"
label="Y field"
hide-details
></v-combobox>
<v-slider
v-model="radialStrength"
:min="0.00" :max="1.00" :step="0.01"
thumb-label
label="Radial force"
hide-details
></v-slider>
<v-combobox
v-model="radialField"
:items="fields"
label="Radial field"
hide-details
></v-combobox>
<v-btn block @click="download()">Download JSON</v-btn>
<a ref="downloadAnchor" style="display:none"></a>
</v-navigation-drawer>
Expand All@@ -92,6 +123,7 @@
import geo from 'geojs/geo.js';

import LayoutWorker from 'worker-loader!./worker.js';
import * as scales from './scales.js';

const layoutWorker = new LayoutWorker();
let map;
Expand All@@ -104,20 +136,27 @@ let nodeMap;
export default {
data: function () {
return {
fields: [],
showEdges: false,
edgeOpacity: 0.5,
radius: 2,
size: 0.5,
sizeField: 'degree',
layoutRunning: false,
alpha: 1.0,
alphaFromWorker: false,
charge: true,
chargeStrength: -30,
chargeStrength: 30,
theta: 1.5,
collide: true,
collideStrength: 0.7,
link: true,
linkStrength: 1,
center: true,
xField: null,
xStrength: 0,
yField: null,
yStrength: 0,
radialField: null,
radialStrength: 0,
nodeCount: 0,
edgeCount: 0,
};
},
mounted() {
Expand DownExpand Up@@ -163,6 +202,19 @@ export default {
layoutWorker.onmessage = e => {
if (e.data.type === 'graph') {
graph = e.data.graph;
this.nodeCount = graph.nodes.length;
this.edgeCount = graph.edges.length;

const ignoreFields = ['x', 'y', 'vx', 'vy'];
this.fields = [];
graph.nodes.forEach(n => {
Object.keys(n).forEach(f => {
if (!ignoreFields.includes(f) && !this.fields.includes(f)) {
this.fields.push(f);
}
});
});
this.fields.sort();

map.deleteLayer(layer);
layer = map.createLayer('feature', {features: ['point', 'line']});
Expand All@@ -185,11 +237,12 @@ export default {
fillColor: 'grey',
fillOpacity: 0.5,
strokeOpacity: 0.5,
radius: nodeid => Math.max(1, Math.pow(2, map.zoom()) * Math.sqrt(graph.nodes[nodeid].degree) * this.radius)
},
position: nodeid => graph.nodes[nodeid]
}).data(Object.keys(graph.nodes));

this.updateSizeScale();

map.geoOn(geo.event.zoom, () => {
// Ensure selection quadtree updates with new point sizes
points.dataTime().modified();
Expand All@@ -198,14 +251,18 @@ export default {
map.draw();

points
.geoOn(geo.event.feature.mouseon, function (evt) {
const nodeid = evt.data, node = graph.nodes[nodeid];
let text = node.id;
if (text) {
tooltip.position(evt.mouse.geo);
tooltipElem.innerText = text;
}
tooltipElem.classList.toggle('hidden', !text);
.geoOn(geo.event.feature.mouseon, (evt) => {
const nodeid = evt.data;
const node = graph.nodes[nodeid];
tooltip.position(evt.mouse.geo);
let description = `<div><b>${node.id}</b></div>`;
this.fields.forEach(key => {
if (key !== 'id') {
description += `<div>${key}: ${node[key]}</div>`;
}
})
tooltipElem.innerHTML = description;
tooltipElem.classList.toggle('hidden', false);
})
.geoOn(geo.event.feature.mousemove, function (evt) {
tooltip.position(evt.mouse.geo);
Expand All@@ -226,16 +283,19 @@ export default {
}
}

// Add watchers which simply sync data to layout worker
// Add watchers which sync data to layout worker
[
'charge',
'chargeStrength',
'theta',
'collide',
'collideStrength',
'link',
'linkStrength',
'center',
'xField',
'xStrength',
'yField',
'yStrength',
'radialField',
'radialStrength',
].forEach(name => {
function sendToWorker(value) {
layoutWorker.postMessage({type: name, value});
Expand DownExpand Up@@ -271,11 +331,21 @@ export default {
},
immediate: true,
},
radius: {
size: {
handler(value) {
layoutWorker.postMessage({type: 'size', value});
if (points) {
this.updateSizeScale();
map.draw();
}
},
immediate: true,
},
sizeField: {
handler(value) {
layoutWorker.postMessage({type: 'radius', value});
layoutWorker.postMessage({type: 'sizeField', value});
if (points) {
points.modified();
this.updateSizeScale();
map.draw();
}
},
Expand DownExpand Up@@ -318,6 +388,14 @@ export default {
}
}
},
updateSizeScale() {
if (points) {
const sizeScale = scales.generateSizeScale(graph.nodes, this.sizeField, this.size);
points.style('radius', (nodeid) => {
return Math.pow(2, map.zoom()) * sizeScale(graph.nodes[nodeid]);
});
}
},
download() {
const nodesWithPositions = graph.nodes.map((n, i) => ({
...n,
Expand DownExpand Up@@ -346,14 +424,13 @@ export default {
overflow: hidden;
}
#tooltip {
margin-left: 0px;
margin-top: -20px;
height: 16px;
margin-left: 20px;
margin-top: 20px;
line-height: 16px;
padding: 2px 5px;
background: rgba(255, 255, 255, 0.75);
border-radius: 10px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
border: 1px solid rgba(0, 0, 0, 0.75);
font-size: 12px;
color: black;
Expand Down
23 changes: 23 additions & 0 deletions src/scales.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
let d3 = require('d3/dist/d3.js');

// generateScale()
// Create a linear scaling function for a numeric data field.
// Range will go from `min` to `max`, with invalid (non-numeric) values at `invalid`.
// If `area` is specified, range will be scaled such that every point on average fills `area` square units.
export function generateScale(arr, field, {area = null, min = -0.5, max = 0.5, invalid = 0.7}) {
const size = area ? Math.sqrt(arr.length * area) : 1;
const domain = d3.extent(arr, n => n[field]);
const scale = d3.scaleLinear().domain(domain).range([size * min, size * max]);
return n => {
const val = n[field];
if (!isNaN(parseFloat(val)) && isFinite(val)) {
return scale(val);
}
return size * invalid;
}
}

export function generateSizeScale(arr, field, size) {
const sizeScale = generateScale(arr, field, {min: 3, max: 500*500, invalid: 2});
return d => Math.sqrt(sizeScale(d)) * size;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Adding x, y, radial forces#5

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

 Merged

jeffbaumes
merged 1 commit into

from

Jul 12, 2019
 Merged


Adding x, y, radial forces
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


175 changes: 126 additions & 49 deletions
src/App.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
 <v-navigation-drawer fixed app class="pa-4">
 <v-btn block @click="$refs.file.click()">Upload CSV or JSON</v-btn>
 <input ref="file" type="file" style="display:none" @change="upload">
 <div>{{ nodeCount }} nodes, {{ edgeCount }} edges</div>
 <v-checkbox
 v-model="showEdges"
 label="Show edges"
Expand All@@ -12,16 +13,22 @@
 v-model="edgeOpacity"
 :min="0.01" :max="1.00" :step="0.01"
 thumb-label
 label="Edge Opacity"
 label="Edge opacity"
 hide-details
 ></v-slider>
 <v-slider
 v-model="radius"
 :min="0.1" :max="10" :step="0.1"
 v-model="size"
 :min="0.01" :max="1" :step="0.01"
 thumb-label
 label="Radius"
 label="Size"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="sizeField"
 :items="fields"
 label="Size field"
 hide-details
 ></v-combobox>
 <v-btn block @click="toggleLayout">{{ layoutRunning ? 'Stop' : 'Start' }} layout</v-btn>
 <v-slider
 v-model="alpha"
Expand All@@ -31,54 +38,78 @@
 label="Energy"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="charge"
 label="Charge force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="chargeStrength"
 :min="-50" :max="50" :step="1"
 :min="0" :max="50" :step="1"
 thumb-label
 label="Strength"
 label="Charge strength"
 hide-details
 ></v-slider>
 <v-slider
 v-model="theta"
 :min="0.5" :max="3.0" :step="0.1"
 thumb-label
 label="Approximate"
 label="Charge approximation"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="collide"
 label="Collide force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="collideStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Collide force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="link"
 label="Link force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="linkStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Link force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="center"
 label="Center force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="xStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="X force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="xField"
 :items="fields"
 label="X field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="yStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Y force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="yField"
 :items="fields"
 label="Y field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="radialStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Radial force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="radialField"
 :items="fields"
 label="Radial field"
 hide-details
 ></v-combobox>
 <v-btn block @click="download()">Download JSON</v-btn>
 <a ref="downloadAnchor" style="display:none"></a>
 </v-navigation-drawer>
Expand All@@ -92,6 +123,7 @@
import geo from 'geojs/geo.js';

import LayoutWorker from 'worker-loader!./worker.js';
import * as scales from './scales.js';

const layoutWorker = new LayoutWorker();
let map;
Expand All@@ -104,20 +136,27 @@ let nodeMap;
export default {
 data: function () {
 return {
 fields: [],
 showEdges: false,
 edgeOpacity: 0.5,
 radius: 2,
 size: 0.5,
 sizeField: 'degree',
 layoutRunning: false,
 alpha: 1.0,
 alphaFromWorker: false,
 charge: true,
 chargeStrength: -30,
 chargeStrength: 30,
 theta: 1.5,
 collide: true,
 collideStrength: 0.7,
 link: true,
 linkStrength: 1,
 center: true,
 xField: null,
 xStrength: 0,
 yField: null,
 yStrength: 0,
 radialField: null,
 radialStrength: 0,
 nodeCount: 0,
 edgeCount: 0,
 };
 },
 mounted() {
Expand DownExpand Up@@ -163,6 +202,19 @@ export default {
 layoutWorker.onmessage = e => {
 if (e.data.type === 'graph') {
 graph = e.data.graph;
 this.nodeCount = graph.nodes.length;
 this.edgeCount = graph.edges.length;

 const ignoreFields = ['x', 'y', 'vx', 'vy'];
 this.fields = [];
 graph.nodes.forEach(n => {
 Object.keys(n).forEach(f => {
 if (!ignoreFields.includes(f) && !this.fields.includes(f)) {
 this.fields.push(f);
 }
 });
 });
 this.fields.sort();

 map.deleteLayer(layer);
 layer = map.createLayer('feature', {features: ['point', 'line']});
Expand All@@ -185,11 +237,12 @@ export default {
 fillColor: 'grey',
 fillOpacity: 0.5,
 strokeOpacity: 0.5,
 radius: nodeid => Math.max(1, Math.pow(2, map.zoom()) * Math.sqrt(graph.nodes[nodeid].degree) * this.radius)
 },
 position: nodeid => graph.nodes[nodeid]
 }).data(Object.keys(graph.nodes));

 this.updateSizeScale();

 map.geoOn(geo.event.zoom, () => {
 // Ensure selection quadtree updates with new point sizes
 points.dataTime().modified();
Expand All@@ -198,14 +251,18 @@ export default {
 map.draw();

 points
 .geoOn(geo.event.feature.mouseon, function (evt) {
 const nodeid = evt.data, node = graph.nodes[nodeid];
 let text = node.id;
 if (text) {
 tooltip.position(evt.mouse.geo);
 tooltipElem.innerText = text;
 }
 tooltipElem.classList.toggle('hidden', !text);
 .geoOn(geo.event.feature.mouseon, (evt) => {
 const nodeid = evt.data;
 const node = graph.nodes[nodeid];
 tooltip.position(evt.mouse.geo);
 let description = `<div><b>${node.id}</b></div>`;
 this.fields.forEach(key => {
 if (key !== 'id') {
 description += `<div>${key}: ${node[key]}</div>`;
 }
 })
 tooltipElem.innerHTML = description;
 tooltipElem.classList.toggle('hidden', false);
 })
 .geoOn(geo.event.feature.mousemove, function (evt) {
 tooltip.position(evt.mouse.geo);
Expand All@@ -226,16 +283,19 @@ export default {
 }
 }

 // Add watchers which simply sync data to layout worker
 // Add watchers which sync data to layout worker
 [
 'charge',
 'chargeStrength',
 'theta',
 'collide',
 'collideStrength',
 'link',
 'linkStrength',
 'center',
 'xField',
 'xStrength',
 'yField',
 'yStrength',
 'radialField',
 'radialStrength',
 ].forEach(name => {
 function sendToWorker(value) {
 layoutWorker.postMessage({type: name, value});
Expand DownExpand Up@@ -271,11 +331,21 @@ export default {
 },
 immediate: true,
 },
 radius: {
 size: {
 handler(value) {
 layoutWorker.postMessage({type: 'size', value});
 if (points) {
 this.updateSizeScale();
 map.draw();
 }
 },
 immediate: true,
 },
 sizeField: {
 handler(value) {
 layoutWorker.postMessage({type: 'radius', value});
 layoutWorker.postMessage({type: 'sizeField', value});
 if (points) {
points.modified();
this.updateSizeScale();
 map.draw();
 }
 },
Expand DownExpand Up@@ -318,6 +388,14 @@ export default {
 }
 }
 },
 updateSizeScale() {
 if (points) {
 const sizeScale = scales.generateSizeScale(graph.nodes, this.sizeField, this.size);
 points.style('radius', (nodeid) => {
 return Math.pow(2, map.zoom()) * sizeScale(graph.nodes[nodeid]);
 });
 }
 },
 download() {
 const nodesWithPositions = graph.nodes.map((n, i) => ({
 ...n,
Expand DownExpand Up@@ -346,14 +424,13 @@ export default {
 overflow: hidden;
}
#tooltip {
 margin-left: 0px;
 margin-top: -20px;
 height: 16px;
 margin-left: 20px;
 margin-top: 20px;
 line-height: 16px;
 padding: 2px 5px;
 background: rgba(255, 255, 255, 0.75);
 border-radius: 10px;
 border-bottom-left-radius: 0;
 border-top-left-radius: 0;
 border: 1px solid rgba(0, 0, 0, 0.75);
 font-size: 12px;
 color: black;
Expand Down

23 changes: 23 additions & 0 deletions
src/scales.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
let d3 = require('d3/dist/d3.js');

// generateScale()
// Create a linear scaling function for a numeric data field.
// Range will go from `min` to `max`, with invalid (non-numeric) values at `invalid`.
// If `area` is specified, range will be scaled such that every point on average fills `area` square units.
export function generateScale(arr, field, {area = null, min = -0.5, max = 0.5, invalid = 0.7}) {
 const size = area ? Math.sqrt(arr.length * area) : 1;
 const domain = d3.extent(arr, n => n[field]);
 const scale = d3.scaleLinear().domain(domain).range([size * min, size * max]);
 return n => {
 const val = n[field];
 if (!isNaN(parseFloat(val)) && isFinite(val)) {
 return scale(val);
 }
 return size * invalid;
 }
}

export function generateSizeScale(arr, field, size) {
 const sizeScale = generateScale(arr, field, {min: 3, max: 500*500, invalid: 2});
 return d => Math.sqrt(sizeScale(d)) * size;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adding x, y, radial forces#5

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

 Merged

jeffbaumes
merged 1 commit into

from

Jul 12, 2019
 Merged


Adding x, y, radial forces
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


175 changes: 126 additions & 49 deletions
src/App.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
 <v-navigation-drawer fixed app class="pa-4">
 <v-btn block @click="$refs.file.click()">Upload CSV or JSON</v-btn>
 <input ref="file" type="file" style="display:none" @change="upload">
 <div>{{ nodeCount }} nodes, {{ edgeCount }} edges</div>
 <v-checkbox
 v-model="showEdges"
 label="Show edges"
Expand All@@ -12,16 +13,22 @@
 v-model="edgeOpacity"
 :min="0.01" :max="1.00" :step="0.01"
 thumb-label
 label="Edge Opacity"
 label="Edge opacity"
 hide-details
 ></v-slider>
 <v-slider
 v-model="radius"
 :min="0.1" :max="10" :step="0.1"
 v-model="size"
 :min="0.01" :max="1" :step="0.01"
 thumb-label
 label="Radius"
 label="Size"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="sizeField"
 :items="fields"
 label="Size field"
 hide-details
 ></v-combobox>
 <v-btn block @click="toggleLayout">{{ layoutRunning ? 'Stop' : 'Start' }} layout</v-btn>
 <v-slider
 v-model="alpha"
Expand All@@ -31,54 +38,78 @@
 label="Energy"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="charge"
 label="Charge force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="chargeStrength"
 :min="-50" :max="50" :step="1"
 :min="0" :max="50" :step="1"
 thumb-label
 label="Strength"
 label="Charge strength"
 hide-details
 ></v-slider>
 <v-slider
 v-model="theta"
 :min="0.5" :max="3.0" :step="0.1"
 thumb-label
 label="Approximate"
 label="Charge approximation"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="collide"
 label="Collide force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="collideStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Collide force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="link"
 label="Link force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="linkStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Link force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="center"
 label="Center force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="xStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="X force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="xField"
 :items="fields"
 label="X field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="yStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Y force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="yField"
 :items="fields"
 label="Y field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="radialStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Radial force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="radialField"
 :items="fields"
 label="Radial field"
 hide-details
 ></v-combobox>
 <v-btn block @click="download()">Download JSON</v-btn>
 <a ref="downloadAnchor" style="display:none"></a>
 </v-navigation-drawer>
Expand All@@ -92,6 +123,7 @@
import geo from 'geojs/geo.js';

import LayoutWorker from 'worker-loader!./worker.js';
import * as scales from './scales.js';

const layoutWorker = new LayoutWorker();
let map;
Expand All@@ -104,20 +136,27 @@ let nodeMap;
export default {
 data: function () {
 return {
 fields: [],
 showEdges: false,
 edgeOpacity: 0.5,
 radius: 2,
 size: 0.5,
 sizeField: 'degree',
 layoutRunning: false,
 alpha: 1.0,
 alphaFromWorker: false,
 charge: true,
 chargeStrength: -30,
 chargeStrength: 30,
 theta: 1.5,
 collide: true,
 collideStrength: 0.7,
 link: true,
 linkStrength: 1,
 center: true,
 xField: null,
 xStrength: 0,
 yField: null,
 yStrength: 0,
 radialField: null,
 radialStrength: 0,
 nodeCount: 0,
 edgeCount: 0,
 };
 },
 mounted() {
Expand DownExpand Up@@ -163,6 +202,19 @@ export default {
 layoutWorker.onmessage = e => {
 if (e.data.type === 'graph') {
 graph = e.data.graph;
 this.nodeCount = graph.nodes.length;
 this.edgeCount = graph.edges.length;

 const ignoreFields = ['x', 'y', 'vx', 'vy'];
 this.fields = [];
 graph.nodes.forEach(n => {
 Object.keys(n).forEach(f => {
 if (!ignoreFields.includes(f) && !this.fields.includes(f)) {
 this.fields.push(f);
 }
 });
 });
 this.fields.sort();

 map.deleteLayer(layer);
 layer = map.createLayer('feature', {features: ['point', 'line']});
Expand All@@ -185,11 +237,12 @@ export default {
 fillColor: 'grey',
 fillOpacity: 0.5,
 strokeOpacity: 0.5,
 radius: nodeid => Math.max(1, Math.pow(2, map.zoom()) * Math.sqrt(graph.nodes[nodeid].degree) * this.radius)
 },
 position: nodeid => graph.nodes[nodeid]
 }).data(Object.keys(graph.nodes));

 this.updateSizeScale();

 map.geoOn(geo.event.zoom, () => {
 // Ensure selection quadtree updates with new point sizes
 points.dataTime().modified();
Expand All@@ -198,14 +251,18 @@ export default {
 map.draw();

 points
 .geoOn(geo.event.feature.mouseon, function (evt) {
 const nodeid = evt.data, node = graph.nodes[nodeid];
 let text = node.id;
 if (text) {
 tooltip.position(evt.mouse.geo);
 tooltipElem.innerText = text;
 }
 tooltipElem.classList.toggle('hidden', !text);
 .geoOn(geo.event.feature.mouseon, (evt) => {
 const nodeid = evt.data;
 const node = graph.nodes[nodeid];
 tooltip.position(evt.mouse.geo);
 let description = `<div><b>${node.id}</b></div>`;
 this.fields.forEach(key => {
 if (key !== 'id') {
 description += `<div>${key}: ${node[key]}</div>`;
 }
 })
 tooltipElem.innerHTML = description;
 tooltipElem.classList.toggle('hidden', false);
 })
 .geoOn(geo.event.feature.mousemove, function (evt) {
 tooltip.position(evt.mouse.geo);
Expand All@@ -226,16 +283,19 @@ export default {
 }
 }

 // Add watchers which simply sync data to layout worker
 // Add watchers which sync data to layout worker
 [
 'charge',
 'chargeStrength',
 'theta',
 'collide',
 'collideStrength',
 'link',
 'linkStrength',
 'center',
 'xField',
 'xStrength',
 'yField',
 'yStrength',
 'radialField',
 'radialStrength',
 ].forEach(name => {
 function sendToWorker(value) {
 layoutWorker.postMessage({type: name, value});
Expand DownExpand Up@@ -271,11 +331,21 @@ export default {
 },
 immediate: true,
 },
 radius: {
 size: {
 handler(value) {
 layoutWorker.postMessage({type: 'size', value});
 if (points) {
 this.updateSizeScale();
 map.draw();
 }
 },
 immediate: true,
 },
 sizeField: {
 handler(value) {
 layoutWorker.postMessage({type: 'radius', value});
 layoutWorker.postMessage({type: 'sizeField', value});
 if (points) {
points.modified();
this.updateSizeScale();
 map.draw();
 }
 },
Expand DownExpand Up@@ -318,6 +388,14 @@ export default {
 }
 }
 },
 updateSizeScale() {
 if (points) {
 const sizeScale = scales.generateSizeScale(graph.nodes, this.sizeField, this.size);
 points.style('radius', (nodeid) => {
 return Math.pow(2, map.zoom()) * sizeScale(graph.nodes[nodeid]);
 });
 }
 },
 download() {
 const nodesWithPositions = graph.nodes.map((n, i) => ({
 ...n,
Expand DownExpand Up@@ -346,14 +424,13 @@ export default {
 overflow: hidden;
}
#tooltip {
 margin-left: 0px;
 margin-top: -20px;
 height: 16px;
 margin-left: 20px;
 margin-top: 20px;
 line-height: 16px;
 padding: 2px 5px;
 background: rgba(255, 255, 255, 0.75);
 border-radius: 10px;
 border-bottom-left-radius: 0;
 border-top-left-radius: 0;
 border: 1px solid rgba(0, 0, 0, 0.75);
 font-size: 12px;
 color: black;
Expand Down

23 changes: 23 additions & 0 deletions
src/scales.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
let d3 = require('d3/dist/d3.js');

// generateScale()
// Create a linear scaling function for a numeric data field.
// Range will go from `min` to `max`, with invalid (non-numeric) values at `invalid`.
// If `area` is specified, range will be scaled such that every point on average fills `area` square units.
export function generateScale(arr, field, {area = null, min = -0.5, max = 0.5, invalid = 0.7}) {
 const size = area ? Math.sqrt(arr.length * area) : 1;
 const domain = d3.extent(arr, n => n[field]);
 const scale = d3.scaleLinear().domain(domain).range([size * min, size * max]);
 return n => {
 const val = n[field];
 if (!isNaN(parseFloat(val)) && isFinite(val)) {
 return scale(val);
 }
 return size * invalid;
 }
}

export function generateSizeScale(arr, field, size) {
 const sizeScale = generateScale(arr, field, {min: 3, max: 500*500, invalid: 2});
 return d => Math.sqrt(sizeScale(d)) * size;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adding x, y, radial forces#5

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

 Merged

jeffbaumes
merged 1 commit into

from

Jul 12, 2019
 Merged


Adding x, y, radial forces
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


175 changes: 126 additions & 49 deletions
src/App.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
 <v-navigation-drawer fixed app class="pa-4">
 <v-btn block @click="$refs.file.click()">Upload CSV or JSON</v-btn>
 <input ref="file" type="file" style="display:none" @change="upload">
 <div>{{ nodeCount }} nodes, {{ edgeCount }} edges</div>
 <v-checkbox
 v-model="showEdges"
 label="Show edges"
Expand All@@ -12,16 +13,22 @@
 v-model="edgeOpacity"
 :min="0.01" :max="1.00" :step="0.01"
 thumb-label
 label="Edge Opacity"
 label="Edge opacity"
 hide-details
 ></v-slider>
 <v-slider
 v-model="radius"
 :min="0.1" :max="10" :step="0.1"
 v-model="size"
 :min="0.01" :max="1" :step="0.01"
 thumb-label
 label="Radius"
 label="Size"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="sizeField"
 :items="fields"
 label="Size field"
 hide-details
 ></v-combobox>
 <v-btn block @click="toggleLayout">{{ layoutRunning ? 'Stop' : 'Start' }} layout</v-btn>
 <v-slider
 v-model="alpha"
Expand All@@ -31,54 +38,78 @@
 label="Energy"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="charge"
 label="Charge force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="chargeStrength"
 :min="-50" :max="50" :step="1"
 :min="0" :max="50" :step="1"
 thumb-label
 label="Strength"
 label="Charge strength"
 hide-details
 ></v-slider>
 <v-slider
 v-model="theta"
 :min="0.5" :max="3.0" :step="0.1"
 thumb-label
 label="Approximate"
 label="Charge approximation"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="collide"
 label="Collide force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="collideStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Collide force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="link"
 label="Link force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="linkStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Link force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="center"
 label="Center force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="xStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="X force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="xField"
 :items="fields"
 label="X field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="yStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Y force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="yField"
 :items="fields"
 label="Y field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="radialStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Radial force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="radialField"
 :items="fields"
 label="Radial field"
 hide-details
 ></v-combobox>
 <v-btn block @click="download()">Download JSON</v-btn>
 <a ref="downloadAnchor" style="display:none"></a>
 </v-navigation-drawer>
Expand All@@ -92,6 +123,7 @@
import geo from 'geojs/geo.js';

import LayoutWorker from 'worker-loader!./worker.js';
import * as scales from './scales.js';

const layoutWorker = new LayoutWorker();
let map;
Expand All@@ -104,20 +136,27 @@ let nodeMap;
export default {
 data: function () {
 return {
 fields: [],
 showEdges: false,
 edgeOpacity: 0.5,
 radius: 2,
 size: 0.5,
 sizeField: 'degree',
 layoutRunning: false,
 alpha: 1.0,
 alphaFromWorker: false,
 charge: true,
 chargeStrength: -30,
 chargeStrength: 30,
 theta: 1.5,
 collide: true,
 collideStrength: 0.7,
 link: true,
 linkStrength: 1,
 center: true,
 xField: null,
 xStrength: 0,
 yField: null,
 yStrength: 0,
 radialField: null,
 radialStrength: 0,
 nodeCount: 0,
 edgeCount: 0,
 };
 },
 mounted() {
Expand DownExpand Up@@ -163,6 +202,19 @@ export default {
 layoutWorker.onmessage = e => {
 if (e.data.type === 'graph') {
 graph = e.data.graph;
 this.nodeCount = graph.nodes.length;
 this.edgeCount = graph.edges.length;

 const ignoreFields = ['x', 'y', 'vx', 'vy'];
 this.fields = [];
 graph.nodes.forEach(n => {
 Object.keys(n).forEach(f => {
 if (!ignoreFields.includes(f) && !this.fields.includes(f)) {
 this.fields.push(f);
 }
 });
 });
 this.fields.sort();

 map.deleteLayer(layer);
 layer = map.createLayer('feature', {features: ['point', 'line']});
Expand All@@ -185,11 +237,12 @@ export default {
 fillColor: 'grey',
 fillOpacity: 0.5,
 strokeOpacity: 0.5,
 radius: nodeid => Math.max(1, Math.pow(2, map.zoom()) * Math.sqrt(graph.nodes[nodeid].degree) * this.radius)
 },
 position: nodeid => graph.nodes[nodeid]
 }).data(Object.keys(graph.nodes));

 this.updateSizeScale();

 map.geoOn(geo.event.zoom, () => {
 // Ensure selection quadtree updates with new point sizes
 points.dataTime().modified();
Expand All@@ -198,14 +251,18 @@ export default {
 map.draw();

 points
 .geoOn(geo.event.feature.mouseon, function (evt) {
 const nodeid = evt.data, node = graph.nodes[nodeid];
 let text = node.id;
 if (text) {
 tooltip.position(evt.mouse.geo);
 tooltipElem.innerText = text;
 }
 tooltipElem.classList.toggle('hidden', !text);
 .geoOn(geo.event.feature.mouseon, (evt) => {
 const nodeid = evt.data;
 const node = graph.nodes[nodeid];
 tooltip.position(evt.mouse.geo);
 let description = `<div><b>${node.id}</b></div>`;
 this.fields.forEach(key => {
 if (key !== 'id') {
 description += `<div>${key}: ${node[key]}</div>`;
 }
 })
 tooltipElem.innerHTML = description;
 tooltipElem.classList.toggle('hidden', false);
 })
 .geoOn(geo.event.feature.mousemove, function (evt) {
 tooltip.position(evt.mouse.geo);
Expand All@@ -226,16 +283,19 @@ export default {
 }
 }

 // Add watchers which simply sync data to layout worker
 // Add watchers which sync data to layout worker
 [
 'charge',
 'chargeStrength',
 'theta',
 'collide',
 'collideStrength',
 'link',
 'linkStrength',
 'center',
 'xField',
 'xStrength',
 'yField',
 'yStrength',
 'radialField',
 'radialStrength',
 ].forEach(name => {
 function sendToWorker(value) {
 layoutWorker.postMessage({type: name, value});
Expand DownExpand Up@@ -271,11 +331,21 @@ export default {
 },
 immediate: true,
 },
 radius: {
 size: {
 handler(value) {
 layoutWorker.postMessage({type: 'size', value});
 if (points) {
 this.updateSizeScale();
 map.draw();
 }
 },
 immediate: true,
 },
 sizeField: {
 handler(value) {
 layoutWorker.postMessage({type: 'radius', value});
 layoutWorker.postMessage({type: 'sizeField', value});
 if (points) {
points.modified();
this.updateSizeScale();
 map.draw();
 }
 },
Expand DownExpand Up@@ -318,6 +388,14 @@ export default {
 }
 }
 },
 updateSizeScale() {
 if (points) {
 const sizeScale = scales.generateSizeScale(graph.nodes, this.sizeField, this.size);
 points.style('radius', (nodeid) => {
 return Math.pow(2, map.zoom()) * sizeScale(graph.nodes[nodeid]);
 });
 }
 },
 download() {
 const nodesWithPositions = graph.nodes.map((n, i) => ({
 ...n,
Expand DownExpand Up@@ -346,14 +424,13 @@ export default {
 overflow: hidden;
}
#tooltip {
 margin-left: 0px;
 margin-top: -20px;
 height: 16px;
 margin-left: 20px;
 margin-top: 20px;
 line-height: 16px;
 padding: 2px 5px;
 background: rgba(255, 255, 255, 0.75);
 border-radius: 10px;
 border-bottom-left-radius: 0;
 border-top-left-radius: 0;
 border: 1px solid rgba(0, 0, 0, 0.75);
 font-size: 12px;
 color: black;
Expand Down

23 changes: 23 additions & 0 deletions
src/scales.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
let d3 = require('d3/dist/d3.js');

// generateScale()
// Create a linear scaling function for a numeric data field.
// Range will go from `min` to `max`, with invalid (non-numeric) values at `invalid`.
// If `area` is specified, range will be scaled such that every point on average fills `area` square units.
export function generateScale(arr, field, {area = null, min = -0.5, max = 0.5, invalid = 0.7}) {
 const size = area ? Math.sqrt(arr.length * area) : 1;
 const domain = d3.extent(arr, n => n[field]);
 const scale = d3.scaleLinear().domain(domain).range([size * min, size * max]);
 return n => {
 const val = n[field];
 if (!isNaN(parseFloat(val)) && isFinite(val)) {
 return scale(val);
 }
 return size * invalid;
 }
}

export function generateSizeScale(arr, field, size) {
 const sizeScale = generateScale(arr, field, {min: 3, max: 500*500, invalid: 2});
 return d => Math.sqrt(sizeScale(d)) * size;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Adding x, y, radial forces#5

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

 Merged

jeffbaumes
merged 1 commit into

from

Jul 12, 2019
 Merged


Adding x, y, radial forces
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


175 changes: 126 additions & 49 deletions
src/App.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
 <v-navigation-drawer fixed app class="pa-4">
 <v-btn block @click="$refs.file.click()">Upload CSV or JSON</v-btn>
 <input ref="file" type="file" style="display:none" @change="upload">
 <div>{{ nodeCount }} nodes, {{ edgeCount }} edges</div>
 <v-checkbox
 v-model="showEdges"
 label="Show edges"
Expand All@@ -12,16 +13,22 @@
 v-model="edgeOpacity"
 :min="0.01" :max="1.00" :step="0.01"
 thumb-label
 label="Edge Opacity"
 label="Edge opacity"
 hide-details
 ></v-slider>
 <v-slider
 v-model="radius"
 :min="0.1" :max="10" :step="0.1"
 v-model="size"
 :min="0.01" :max="1" :step="0.01"
 thumb-label
 label="Radius"
 label="Size"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="sizeField"
 :items="fields"
 label="Size field"
 hide-details
 ></v-combobox>
 <v-btn block @click="toggleLayout">{{ layoutRunning ? 'Stop' : 'Start' }} layout</v-btn>
 <v-slider
 v-model="alpha"
Expand All@@ -31,54 +38,78 @@
 label="Energy"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="charge"
 label="Charge force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="chargeStrength"
 :min="-50" :max="50" :step="1"
 :min="0" :max="50" :step="1"
 thumb-label
 label="Strength"
 label="Charge strength"
 hide-details
 ></v-slider>
 <v-slider
 v-model="theta"
 :min="0.5" :max="3.0" :step="0.1"
 thumb-label
 label="Approximate"
 label="Charge approximation"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="collide"
 label="Collide force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="collideStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Collide force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="link"
 label="Link force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="linkStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Link force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="center"
 label="Center force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="xStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="X force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="xField"
 :items="fields"
 label="X field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="yStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Y force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="yField"
 :items="fields"
 label="Y field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="radialStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Radial force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="radialField"
 :items="fields"
 label="Radial field"
 hide-details
 ></v-combobox>
 <v-btn block @click="download()">Download JSON</v-btn>
 <a ref="downloadAnchor" style="display:none"></a>
 </v-navigation-drawer>
Expand All@@ -92,6 +123,7 @@
import geo from 'geojs/geo.js';

import LayoutWorker from 'worker-loader!./worker.js';
import * as scales from './scales.js';

const layoutWorker = new LayoutWorker();
let map;
Expand All@@ -104,20 +136,27 @@ let nodeMap;
export default {
 data: function () {
 return {
 fields: [],
 showEdges: false,
 edgeOpacity: 0.5,
 radius: 2,
 size: 0.5,
 sizeField: 'degree',
 layoutRunning: false,
 alpha: 1.0,
 alphaFromWorker: false,
 charge: true,
 chargeStrength: -30,
 chargeStrength: 30,
 theta: 1.5,
 collide: true,
 collideStrength: 0.7,
 link: true,
 linkStrength: 1,
 center: true,
 xField: null,
 xStrength: 0,
 yField: null,
 yStrength: 0,
 radialField: null,
 radialStrength: 0,
 nodeCount: 0,
 edgeCount: 0,
 };
 },
 mounted() {
Expand DownExpand Up@@ -163,6 +202,19 @@ export default {
 layoutWorker.onmessage = e => {
 if (e.data.type === 'graph') {
 graph = e.data.graph;
 this.nodeCount = graph.nodes.length;
 this.edgeCount = graph.edges.length;

 const ignoreFields = ['x', 'y', 'vx', 'vy'];
 this.fields = [];
 graph.nodes.forEach(n => {
 Object.keys(n).forEach(f => {
 if (!ignoreFields.includes(f) && !this.fields.includes(f)) {
 this.fields.push(f);
 }
 });
 });
 this.fields.sort();

 map.deleteLayer(layer);
 layer = map.createLayer('feature', {features: ['point', 'line']});
Expand All@@ -185,11 +237,12 @@ export default {
 fillColor: 'grey',
 fillOpacity: 0.5,
 strokeOpacity: 0.5,
 radius: nodeid => Math.max(1, Math.pow(2, map.zoom()) * Math.sqrt(graph.nodes[nodeid].degree) * this.radius)
 },
 position: nodeid => graph.nodes[nodeid]
 }).data(Object.keys(graph.nodes));

 this.updateSizeScale();

 map.geoOn(geo.event.zoom, () => {
 // Ensure selection quadtree updates with new point sizes
 points.dataTime().modified();
Expand All@@ -198,14 +251,18 @@ export default {
 map.draw();

 points
 .geoOn(geo.event.feature.mouseon, function (evt) {
 const nodeid = evt.data, node = graph.nodes[nodeid];
 let text = node.id;
 if (text) {
 tooltip.position(evt.mouse.geo);
 tooltipElem.innerText = text;
 }
 tooltipElem.classList.toggle('hidden', !text);
 .geoOn(geo.event.feature.mouseon, (evt) => {
 const nodeid = evt.data;
 const node = graph.nodes[nodeid];
 tooltip.position(evt.mouse.geo);
 let description = `<div><b>${node.id}</b></div>`;
 this.fields.forEach(key => {
 if (key !== 'id') {
 description += `<div>${key}: ${node[key]}</div>`;
 }
 })
 tooltipElem.innerHTML = description;
 tooltipElem.classList.toggle('hidden', false);
 })
 .geoOn(geo.event.feature.mousemove, function (evt) {
 tooltip.position(evt.mouse.geo);
Expand All@@ -226,16 +283,19 @@ export default {
 }
 }

 // Add watchers which simply sync data to layout worker
 // Add watchers which sync data to layout worker
 [
 'charge',
 'chargeStrength',
 'theta',
 'collide',
 'collideStrength',
 'link',
 'linkStrength',
 'center',
 'xField',
 'xStrength',
 'yField',
 'yStrength',
 'radialField',
 'radialStrength',
 ].forEach(name => {
 function sendToWorker(value) {
 layoutWorker.postMessage({type: name, value});
Expand DownExpand Up@@ -271,11 +331,21 @@ export default {
 },
 immediate: true,
 },
 radius: {
 size: {
 handler(value) {
 layoutWorker.postMessage({type: 'size', value});
 if (points) {
 this.updateSizeScale();
 map.draw();
 }
 },
 immediate: true,
 },
 sizeField: {
 handler(value) {
 layoutWorker.postMessage({type: 'radius', value});
 layoutWorker.postMessage({type: 'sizeField', value});
 if (points) {
points.modified();
this.updateSizeScale();
 map.draw();
 }
 },
Expand DownExpand Up@@ -318,6 +388,14 @@ export default {
 }
 }
 },
 updateSizeScale() {
 if (points) {
 const sizeScale = scales.generateSizeScale(graph.nodes, this.sizeField, this.size);
 points.style('radius', (nodeid) => {
 return Math.pow(2, map.zoom()) * sizeScale(graph.nodes[nodeid]);
 });
 }
 },
 download() {
 const nodesWithPositions = graph.nodes.map((n, i) => ({
 ...n,
Expand DownExpand Up@@ -346,14 +424,13 @@ export default {
 overflow: hidden;
}
#tooltip {
 margin-left: 0px;
 margin-top: -20px;
 height: 16px;
 margin-left: 20px;
 margin-top: 20px;
 line-height: 16px;
 padding: 2px 5px;
 background: rgba(255, 255, 255, 0.75);
 border-radius: 10px;
 border-bottom-left-radius: 0;
 border-top-left-radius: 0;
 border: 1px solid rgba(0, 0, 0, 0.75);
 font-size: 12px;
 color: black;
Expand Down

23 changes: 23 additions & 0 deletions
src/scales.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
let d3 = require('d3/dist/d3.js');

// generateScale()
// Create a linear scaling function for a numeric data field.
// Range will go from `min` to `max`, with invalid (non-numeric) values at `invalid`.
// If `area` is specified, range will be scaled such that every point on average fills `area` square units.
export function generateScale(arr, field, {area = null, min = -0.5, max = 0.5, invalid = 0.7}) {
 const size = area ? Math.sqrt(arr.length * area) : 1;
 const domain = d3.extent(arr, n => n[field]);
 const scale = d3.scaleLinear().domain(domain).range([size * min, size * max]);
 return n => {
 const val = n[field];
 if (!isNaN(parseFloat(val)) && isFinite(val)) {
 return scale(val);
 }
 return size * invalid;
 }
}

export function generateSizeScale(arr, field, size) {
 const sizeScale = generateScale(arr, field, {min: 3, max: 500*500, invalid: 2});
 return d => Math.sqrt(sizeScale(d)) * size;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adding x, y, radial forces#5

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

 Merged

jeffbaumes
merged 1 commit into

from

Jul 12, 2019
 Merged


Adding x, y, radial forces
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


175 changes: 126 additions & 49 deletions
src/App.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
 <v-navigation-drawer fixed app class="pa-4">
 <v-btn block @click="$refs.file.click()">Upload CSV or JSON</v-btn>
 <input ref="file" type="file" style="display:none" @change="upload">
 <div>{{ nodeCount }} nodes, {{ edgeCount }} edges</div>
 <v-checkbox
 v-model="showEdges"
 label="Show edges"
Expand All@@ -12,16 +13,22 @@
 v-model="edgeOpacity"
 :min="0.01" :max="1.00" :step="0.01"
 thumb-label
 label="Edge Opacity"
 label="Edge opacity"
 hide-details
 ></v-slider>
 <v-slider
 v-model="radius"
 :min="0.1" :max="10" :step="0.1"
 v-model="size"
 :min="0.01" :max="1" :step="0.01"
 thumb-label
 label="Radius"
 label="Size"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="sizeField"
 :items="fields"
 label="Size field"
 hide-details
 ></v-combobox>
 <v-btn block @click="toggleLayout">{{ layoutRunning ? 'Stop' : 'Start' }} layout</v-btn>
 <v-slider
 v-model="alpha"
Expand All@@ -31,54 +38,78 @@
 label="Energy"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="charge"
 label="Charge force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="chargeStrength"
 :min="-50" :max="50" :step="1"
 :min="0" :max="50" :step="1"
 thumb-label
 label="Strength"
 label="Charge strength"
 hide-details
 ></v-slider>
 <v-slider
 v-model="theta"
 :min="0.5" :max="3.0" :step="0.1"
 thumb-label
 label="Approximate"
 label="Charge approximation"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="collide"
 label="Collide force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="collideStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Collide force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="link"
 label="Link force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="linkStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Link force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="center"
 label="Center force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="xStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="X force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="xField"
 :items="fields"
 label="X field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="yStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Y force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="yField"
 :items="fields"
 label="Y field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="radialStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Radial force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="radialField"
 :items="fields"
 label="Radial field"
 hide-details
 ></v-combobox>
 <v-btn block @click="download()">Download JSON</v-btn>
 <a ref="downloadAnchor" style="display:none"></a>
 </v-navigation-drawer>
Expand All@@ -92,6 +123,7 @@
import geo from 'geojs/geo.js';

import LayoutWorker from 'worker-loader!./worker.js';
import * as scales from './scales.js';

const layoutWorker = new LayoutWorker();
let map;
Expand All@@ -104,20 +136,27 @@ let nodeMap;
export default {
 data: function () {
 return {
 fields: [],
 showEdges: false,
 edgeOpacity: 0.5,
 radius: 2,
 size: 0.5,
 sizeField: 'degree',
 layoutRunning: false,
 alpha: 1.0,
 alphaFromWorker: false,
 charge: true,
 chargeStrength: -30,
 chargeStrength: 30,
 theta: 1.5,
 collide: true,
 collideStrength: 0.7,
 link: true,
 linkStrength: 1,
 center: true,
 xField: null,
 xStrength: 0,
 yField: null,
 yStrength: 0,
 radialField: null,
 radialStrength: 0,
 nodeCount: 0,
 edgeCount: 0,
 };
 },
 mounted() {
Expand DownExpand Up@@ -163,6 +202,19 @@ export default {
 layoutWorker.onmessage = e => {
 if (e.data.type === 'graph') {
 graph = e.data.graph;
 this.nodeCount = graph.nodes.length;
 this.edgeCount = graph.edges.length;

 const ignoreFields = ['x', 'y', 'vx', 'vy'];
 this.fields = [];
 graph.nodes.forEach(n => {
 Object.keys(n).forEach(f => {
 if (!ignoreFields.includes(f) && !this.fields.includes(f)) {
 this.fields.push(f);
 }
 });
 });
 this.fields.sort();

 map.deleteLayer(layer);
 layer = map.createLayer('feature', {features: ['point', 'line']});
Expand All@@ -185,11 +237,12 @@ export default {
 fillColor: 'grey',
 fillOpacity: 0.5,
 strokeOpacity: 0.5,
 radius: nodeid => Math.max(1, Math.pow(2, map.zoom()) * Math.sqrt(graph.nodes[nodeid].degree) * this.radius)
 },
 position: nodeid => graph.nodes[nodeid]
 }).data(Object.keys(graph.nodes));

 this.updateSizeScale();

 map.geoOn(geo.event.zoom, () => {
 // Ensure selection quadtree updates with new point sizes
 points.dataTime().modified();
Expand All@@ -198,14 +251,18 @@ export default {
 map.draw();

 points
 .geoOn(geo.event.feature.mouseon, function (evt) {
 const nodeid = evt.data, node = graph.nodes[nodeid];
 let text = node.id;
 if (text) {
 tooltip.position(evt.mouse.geo);
 tooltipElem.innerText = text;
 }
 tooltipElem.classList.toggle('hidden', !text);
 .geoOn(geo.event.feature.mouseon, (evt) => {
 const nodeid = evt.data;
 const node = graph.nodes[nodeid];
 tooltip.position(evt.mouse.geo);
 let description = `<div><b>${node.id}</b></div>`;
 this.fields.forEach(key => {
 if (key !== 'id') {
 description += `<div>${key}: ${node[key]}</div>`;
 }
 })
 tooltipElem.innerHTML = description;
 tooltipElem.classList.toggle('hidden', false);
 })
 .geoOn(geo.event.feature.mousemove, function (evt) {
 tooltip.position(evt.mouse.geo);
Expand All@@ -226,16 +283,19 @@ export default {
 }
 }

 // Add watchers which simply sync data to layout worker
 // Add watchers which sync data to layout worker
 [
 'charge',
 'chargeStrength',
 'theta',
 'collide',
 'collideStrength',
 'link',
 'linkStrength',
 'center',
 'xField',
 'xStrength',
 'yField',
 'yStrength',
 'radialField',
 'radialStrength',
 ].forEach(name => {
 function sendToWorker(value) {
 layoutWorker.postMessage({type: name, value});
Expand DownExpand Up@@ -271,11 +331,21 @@ export default {
 },
 immediate: true,
 },
 radius: {
 size: {
 handler(value) {
 layoutWorker.postMessage({type: 'size', value});
 if (points) {
 this.updateSizeScale();
 map.draw();
 }
 },
 immediate: true,
 },
 sizeField: {
 handler(value) {
 layoutWorker.postMessage({type: 'radius', value});
 layoutWorker.postMessage({type: 'sizeField', value});
 if (points) {
points.modified();
this.updateSizeScale();
 map.draw();
 }
 },
Expand DownExpand Up@@ -318,6 +388,14 @@ export default {
 }
 }
 },
 updateSizeScale() {
 if (points) {
 const sizeScale = scales.generateSizeScale(graph.nodes, this.sizeField, this.size);
 points.style('radius', (nodeid) => {
 return Math.pow(2, map.zoom()) * sizeScale(graph.nodes[nodeid]);
 });
 }
 },
 download() {
 const nodesWithPositions = graph.nodes.map((n, i) => ({
 ...n,
Expand DownExpand Up@@ -346,14 +424,13 @@ export default {
 overflow: hidden;
}
#tooltip {
 margin-left: 0px;
 margin-top: -20px;
 height: 16px;
 margin-left: 20px;
 margin-top: 20px;
 line-height: 16px;
 padding: 2px 5px;
 background: rgba(255, 255, 255, 0.75);
 border-radius: 10px;
 border-bottom-left-radius: 0;
 border-top-left-radius: 0;
 border: 1px solid rgba(0, 0, 0, 0.75);
 font-size: 12px;
 color: black;
Expand Down

23 changes: 23 additions & 0 deletions
src/scales.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
let d3 = require('d3/dist/d3.js');

// generateScale()
// Create a linear scaling function for a numeric data field.
// Range will go from `min` to `max`, with invalid (non-numeric) values at `invalid`.
// If `area` is specified, range will be scaled such that every point on average fills `area` square units.
export function generateScale(arr, field, {area = null, min = -0.5, max = 0.5, invalid = 0.7}) {
 const size = area ? Math.sqrt(arr.length * area) : 1;
 const domain = d3.extent(arr, n => n[field]);
 const scale = d3.scaleLinear().domain(domain).range([size * min, size * max]);
 return n => {
 const val = n[field];
 if (!isNaN(parseFloat(val)) && isFinite(val)) {
 return scale(val);
 }
 return size * invalid;
 }
}

export function generateSizeScale(arr, field, size) {
 const sizeScale = generateScale(arr, field, {min: 3, max: 500*500, invalid: 2});
 return d => Math.sqrt(sizeScale(d)) * size;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adding x, y, radial forces#5

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

 Merged

jeffbaumes
merged 1 commit into

from

Jul 12, 2019
 Merged


Adding x, y, radial forces
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


175 changes: 126 additions & 49 deletions
src/App.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
 <v-navigation-drawer fixed app class="pa-4">
 <v-btn block @click="$refs.file.click()">Upload CSV or JSON</v-btn>
 <input ref="file" type="file" style="display:none" @change="upload">
 <div>{{ nodeCount }} nodes, {{ edgeCount }} edges</div>
 <v-checkbox
 v-model="showEdges"
 label="Show edges"
Expand All@@ -12,16 +13,22 @@
 v-model="edgeOpacity"
 :min="0.01" :max="1.00" :step="0.01"
 thumb-label
 label="Edge Opacity"
 label="Edge opacity"
 hide-details
 ></v-slider>
 <v-slider
 v-model="radius"
 :min="0.1" :max="10" :step="0.1"
 v-model="size"
 :min="0.01" :max="1" :step="0.01"
 thumb-label
 label="Radius"
 label="Size"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="sizeField"
 :items="fields"
 label="Size field"
 hide-details
 ></v-combobox>
 <v-btn block @click="toggleLayout">{{ layoutRunning ? 'Stop' : 'Start' }} layout</v-btn>
 <v-slider
 v-model="alpha"
Expand All@@ -31,54 +38,78 @@
 label="Energy"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="charge"
 label="Charge force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="chargeStrength"
 :min="-50" :max="50" :step="1"
 :min="0" :max="50" :step="1"
 thumb-label
 label="Strength"
 label="Charge strength"
 hide-details
 ></v-slider>
 <v-slider
 v-model="theta"
 :min="0.5" :max="3.0" :step="0.1"
 thumb-label
 label="Approximate"
 label="Charge approximation"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="collide"
 label="Collide force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="collideStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Collide force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="link"
 label="Link force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="linkStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Link force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="center"
 label="Center force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="xStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="X force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="xField"
 :items="fields"
 label="X field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="yStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Y force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="yField"
 :items="fields"
 label="Y field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="radialStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Radial force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="radialField"
 :items="fields"
 label="Radial field"
 hide-details
 ></v-combobox>
 <v-btn block @click="download()">Download JSON</v-btn>
 <a ref="downloadAnchor" style="display:none"></a>
 </v-navigation-drawer>
Expand All@@ -92,6 +123,7 @@
import geo from 'geojs/geo.js';

import LayoutWorker from 'worker-loader!./worker.js';
import * as scales from './scales.js';

const layoutWorker = new LayoutWorker();
let map;
Expand All@@ -104,20 +136,27 @@ let nodeMap;
export default {
 data: function () {
 return {
 fields: [],
 showEdges: false,
 edgeOpacity: 0.5,
 radius: 2,
 size: 0.5,
 sizeField: 'degree',
 layoutRunning: false,
 alpha: 1.0,
 alphaFromWorker: false,
 charge: true,
 chargeStrength: -30,
 chargeStrength: 30,
 theta: 1.5,
 collide: true,
 collideStrength: 0.7,
 link: true,
 linkStrength: 1,
 center: true,
 xField: null,
 xStrength: 0,
 yField: null,
 yStrength: 0,
 radialField: null,
 radialStrength: 0,
 nodeCount: 0,
 edgeCount: 0,
 };
 },
 mounted() {
Expand DownExpand Up@@ -163,6 +202,19 @@ export default {
 layoutWorker.onmessage = e => {
 if (e.data.type === 'graph') {
 graph = e.data.graph;
 this.nodeCount = graph.nodes.length;
 this.edgeCount = graph.edges.length;

 const ignoreFields = ['x', 'y', 'vx', 'vy'];
 this.fields = [];
 graph.nodes.forEach(n => {
 Object.keys(n).forEach(f => {
 if (!ignoreFields.includes(f) && !this.fields.includes(f)) {
 this.fields.push(f);
 }
 });
 });
 this.fields.sort();

 map.deleteLayer(layer);
 layer = map.createLayer('feature', {features: ['point', 'line']});
Expand All@@ -185,11 +237,12 @@ export default {
 fillColor: 'grey',
 fillOpacity: 0.5,
 strokeOpacity: 0.5,
 radius: nodeid => Math.max(1, Math.pow(2, map.zoom()) * Math.sqrt(graph.nodes[nodeid].degree) * this.radius)
 },
 position: nodeid => graph.nodes[nodeid]
 }).data(Object.keys(graph.nodes));

 this.updateSizeScale();

 map.geoOn(geo.event.zoom, () => {
 // Ensure selection quadtree updates with new point sizes
 points.dataTime().modified();
Expand All@@ -198,14 +251,18 @@ export default {
 map.draw();

 points
 .geoOn(geo.event.feature.mouseon, function (evt) {
 const nodeid = evt.data, node = graph.nodes[nodeid];
 let text = node.id;
 if (text) {
 tooltip.position(evt.mouse.geo);
 tooltipElem.innerText = text;
 }
 tooltipElem.classList.toggle('hidden', !text);
 .geoOn(geo.event.feature.mouseon, (evt) => {
 const nodeid = evt.data;
 const node = graph.nodes[nodeid];
 tooltip.position(evt.mouse.geo);
 let description = `<div><b>${node.id}</b></div>`;
 this.fields.forEach(key => {
 if (key !== 'id') {
 description += `<div>${key}: ${node[key]}</div>`;
 }
 })
 tooltipElem.innerHTML = description;
 tooltipElem.classList.toggle('hidden', false);
 })
 .geoOn(geo.event.feature.mousemove, function (evt) {
 tooltip.position(evt.mouse.geo);
Expand All@@ -226,16 +283,19 @@ export default {
 }
 }

 // Add watchers which simply sync data to layout worker
 // Add watchers which sync data to layout worker
 [
 'charge',
 'chargeStrength',
 'theta',
 'collide',
 'collideStrength',
 'link',
 'linkStrength',
 'center',
 'xField',
 'xStrength',
 'yField',
 'yStrength',
 'radialField',
 'radialStrength',
 ].forEach(name => {
 function sendToWorker(value) {
 layoutWorker.postMessage({type: name, value});
Expand DownExpand Up@@ -271,11 +331,21 @@ export default {
 },
 immediate: true,
 },
 radius: {
 size: {
 handler(value) {
 layoutWorker.postMessage({type: 'size', value});
 if (points) {
 this.updateSizeScale();
 map.draw();
 }
 },
 immediate: true,
 },
 sizeField: {
 handler(value) {
 layoutWorker.postMessage({type: 'radius', value});
 layoutWorker.postMessage({type: 'sizeField', value});
 if (points) {
points.modified();
this.updateSizeScale();
 map.draw();
 }
 },
Expand DownExpand Up@@ -318,6 +388,14 @@ export default {
 }
 }
 },
 updateSizeScale() {
 if (points) {
 const sizeScale = scales.generateSizeScale(graph.nodes, this.sizeField, this.size);
 points.style('radius', (nodeid) => {
 return Math.pow(2, map.zoom()) * sizeScale(graph.nodes[nodeid]);
 });
 }
 },
 download() {
 const nodesWithPositions = graph.nodes.map((n, i) => ({
 ...n,
Expand DownExpand Up@@ -346,14 +424,13 @@ export default {
 overflow: hidden;
}
#tooltip {
 margin-left: 0px;
 margin-top: -20px;
 height: 16px;
 margin-left: 20px;
 margin-top: 20px;
 line-height: 16px;
 padding: 2px 5px;
 background: rgba(255, 255, 255, 0.75);
 border-radius: 10px;
 border-bottom-left-radius: 0;
 border-top-left-radius: 0;
 border: 1px solid rgba(0, 0, 0, 0.75);
 font-size: 12px;
 color: black;
Expand Down

23 changes: 23 additions & 0 deletions
src/scales.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
let d3 = require('d3/dist/d3.js');

// generateScale()
// Create a linear scaling function for a numeric data field.
// Range will go from `min` to `max`, with invalid (non-numeric) values at `invalid`.
// If `area` is specified, range will be scaled such that every point on average fills `area` square units.
export function generateScale(arr, field, {area = null, min = -0.5, max = 0.5, invalid = 0.7}) {
 const size = area ? Math.sqrt(arr.length * area) : 1;
 const domain = d3.extent(arr, n => n[field]);
 const scale = d3.scaleLinear().domain(domain).range([size * min, size * max]);
 return n => {
 const val = n[field];
 if (!isNaN(parseFloat(val)) && isFinite(val)) {
 return scale(val);
 }
 return size * invalid;
 }
}

export function generateSizeScale(arr, field, size) {
 const sizeScale = generateScale(arr, field, {min: 3, max: 500*500, invalid: 2});
 return d => Math.sqrt(sizeScale(d)) * size;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Adding x, y, radial forces#5

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

 Merged

jeffbaumes
merged 1 commit into

from

Jul 12, 2019
 Merged


Adding x, y, radial forces
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


175 changes: 126 additions & 49 deletions
src/App.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
 <v-navigation-drawer fixed app class="pa-4">
 <v-btn block @click="$refs.file.click()">Upload CSV or JSON</v-btn>
 <input ref="file" type="file" style="display:none" @change="upload">
 <div>{{ nodeCount }} nodes, {{ edgeCount }} edges</div>
 <v-checkbox
 v-model="showEdges"
 label="Show edges"
Expand All@@ -12,16 +13,22 @@
 v-model="edgeOpacity"
 :min="0.01" :max="1.00" :step="0.01"
 thumb-label
 label="Edge Opacity"
 label="Edge opacity"
 hide-details
 ></v-slider>
 <v-slider
 v-model="radius"
 :min="0.1" :max="10" :step="0.1"
 v-model="size"
 :min="0.01" :max="1" :step="0.01"
 thumb-label
 label="Radius"
 label="Size"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="sizeField"
 :items="fields"
 label="Size field"
 hide-details
 ></v-combobox>
 <v-btn block @click="toggleLayout">{{ layoutRunning ? 'Stop' : 'Start' }} layout</v-btn>
 <v-slider
 v-model="alpha"
Expand All@@ -31,54 +38,78 @@
 label="Energy"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="charge"
 label="Charge force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="chargeStrength"
 :min="-50" :max="50" :step="1"
 :min="0" :max="50" :step="1"
 thumb-label
 label="Strength"
 label="Charge strength"
 hide-details
 ></v-slider>
 <v-slider
 v-model="theta"
 :min="0.5" :max="3.0" :step="0.1"
 thumb-label
 label="Approximate"
 label="Charge approximation"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="collide"
 label="Collide force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="collideStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Collide force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="link"
 label="Link force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="linkStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Strength"
 label="Link force"
 hide-details
 ></v-slider>
 <v-checkbox
 v-model="center"
 label="Center force"
 hide-details
 ></v-checkbox>
 <v-slider
 v-model="xStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="X force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="xField"
 :items="fields"
 label="X field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="yStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Y force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="yField"
 :items="fields"
 label="Y field"
 hide-details
 ></v-combobox>
 <v-slider
 v-model="radialStrength"
 :min="0.00" :max="1.00" :step="0.01"
 thumb-label
 label="Radial force"
 hide-details
 ></v-slider>
 <v-combobox
 v-model="radialField"
 :items="fields"
 label="Radial field"
 hide-details
 ></v-combobox>
 <v-btn block @click="download()">Download JSON</v-btn>
 <a ref="downloadAnchor" style="display:none"></a>
 </v-navigation-drawer>
Expand All@@ -92,6 +123,7 @@
import geo from 'geojs/geo.js';

import LayoutWorker from 'worker-loader!./worker.js';
import * as scales from './scales.js';

const layoutWorker = new LayoutWorker();
let map;
Expand All@@ -104,20 +136,27 @@ let nodeMap;
export default {
 data: function () {
 return {
 fields: [],
 showEdges: false,
 edgeOpacity: 0.5,
 radius: 2,
 size: 0.5,
 sizeField: 'degree',
 layoutRunning: false,
 alpha: 1.0,
 alphaFromWorker: false,
 charge: true,
 chargeStrength: -30,
 chargeStrength: 30,
 theta: 1.5,
 collide: true,
 collideStrength: 0.7,
 link: true,
 linkStrength: 1,
 center: true,
 xField: null,
 xStrength: 0,
 yField: null,
 yStrength: 0,
 radialField: null,
 radialStrength: 0,
 nodeCount: 0,
 edgeCount: 0,
 };
 },
 mounted() {
Expand DownExpand Up@@ -163,6 +202,19 @@ export default {
 layoutWorker.onmessage = e => {
 if (e.data.type === 'graph') {
 graph = e.data.graph;
 this.nodeCount = graph.nodes.length;
 this.edgeCount = graph.edges.length;

 const ignoreFields = ['x', 'y', 'vx', 'vy'];
 this.fields = [];
 graph.nodes.forEach(n => {
 Object.keys(n).forEach(f => {
 if (!ignoreFields.includes(f) && !this.fields.includes(f)) {
 this.fields.push(f);
 }
 });
 });
 this.fields.sort();

 map.deleteLayer(layer);
 layer = map.createLayer('feature', {features: ['point', 'line']});
Expand All@@ -185,11 +237,12 @@ export default {
 fillColor: 'grey',
 fillOpacity: 0.5,
 strokeOpacity: 0.5,
 radius: nodeid => Math.max(1, Math.pow(2, map.zoom()) * Math.sqrt(graph.nodes[nodeid].degree) * this.radius)
 },
 position: nodeid => graph.nodes[nodeid]
 }).data(Object.keys(graph.nodes));

 this.updateSizeScale();

 map.geoOn(geo.event.zoom, () => {
 // Ensure selection quadtree updates with new point sizes
 points.dataTime().modified();
Expand All@@ -198,14 +251,18 @@ export default {
 map.draw();

 points
 .geoOn(geo.event.feature.mouseon, function (evt) {
 const nodeid = evt.data, node = graph.nodes[nodeid];
 let text = node.id;
 if (text) {
 tooltip.position(evt.mouse.geo);
 tooltipElem.innerText = text;
 }
 tooltipElem.classList.toggle('hidden', !text);
 .geoOn(geo.event.feature.mouseon, (evt) => {
 const nodeid = evt.data;
 const node = graph.nodes[nodeid];
 tooltip.position(evt.mouse.geo);
 let description = `<div><b>${node.id}</b></div>`;
 this.fields.forEach(key => {
 if (key !== 'id') {
 description += `<div>${key}: ${node[key]}</div>`;
 }
 })
 tooltipElem.innerHTML = description;
 tooltipElem.classList.toggle('hidden', false);
 })
 .geoOn(geo.event.feature.mousemove, function (evt) {
 tooltip.position(evt.mouse.geo);
Expand All@@ -226,16 +283,19 @@ export default {
 }
 }

 // Add watchers which simply sync data to layout worker
 // Add watchers which sync data to layout worker
 [
 'charge',
 'chargeStrength',
 'theta',
 'collide',
 'collideStrength',
 'link',
 'linkStrength',
 'center',
 'xField',
 'xStrength',
 'yField',
 'yStrength',
 'radialField',
 'radialStrength',
 ].forEach(name => {
 function sendToWorker(value) {
 layoutWorker.postMessage({type: name, value});
Expand DownExpand Up@@ -271,11 +331,21 @@ export default {
 },
 immediate: true,
 },
 radius: {
 size: {
 handler(value) {
 layoutWorker.postMessage({type: 'size', value});
 if (points) {
 this.updateSizeScale();
 map.draw();
 }
 },
 immediate: true,
 },
 sizeField: {
 handler(value) {
 layoutWorker.postMessage({type: 'radius', value});
 layoutWorker.postMessage({type: 'sizeField', value});
 if (points) {
points.modified();
this.updateSizeScale();
 map.draw();
 }
 },
Expand DownExpand Up@@ -318,6 +388,14 @@ export default {
 }
 }
 },
 updateSizeScale() {
 if (points) {
 const sizeScale = scales.generateSizeScale(graph.nodes, this.sizeField, this.size);
 points.style('radius', (nodeid) => {
 return Math.pow(2, map.zoom()) * sizeScale(graph.nodes[nodeid]);
 });
 }
 },
 download() {
 const nodesWithPositions = graph.nodes.map((n, i) => ({
 ...n,
Expand DownExpand Up@@ -346,14 +424,13 @@ export default {
 overflow: hidden;
}
#tooltip {
 margin-left: 0px;
 margin-top: -20px;
 height: 16px;
 margin-left: 20px;
 margin-top: 20px;
 line-height: 16px;
 padding: 2px 5px;
 background: rgba(255, 255, 255, 0.75);
 border-radius: 10px;
 border-bottom-left-radius: 0;
 border-top-left-radius: 0;
 border: 1px solid rgba(0, 0, 0, 0.75);
 font-size: 12px;
 color: black;
Expand Down

23 changes: 23 additions & 0 deletions
src/scales.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
let d3 = require('d3/dist/d3.js');

// generateScale()
// Create a linear scaling function for a numeric data field.
// Range will go from `min` to `max`, with invalid (non-numeric) values at `invalid`.
// If `area` is specified, range will be scaled such that every point on average fills `area` square units.
export function generateScale(arr, field, {area = null, min = -0.5, max = 0.5, invalid = 0.7}) {
 const size = area ? Math.sqrt(arr.length * area) : 1;
 const domain = d3.extent(arr, n => n[field]);
 const scale = d3.scaleLinear().domain(domain).range([size * min, size * max]);
 return n => {
 const val = n[field];
 if (!isNaN(parseFloat(val)) && isFinite(val)) {
 return scale(val);
 }
 return size * invalid;
 }
}

export function generateSizeScale(arr, field, size) {
 const sizeScale = generateScale(arr, field, {min: 3, max: 500*500, invalid: 2});
 return d => Math.sqrt(sizeScale(d)) * size;
}
Loading